Merge from lcourtes@laas.fr--2004-libre

Patches applied:

 * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2  (patch 12-16)

   - Fixed and updated the installation process.
   - Created a canonical module for Skribilo syntactic sugar.
   - More `%skribilo-module-reader' fixes.
   - Fixed `ref' and bibliography-related things.
   - Fixed Lout-related thingies.

git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-14

1 files changed, 35 insertions, 33 deletions

diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index 64a3c5d..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.
@@ -2879,7 +2881,7 @@
 ;* At some point, we might want to move this to `slide.scm'.           */
 ;*---------------------------------------------------------------------*/
 
-(use-modules (skribilo packages slide))
+(use-modules (skribilo package slide))
 
 (markup-writer 'slide
    :options '(:title :number :toc :ident) ;; '(:bg :vspace :image)
@@ -2941,8 +2943,8 @@
                (display (lout-embedded-postscript-code
                          (filter pdfmark))))))
 
-For movies, see
-http://www.tug.org/tex-archive/macros/latex/contrib/movie15/movie15.sty .
+;; For movies, see
+;; http://www.tug.org/tex-archive/macros/latex/contrib/movie15/movie15.sty .
 (markup-writer 'slide-embed
    :options '(:alt :geometry :rgeometry :geometry-opt :command)
    ;; FIXME:  `pdfmark'.