Merge from skribilo@sv.gnu.org--2006

Patches applied:

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2  (patch 118-121)
 * skribilo@sv.gnu.org--2006/skribilo--devo--1.2  (patch 134-137)

   - Renamed the `coloring' module tree to `source' for consistency.
   - Fixed the `sui' module.
   - Moved SUI stuff from `html.scm' to `sui.scm'.
   - Linted documentation modules.

git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-84

1 files changed, 121 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index ea5d7de..34dd0c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,127 @@
 # arch-tag: automatic-ChangeLog--skribilo@sv.gnu.org--2006/skribilo--devo--1.2
 #
 
+2007-07-04 20:36:43 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-137
+
+    Summary:
+      Linted documentation modules.
+    Revision:
+      skribilo--devo--1.2--patch-137
+
+    * doc/modules/skribilo/documentation/*.scm: Use the
+      `%skribilo-module-reader' and corresponding syntax, no longer use
+      `compat'.
+
+    modified files:
+     ChangeLog doc/modules/skribilo/documentation/api.scm
+     doc/modules/skribilo/documentation/extension.scm
+     doc/modules/skribilo/documentation/manual.scm
+
+    new patches:
+     lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-121
+
+
+2007-07-04 20:36:19 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-136
+
+    Summary:
+      Moved SUI stuff from `html.scm' to `sui.scm'.
+    Revision:
+      skribilo--devo--1.2--patch-136
+
+    * src/guile/skribilo/engine/html.scm: Use `(skribilo sui)'.
+      Export `html-title-engine' and `html-file'.
+      (document-sui, sui-referenced-file, sui-marks, sui-blocks): Moved.
+    
+    * src/guile/skribilo/sui.scm: Use required modules.
+      (document-sui, sui-referenced-file, sui-marks, sui-blocks): New.
+
+    modified files:
+     ChangeLog src/guile/skribilo/engine/html.scm
+     src/guile/skribilo/sui.scm
+
+    new patches:
+     lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-120
+
+
+2007-07-04 20:35:54 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-135
+
+    Summary:
+      Fixed the `sui' module.
+    Revision:
+      skribilo--devo--1.2--patch-135
+
+    * src/guile/skribilo/Makefile.am (dist_guilemodule_DATA): Added
+      `sui.scm'.
+    
+    * src/guile/skribilo/sui.scm (sui-filter): Removed single-operand `and'.
+
+    modified files:
+     ChangeLog src/guile/skribilo/Makefile.am
+     src/guile/skribilo/sui.scm
+
+    new patches:
+     lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-119
+
+
+2007-07-04 20:35:23 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-134
+
+    Summary:
+      Renamed the `coloring' module tree to `source' for consistency.
+    Revision:
+      skribilo--devo--1.2--patch-134
+
+
+    modified files:
+     ChangeLog configure.ac
+     doc/modules/skribilo/documentation/manual.scm po/fr.po
+     src/guile/skribilo/Makefile.am src/guile/skribilo/module.scm
+     src/guile/skribilo/source/Makefile.am
+     src/guile/skribilo/source/c-lex.scm
+     src/guile/skribilo/source/c.scm
+     src/guile/skribilo/source/lisp-lex.scm
+     src/guile/skribilo/source/lisp.scm
+     src/guile/skribilo/source/parameters.scm
+     src/guile/skribilo/source/xml-lex.scm
+     src/guile/skribilo/source/xml.scm
+
+    renamed files:
+     src/guile/skribilo/coloring/.arch-ids/=id
+       ==> src/guile/skribilo/source/.arch-ids/=id
+     src/guile/skribilo/coloring/.arch-ids/Makefile.am.id
+       ==> src/guile/skribilo/source/.arch-ids/Makefile.am.id
+     src/guile/skribilo/coloring/.arch-ids/c-lex.l.id
+       ==> src/guile/skribilo/source/.arch-ids/c-lex.l.id
+     src/guile/skribilo/coloring/.arch-ids/c-lex.scm.id
+       ==> src/guile/skribilo/source/.arch-ids/c-lex.scm.id
+     src/guile/skribilo/coloring/.arch-ids/c.scm.id
+       ==> src/guile/skribilo/source/.arch-ids/c.scm.id
+     src/guile/skribilo/coloring/.arch-ids/lisp-lex.l.id
+       ==> src/guile/skribilo/source/.arch-ids/lisp-lex.l.id
+     src/guile/skribilo/coloring/.arch-ids/lisp-lex.scm.id
+       ==> src/guile/skribilo/source/.arch-ids/lisp-lex.scm.id
+     src/guile/skribilo/coloring/.arch-ids/lisp.scm.id
+       ==> src/guile/skribilo/source/.arch-ids/lisp.scm.id
+     src/guile/skribilo/coloring/.arch-ids/xml-lex.l.id
+       ==> src/guile/skribilo/source/.arch-ids/xml-lex.l.id
+     src/guile/skribilo/coloring/.arch-ids/xml-lex.scm.id
+       ==> src/guile/skribilo/source/.arch-ids/xml-lex.scm.id
+     src/guile/skribilo/coloring/.arch-ids/xml.scm.id
+       ==> src/guile/skribilo/source/.arch-ids/xml.scm.id
+
+    new directories:
+     src/guile/skribilo/source/.arch-ids
+
+    removed directories:
+     src/guile/skribilo/coloring/.arch-ids
+
+    renamed directories:
+     src/guile/skribilo/coloring
+       ==> src/guile/skribilo/source
+
+    new patches:
+     lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-118
+
+
 2007-07-01 23:50:22 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-133
 
     Summary: