diff options
| -rw-r--r-- | ChangeLog | 26 | ||||
| -rw-r--r-- | doc/skr/manual.skr | 5 | ||||
| -rw-r--r-- | doc/user/document.skb | 2 | ||||
| -rw-r--r-- | doc/user/src/api2.skb | 2 | ||||
| -rw-r--r-- | doc/user/src/bib1.sbib | 2 | ||||
| -rw-r--r-- | doc/user/user.skb | 3 | ||||
| -rw-r--r-- | src/guile/skribilo/engine/lout.scm | 6 |
7 files changed, 40 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 2ba8d09..98f9b8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,32 @@ # arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2 # +2006-03-07 21:25:37 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-38 + + Summary: + Merge from lcourtes@laas.fr--2004-libre + Revision: + skribilo--devel--1.2--patch-38 + + Patches applied: + + * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2 (patch 60-62) + + - Slightly optimized the resolution process (added `ast-resolved?'). + - Various fixes in the documentation code. + - Lout engine: use `push-default-engine' and `pop-default-engine'. + + modified files: + ChangeLog doc/skr/manual.skr doc/user/document.skb + doc/user/src/api2.skb doc/user/src/bib1.sbib doc/user/user.skb + src/guile/skribilo/engine/lout.scm + + new patches: + lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-60 + lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-61 + lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-62 + + 2006-02-28 21:40:26 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-37 Summary: diff --git a/doc/skr/manual.skr b/doc/skr/manual.skr index e6b7d64..f8b022c 100644 --- a/doc/skr/manual.skr +++ b/doc/skr/manual.skr @@ -22,7 +22,8 @@ (skribe-eval (mark ident) e) (skribe-eval (center (markup-body n) - (if number (bold (format "Ex. ~a: " number))) + (if number + (bold (format #f "Ex. ~a: " number))) legend) e))))) @@ -279,7 +280,7 @@ ;*---------------------------------------------------------------------*/ (define-markup (compiler-options bin) (skribe-message " [executing: ~a --options]\n" bin) - (let ((port (open-input-file (format "| ~a --options" bin)))) + (let ((port (open-input-file (format #f "| ~a --options" bin)))) (let ((opts (read port))) (close-input-port port) (apply description (map (lambda (opt) (item :key (bold (car opt)) diff --git a/doc/user/document.skb b/doc/user/document.skb index 09f8cb3..5797da8 100644 --- a/doc/user/document.skb +++ b/doc/user/document.skb @@ -19,7 +19,7 @@ (b (markup-body n)) (ta (table (tr (map (lambda (n) (td :valign 'top :align 'center n)) - a))))) + (if (list? a) a (list a))))))) (skribe-eval (center (bold t)) e) (skribe-eval (center ta) e) (output b e)))) diff --git a/doc/user/src/api2.skb b/doc/user/src/api2.skb index 2c20965..4a89705 100644 --- a/doc/user/src/api2.skb +++ b/doc/user/src/api2.skb @@ -1,4 +1,4 @@ -(document :title "This is a Scribe document" +(document :title "This is a Skribilo document" :author (list (author :name "Foo" :email (mailto "foo@nowhere.org")) (author :name "Bar" :email (mailto "bar@anywhere.org")) (author :name "Gee" :email (mailto "gee@nowhere.org"))) diff --git a/doc/user/src/bib1.sbib b/doc/user/src/bib1.sbib index 3f1c04f..6afff71 100644 --- a/doc/user/src/bib1.sbib +++ b/doc/user/src/bib1.sbib @@ -12,6 +12,8 @@ (year "1991")) (misc bigloo + (author "Manuel Serrano") + (year "2006") (url "http://www.inria.fr/mimosa/fp/Bigloo")) (misc scheme:r4rs diff --git a/doc/user/user.skb b/doc/user/user.skb index fb0c8d2..1403e71 100644 --- a/doc/user/user.skb +++ b/doc/user/user.skb @@ -38,6 +38,7 @@ (define *function-index* (make-index "function")) (define *package-index* (make-index "package")) + ;*---------------------------------------------------------------------*/ ;* The document */ ;*---------------------------------------------------------------------*/ @@ -59,7 +60,7 @@ This is the documentation for Skribe version (linebreak 1) ;;; Introduction -(chapter :title "Introduction" :number #f :toc #f [ +(chapter :title "Introduction" :number #f :toc #f :file #f [ Skribe is a programming language designed for implementing electronic documents. It is mainly designed for the writing of technical documents such as the documentation of computer programs. With Skribe these diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm index c49211f..cfd58c7 100644 --- a/src/guile/skribilo/engine/lout.scm +++ b/src/guile/skribilo/engine/lout.scm @@ -701,6 +701,10 @@ (format #f "@Eq { ~a }\n" m))))) +;; So that calls to `markup-writer' automatically use `lout-engine'... +(push-default-engine lout-engine) + + ;; User-level implementation of PDF bookmarks. ;; @@ -2883,7 +2887,7 @@ ;*---------------------------------------------------------------------*/ ;* Restore the base engine */ ;*---------------------------------------------------------------------*/ -(default-engine-set! (find-engine 'base)) +(pop-default-engine) ;; Local Variables: -- |