diff options
| author | Ludovic Courtes | 2006-01-24 20:02:40 +0000 |
|---|---|---|
| committer | Ludovic Courtes | 2006-01-24 20:02:40 +0000 |
| commit | ce4ff568eaf9bb2f56ab0cf341591a9025f35ee7 (patch) | |
| tree | eed112b1799d71951bd0353ef9e700a4f64d0520 /src/guile/skribilo/engine | |
| parent | 8bdcb386f3ce26a9031ca123b4d43af0b5a3721a (diff) | |
| parent | 19eb17fb8ca5f70f0138261cd49bbcf6f5eedc4b (diff) | |
| download | skribilo-ce4ff568eaf9bb2f56ab0cf341591a9025f35ee7.tar.gz skribilo-ce4ff568eaf9bb2f56ab0cf341591a9025f35ee7.tar.lz skribilo-ce4ff568eaf9bb2f56ab0cf341591a9025f35ee7.zip | |
Merge from lcourtes@laas.fr--2004-libre
Patches applied:
* lcourtes@laas.fr--2004-libre/skribilo--devel--1.2 (patch 31-36)
- Merge from lcourtes@laas.fr--2005-mobile
- Preliminary support for multiple reader front-ends.
- First implementation of a reader for Emacs' outline syntax.
- First working outline reader.
- Changed the default Lout `document-type' to `doc'.
- Fixed the HTML engine's `favicon' output.
git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-29
Diffstat (limited to 'src/guile/skribilo/engine')
| -rw-r--r-- | src/guile/skribilo/engine/html.scm | 3 | ||||
| -rw-r--r-- | src/guile/skribilo/engine/lout.scm | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm index 1f3466f..5165258 100644 --- a/src/guile/skribilo/engine/html.scm +++ b/src/guile/skribilo/engine/html.scm @@ -711,7 +711,8 @@ ((string? ic) ic) ((procedure? ic) - (ic d e))))) + (ic d e)) + (else #f)))) e) ;; style (output (new markup diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm index 72a8338..d01b547 100644 --- a/src/guile/skribilo/engine/lout.scm +++ b/src/guile/skribilo/engine/lout.scm @@ -522,7 +522,7 @@ :filter (make-string-replace lout-encoding) :custom `(;; The underlying Lout document type, i.e. one ;; of `doc', `report', `book' or `slides'. - (document-type report) + (document-type doc) ;; Document style file include line (a string ;; such as `@Include { doc-style.lout }') or |