diff options
| author | Ludovic Courtes | 2005-11-01 16:19:34 +0000 |
|---|---|---|
| committer | Ludovic Courtes | 2005-11-01 16:19:34 +0000 |
| commit | f553cb65b157b6df9563cefa593902d59301461b (patch) | |
| tree | 00fc81c51256991c04799d79a749bbdd5b9fad30 /src/guile/skribilo/engine/lout.scm | |
| parent | 052c10245a523aa714489bda59e18a6c1a4f473e (diff) | |
| download | skribilo-f553cb65b157b6df9563cefa593902d59301461b.tar.gz skribilo-f553cb65b157b6df9563cefa593902d59301461b.tar.lz skribilo-f553cb65b157b6df9563cefa593902d59301461b.zip | |
Changes related to source-highlighting and to the manual.
* src/guile/skribilo/engine/lout.scm (lout-make-doc-cover-sheet): Fixed
the definition of MULTI-COLUMN? (fixes a bug when producing
multi-column documents).
(lout-definitions): `@SkribeLeaders' renamed to `@SkribiloLeaders'.
* doc/skr/api.skr (api-search-definition): Fixed calls to `format'.
* doc/skr/manual.skr (keyword): Use `write' instead of `keyword->string'.
* doc/user/start.skb: Cosmetic changes.
* src/guile/skribilo/coloring/lisp.scm: First stab at its adaptation.
* src/guile/skribilo/coloring/xml.scm: Rewritten "by hand".
* src/guile/skribilo/evaluator.scm (skribe-include): Removed debugging
statements.
* src/guile/skribilo/lib.scm (new): Added a trick such that users of this
macro don't have to use `(oop goops)' and `(skribilo types)'.
(date): New procedure.
* src/guile/skribilo/module.scm (*skribe-core-modules*): Renamed to
`%skribe-core-modules'.
(%skribe-core-modules): Removed `(oop goops)'. Added `(skribilo
source)', `(skribilo coloring lisp)' and `(skribilo coloring xml)'.
* src/guile/skribilo/skribe/api.scm (footnote): Fixed.
* src/guile/skribilo/source.scm: Cosmetic changes.
* src/guile/skribilo/types.scm: Export `language-extractor' and
`language-fontifier'.
git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-11
Diffstat (limited to 'src/guile/skribilo/engine/lout.scm')
| -rw-r--r-- | src/guile/skribilo/engine/lout.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm index b466ac1..36df9f9 100644 --- a/src/guile/skribilo/engine/lout.scm +++ b/src/guile/skribilo/engine/lout.scm @@ -384,10 +384,10 @@ " @PageMark @Tag\n" "}\n\n" - "# @SkribeLeaders is used in `toc'\n" + "# @SkribiloLeaders is used in `toc'\n" "# (this is mostly copied from the expert's guide)\n" - "def @SkribeLeaders { " - ,leader " |" ,leader-space " @SkribeLeaders }\n\n")))) + "def @SkribiloLeaders { " + ,leader " |" ,leader-space " @SkribiloLeaders }\n\n")))) (define (lout-make-doc-cover-sheet doc engine) ;; Create a cover sheet for node `doc' which is a doc-style Lout document. @@ -397,7 +397,8 @@ (author (markup-option doc :author)) (date-line (engine-custom engine 'date-line)) (cover-sheet? (engine-custom engine 'cover-sheet?)) - (multi-column? (> 1 (engine-custom engine 'column-number)))) + (multi-column? (> (engine-custom engine 'column-number) 1))) + (if multi-column? ;; In single-column document, `@FullWidth' yields a blank page. (display "\n@FullWidth {")) @@ -1205,7 +1206,7 @@ (entry-proc node engine) (display " &1rt @OneCol { ") - (printf " @SkribeLeaders & @PageOf { ~a }" + (printf " @SkribiloLeaders & @PageOf { ~a }" (lout-tagify (markup-ident node))) (display " &0io } }") |