Merge from lcourtes@laas.fr--2005-mobile

Patches applied:

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

   - Merge from lcourtes@laas.fr--2004-libre
   - Fixed syntax highlighting thanks to SILex.

git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-41

1 files changed, 78 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a4d8ec6..e410a82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,84 @@
 # arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
 #
 
+2006-02-10 17:19:34 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-33
+
+    Summary:
+      Fixed syntax highlighting thanks to SILex.
+    Revision:
+      skribilo--devel--1.2--patch-33
+
+    * arch-config: New file.
+    
+    * src/guile/skribilo/coloring/c-lex.l.scm: New.
+    
+    * src/guile/skribilo/coloring/lisp-lex.l.scm: New.
+    
+    * src/guile/skribilo/coloring/xml-lex.l.scm: New.
+    
+    * doc/user/user.skb: Include `prgm.skb' (works now).
+    
+    * src/guile/skribilo/ast.scm: Export `node-body'.
+    
+    * src/guile/skribilo/coloring/Makefile.am (dist_guilemodule_DATA): Added
+      the SILex-generated files.
+      (%.l.scm): New rule.
+    
+    * src/guile/skribilo/coloring/lisp-lex.l: Use the SRFI-39 parameters.
+    
+    * src/guile/skribilo/coloring/lisp.scm: Use SRFI-39 parameters instead of
+      fluids.  Load `lisp-lex.l.scm'.
+    
+    * src/guile/skribilo/prog.scm: Autoload `ast' upon `node-body' too.
+      (make-line-mark): Use `hash-set!'.
+      (resolve-line): Use `hash-ref'.
+    
+    * src/guile/skribilo/source.scm (source-read-lines): Use
+      `string-prefix-length' instead of `substring=?'.
+
+    new files:
+     arch-config
+     src/guile/skribilo/coloring/.arch-ids/c-lex.l.scm.id
+     src/guile/skribilo/coloring/.arch-ids/lisp-lex.l.scm.id
+     src/guile/skribilo/coloring/.arch-ids/xml-lex.l.scm.id
+     src/guile/skribilo/coloring/c-lex.l.scm
+     src/guile/skribilo/coloring/lisp-lex.l.scm
+     src/guile/skribilo/coloring/xml-lex.l.scm
+
+    modified files:
+     ChangeLog doc/user/user.skb src/guile/skribilo/ast.scm
+     src/guile/skribilo/coloring/Makefile.am
+     src/guile/skribilo/coloring/lisp-lex.l
+     src/guile/skribilo/coloring/lisp.scm
+     src/guile/skribilo/prog.scm src/guile/skribilo/source.scm
+
+
+2006-02-10 14:44:59 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-32
+
+    Summary:
+      Merge from lcourtes@laas.fr--2004-libre
+    Revision:
+      skribilo--devel--1.2--patch-32
+
+    Patches applied:
+    
+     * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2  (patch 37-40)
+    
+       - Merge from lcourtes@laas.fr--2005-mobile
+       - First time the user manual is compiled to HTML.
+       - Added support for subsections and subsubsections in the outline reader.
+       - Outline reader: added support to parse lists.
+
+    modified files:
+     ChangeLog src/guile/skribilo/reader/outline.scm
+
+    new patches:
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-37
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-38
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-39
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-40
+
+
 2006-01-31 23:23:15 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-31
 
     Summary: