summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog25
-rw-r--r--doc/user/.arch-inventory2
-rw-r--r--doc/user/markup.skb5
-rw-r--r--src/guile/skribilo/engine.scm5
4 files changed, 28 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 857cfb9..97098d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,31 @@
# arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
#
+2006-03-07 21:29:32 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-42
+
+ Summary:
+ Merge from lcourtes@laas.fr--2004-libre
+ Revision:
+ skribilo--devel--1.2--patch-42
+
+ Patches applied:
+
+ * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2 (patch 67-69)
+
+ - Doc: undoed `patch-65'.
+ - Removed the global engine table.
+ - Inventory fix.
+
+ modified files:
+ ChangeLog doc/user/.arch-inventory doc/user/markup.skb
+ src/guile/skribilo/engine.scm
+
+ new patches:
+ lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-67
+ lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-68
+ lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-69
+
+
2006-03-07 21:28:47 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-41
Summary:
diff --git a/doc/user/.arch-inventory b/doc/user/.arch-inventory
index 348e7be..52f57b5 100644
--- a/doc/user/.arch-inventory
+++ b/doc/user/.arch-inventory
@@ -1,4 +1,4 @@
# Skribilo-generated files.
-precious ^user\.(html|ps)$
+precious ^user(-[0-9]+)?\.(html|ps)$
# arch-tag: 827d1e94-1b36-474e-bcdb-a4235b4af848
diff --git a/doc/user/markup.skb b/doc/user/markup.skb
index 22cbce3..272bfbe 100644
--- a/doc/user/markup.skb
+++ b/doc/user/markup.skb
@@ -67,9 +67,8 @@ calls are legal ,(tt "section") calls:])
;*---------------------------------------------------------------------*/
;* Markups */
;*---------------------------------------------------------------------*/
-;; FIXME: Processors (used by the following files) are broken!
-;;(include "document.skb")
-;;(include "sectioning.skb")
+(include "document.skb")
+(include "sectioning.skb")
(include "toc.skb")
(include "ornament.skb")
(include "line.skb")
diff --git a/src/guile/skribilo/engine.scm b/src/guile/skribilo/engine.scm
index de455cd..0c3f406 100644
--- a/src/guile/skribilo/engine.scm
+++ b/src/guile/skribilo/engine.scm
@@ -119,7 +119,6 @@
;;; Default engines.
;;;
-(define *engines* '())
(define *default-engine* #f)
(define *default-engines* '())
@@ -185,9 +184,6 @@
:filter filter :delegate delegate
:symbol-table symbol-table
:custom custom :info info)))
- ;; store the engine in the global table
- (set! *engines* (cons e *engines*))
- ;; return it
e))
@@ -218,7 +214,6 @@
(slot-ref e 'writers))
(slot-set! new 'writers new-writers))
- (set! *engines* (cons new *engines*))
new))