From 8335269810c4de308aa5b8bfd9c1d8300fd280e1 Mon Sep 17 00:00:00 2001
From: Ludovic Courtes
Date: Sun, 19 Mar 2006 19:55:24 +0000
Subject: Lout engine: small fixes.

* src/guile/skribilo/engine/lout.scm (figure): For `@BypassNumber', make
  sure NUMBER is not `#f'.

* src/guile/skribilo/package/slide/lout.scm: Don't switch automatically
  DOCUMENT-TYPE to `slides'.

git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-49
---
 src/guile/skribilo/engine/lout.scm        |  5 ++++-
 src/guile/skribilo/package/slide/lout.scm | 18 ++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index c9c6522..3d86eb4 100644
--- a/src/guile/skribilo/engine/lout.scm
+++ b/src/guile/skribilo/engine/lout.scm
@@ -1740,7 +1740,10 @@
 		 (display "  @Tag { ")
 		 (display (lout-tagify ident))
 		 (display " }\n")
-		 (printf  "  @BypassNumber { ~a }\n" number)
+		 (printf  "  @BypassNumber { ~a }\n"
+			  (cond ((number? number) number)
+				((not number)     "")
+				(else             number)))
 		 (display "  @InitialLanguage { ")
 		 (display (engine-custom e 'initial-language))
 		 (display " }\n")
diff --git a/src/guile/skribilo/package/slide/lout.scm b/src/guile/skribilo/package/slide/lout.scm
index 39e0175..c36c793 100644
--- a/src/guile/skribilo/package/slide/lout.scm
+++ b/src/guile/skribilo/package/slide/lout.scm
@@ -21,11 +21,15 @@
 (define-skribe-module (skribilo package slide lout)
   :use-module (skribilo utils syntax)
 
-  ;; FIXME: For some reason, changing the following `autoload' in
-  ;; `use-modules' doesn't work.
+  ;; XXX: If changing the following `autoload' to `use-module' doesn't work,
+  ;; then you need to fix your Guile.  See this thread about
+  ;; `make-autoload-interface':
+  ;;
+  ;;   http://article.gmane.org/gmane.lisp.guile.devel/5748
+  ;;   http://lists.gnu.org/archive/html/guile-devel/2006-03/msg00004.html .
 
-  :autoload (skribilo engine lout) (lout-tagify lout-output-pdf-meta-info)
-  )
+  :autoload (skribilo engine lout) (lout-tagify lout-output-pdf-meta-info
+				    lout-verbatim-encoding))
 
 
 (fluid-set! current-reader %skribilo-module-reader)
@@ -38,8 +42,10 @@
 
 (let ((le (find-engine 'lout)))
 
-  ;; Automatically switch to the `slides' document type.
-  (engine-custom-set! le 'document-type 'slides)
+  ;; FIXME: Automatically switching to `slides' is problematic, e.g., for the
+  ;; user manual which embeds slides.
+;  ;; Automatically switch to the `slides' document type.
+;  (engine-custom-set! le 'document-type 'slides))
 
   (markup-writer 'slide le
      :options '(:title :number :toc :ident) ;; '(:bg :vspace :image)
-- 
cgit v1.2.3