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

2 files changed, 44 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1946a68..e485abf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,44 @@
 # arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
 #
 
+2006-03-18 18:09:34 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-46
+
+    Summary:
+      Lout engine: better handling of the `slides' document type.
+    Revision:
+      skribilo--devel--1.2--patch-46
+
+    * src/guile/skribilo/engine/lout.scm (lout-slides-markup-alist): New.
+      (lout-structure-markup): Handle `slides'.
+
+    modified files:
+     ChangeLog src/guile/skribilo/engine/lout.scm
+
+
+2006-03-18 17:25:58 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-45
+
+    Summary:
+      Merge from lcourtes@laas.fr--2004-libre
+    Revision:
+      skribilo--devel--1.2--patch-45
+
+    Patches applied:
+    
+     * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2  (patch 70-72)
+    
+       - Merge from lcourtes@laas.fr--2005-mobile
+       - Slight optimization: allow for non-proc predicates for markup writers.
+       - Partial rewrite of the debugging facilities (slightly slower).
+
+    modified files:
+     ChangeLog
+
+    new patches:
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-70
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-71
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-72
+
+
 2006-03-07 22:58:58 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-44
 
     Summary:
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)