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

1 files changed, 38 insertions, 0 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: