summary refs log tree commit diff
path: root/src/guile
diff options
context:
space:
mode:
authorLudovic Courtes2006-03-19 22:49:49 +0000
committerLudovic Courtes2006-03-19 22:49:49 +0000
commitc102c3c2d35f2d7ecae8f8d0145959372c5f15cf (patch)
tree057cb5a327ccb496ffcdf4b3b6fb68abafdccd42 /src/guile
parent1dcb0d05955a40d784455ec73dcf1552a07c5126 (diff)
parentf3134f3a59ef182bb8e65f55898a58ed6da77e36 (diff)
downloadskribilo-c102c3c2d35f2d7ecae8f8d0145959372c5f15cf.tar.gz
skribilo-c102c3c2d35f2d7ecae8f8d0145959372c5f15cf.tar.lz
skribilo-c102c3c2d35f2d7ecae8f8d0145959372c5f15cf.zip
Merge from lcourtes@laas.fr--2005-mobile
Patches applied:

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2  (patch 45-46)

   - Merge from lcourtes@laas.fr--2004-libre
   - Lout engine: better handling of the `slides' document type.

git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-73
Diffstat (limited to 'src/guile')
-rw-r--r--src/guile/skribilo/engine/lout.scm8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index cfd58c7..c9c6522 100644
--- a/src/guile/skribilo/engine/lout.scm
+++ b/src/guile/skribilo/engine/lout.scm
@@ -1008,7 +1008,7 @@
 		     ((slides)  (display "@SysInclude { slides }\n"))
 		     (else     (skribe-error
 				'lout
-				"`document-type' should be one of `book', `report' or `doc'"
+				"`document-type' should be one of `book', `report', `doc' or `slides'"
 				doc-type)))
 		   (printf "# Custom document includes\n~a\n" doc-include))
 
@@ -1271,6 +1271,9 @@
     (subsection . "SubSubSection")
     (subsubsection . #f)))
 
+(define lout-slides-markup-alist
+  '((slide . "Overhead")))
+
 (define lout-doc-markup-alist lout-report-markup-alist)
 
 (define (lout-structure-markup skribe-markup engine)
@@ -1283,9 +1286,10 @@
       ((book)    (assoc-ref lout-book-markup-alist skribe-markup))
       ((report)  (assoc-ref lout-report-markup-alist skribe-markup))
       ((doc)     (assoc-ref lout-doc-markup-alist skribe-markup))
+      ((slides)  (assoc-ref lout-slides-markup-alist skribe-markup))
       (else
        (skribe-error 'lout
-		     "`document-type' should be one of `book', `report' or `doc'"
+		     "`document-type' should be one of `book', `report', `doc' or `slides'"
 		     doc-type)))))
 
 (define-public (lout-structure-number-string markup)