summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtes2006-03-07 21:28:02 +0000
committerLudovic Courtes2006-03-07 21:28:02 +0000
commit7410fe3c62754c0c469e18137fc03ff90fe1c20f (patch)
treed88f70b892583ac595aad026a0e1d1b2ee03093f
parent092e922cfe5f636cba3d65dfacba81b23cae2bba (diff)
parent3fe02d51a069386687014825e626679d69d03d22 (diff)
downloadskribilo-7410fe3c62754c0c469e18137fc03ff90fe1c20f.tar.gz
skribilo-7410fe3c62754c0c469e18137fc03ff90fe1c20f.tar.lz
skribilo-7410fe3c62754c0c469e18137fc03ff90fe1c20f.zip
Merge from lcourtes@laas.fr--2004-libre
Patches applied: * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2 (patch 64-65) - Fixed tiny module loading/autoloading mistakes. - Doc: commented out code that uses processors to work around bug. git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-40
-rw-r--r--ChangeLog23
-rw-r--r--doc/user/markup.skb5
-rw-r--r--src/guile/skribilo/module.scm1
-rw-r--r--src/guile/skribilo/output.scm2
4 files changed, 28 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 607da58..e5cdb57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,29 @@
# arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
#
+2006-03-07 21:28:02 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-40
+
+ Summary:
+ Merge from lcourtes@laas.fr--2004-libre
+ Revision:
+ skribilo--devel--1.2--patch-40
+
+ Patches applied:
+
+ * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2 (patch 64-65)
+
+ - Fixed tiny module loading/autoloading mistakes.
+ - Doc: commented out code that uses processors to work around bug.
+
+ modified files:
+ ChangeLog doc/user/markup.skb src/guile/skribilo/module.scm
+ src/guile/skribilo/output.scm
+
+ new patches:
+ lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-64
+ lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-65
+
+
2006-03-07 21:27:01 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-39
Summary:
diff --git a/doc/user/markup.skb b/doc/user/markup.skb
index 272bfbe..22cbce3 100644
--- a/doc/user/markup.skb
+++ b/doc/user/markup.skb
@@ -67,8 +67,9 @@ calls are legal ,(tt "section") calls:])
;*---------------------------------------------------------------------*/
;* Markups */
;*---------------------------------------------------------------------*/
-(include "document.skb")
-(include "sectioning.skb")
+;; FIXME: Processors (used by the following files) are broken!
+;;(include "document.skb")
+;;(include "sectioning.skb")
(include "toc.skb")
(include "ornament.skb")
(include "line.skb")
diff --git a/src/guile/skribilo/module.scm b/src/guile/skribilo/module.scm
index 84cd078..10b4d6b 100644
--- a/src/guile/skribilo/module.scm
+++ b/src/guile/skribilo/module.scm
@@ -59,6 +59,7 @@
(skribilo output)
(skribilo evaluator)
(skribilo debug)
+ (skribilo location)
))
(define %skribilo-user-autoloads
diff --git a/src/guile/skribilo/output.scm b/src/guile/skribilo/output.scm
index 6920056..02633f1 100644
--- a/src/guile/skribilo/output.scm
+++ b/src/guile/skribilo/output.scm
@@ -22,7 +22,7 @@
(define-module (skribilo output)
:export (output)
- :autoload (skribilo engine) (engine-ident)
+ :autoload (skribilo engine) (engine-ident processor-get-engine)
:autoload (skribilo writer) (writer? writer-ident lookup-markup-writer)
:use-module (skribilo lib)
:use-module (skribilo ast)