summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Court`es2005-12-02 17:30:37 +0000
committerLudovic Court`es2005-12-02 17:30:37 +0000
commitc4c942f265f9cd7730155ecb978eb1b98051e764 (patch)
tree36fda326a3bf010d033de7e6672e126493b2d0e6
parent3918fa2a728f00838ffda94ec6427b133c5abb68 (diff)
downloadskribilo-c4c942f265f9cd7730155ecb978eb1b98051e764.tar.gz
skribilo-c4c942f265f9cd7730155ecb978eb1b98051e764.tar.lz
skribilo-c4c942f265f9cd7730155ecb978eb1b98051e764.zip
Fixed Lout-related thingies.
* src/guile/skribilo/engine/lout.scm: Auto-load `(ice-9 rdelim)' (used by `lout-illustration'). (lout-structure-number-string): Define as public. (footnote): Support `:label' instead of `:number'. (lout-illustration): Define as public. * src/guile/skribilo/module.scm (%skribilo-user-autoloads): Added `(skribilo engine lout)'. git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-16
-rw-r--r--src/guile/skribilo/engine/lout.scm62
-rw-r--r--src/guile/skribilo/module.scm6
2 files changed, 37 insertions, 31 deletions
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index 5c6ec22..6d3dbfa 100644
--- a/src/guile/skribilo/engine/lout.scm
+++ b/src/guile/skribilo/engine/lout.scm
@@ -1,30 +1,30 @@
-;*=====================================================================*/
-;* Lout Skribe engine */
-;* ------------------------------------------------------------- */
-;* (C) Copyright 2004, 2005 Ludovic Courtès */
-;* */
-;* Taken from `lcourtes@laas.fr--2004-libre/ */
-;* skribe-lout--main--0.2--patch-15' */
-;* Based on `latex.skr', copyright 2003,2004 Manuel Serrano. */
-;*=====================================================================*/
-
-(define-skribe-module (skribilo engine lout))
-
-;* This is the Lout engine, part of Skribilo.
-;*
-;* Skribe is free software; you can redistribute it and/or modify
-;* it under the terms of the GNU General Public License as published by
-;* the Free Software Foundation; either version 2 of the License, or
-;* (at your option) any later version.
-;*
-;* Skribe is distributed in the hope that it will be useful,
-;* but WITHOUT ANY WARRANTY; without even the implied warranty of
-;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;* GNU General Public License for more details.
-;*
-;* You should have received a copy of the GNU General Public License
-;* along with Skribe; if not, write to the Free Software
-;* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+;;; lout.scm -- A Lout engine.
+;;;
+;;; Copyright 2004, 2005 Ludovic Courtès <ludovic.courtes@laas.fr>
+;;;
+;;;
+;;; This program is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 2 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program; if not, write to the Free Software
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+;;; USA.
+
+;;; Taken from `lcourtes@laas.fr--2004-libre',
+;;; `skribe-lout--main--0.2--patch-15'.
+;;; Based on `latex.skr', copyright 2003, 2004 Manuel Serrano.
+
+
+(define-skribe-module (skribilo engine lout)
+ :autoload (ice-9 rdelim) (read-line))
;*---------------------------------------------------------------------*/
@@ -1277,8 +1277,10 @@
"`document-type' should be one of `book', `report' or `doc'"
doc-type)))))
-(define (lout-structure-number-string markup)
+(define-public (lout-structure-number-string markup)
;; Return a structure number string such as "1.2".
+ ;; FIXME: External code has started to rely on this. This should be
+ ;; generalized and moved elsewhere.
(let loop ((struct markup))
(if (document? struct)
""
@@ -1496,7 +1498,7 @@
;* footnote ... */
;*---------------------------------------------------------------------*/
(markup-writer 'footnote
- :options '(:number)
+ :options '(:label)
:before (lambda (n e)
(let ((number (markup-option n :number))
(use-number?
@@ -2777,7 +2779,7 @@
;*---------------------------------------------------------------------*/
;* Illustrations */
;*---------------------------------------------------------------------*/
-(define (lout-illustration . args)
+(define-public (lout-illustration . args)
;; Introduce a Lout illustration (such as a diagram) whose code is either
;; the body of `lout-illustration' or the contents of `file'. For engines
;; other than Lout, an EPS file is produced and then converted if needed.
diff --git a/src/guile/skribilo/module.scm b/src/guile/skribilo/module.scm
index 66f4940..b88c3b7 100644
--- a/src/guile/skribilo/module.scm
+++ b/src/guile/skribilo/module.scm
@@ -64,7 +64,11 @@
(define %skribilo-user-autoloads
;; List of auxiliary modules that may be lazily autoloaded.
- '(((skribilo source) . (source-read-lines source-fontify))
+ '(((skribilo engine lout) . (lout-illustration
+ ;; FIXME: The following should eventually be
+ ;; removed from here.
+ lout-structure-number-string))
+ ((skribilo source) . (source-read-lines source-fontify))
((skribilo coloring lisp) . (skribe scheme lisp))
((skribilo coloring xml) . (xml))
((skribilo color) .