diff options
Diffstat (limited to 'src/guile/skribilo/package')
-rw-r--r-- | src/guile/skribilo/package/base.scm | 13 | ||||
-rw-r--r-- | src/guile/skribilo/package/eq.scm | 9 | ||||
-rw-r--r-- | src/guile/skribilo/package/jfp.scm | 7 | ||||
-rw-r--r-- | src/guile/skribilo/package/lncs.scm | 12 | ||||
-rw-r--r-- | src/guile/skribilo/package/pie.scm | 7 | ||||
-rw-r--r-- | src/guile/skribilo/package/sigplan.scm | 5 | ||||
-rw-r--r-- | src/guile/skribilo/package/slide/base.scm | 4 | ||||
-rw-r--r-- | src/guile/skribilo/package/slide/lout.scm | 12 | ||||
-rw-r--r-- | src/guile/skribilo/package/web-article.scm | 5 |
9 files changed, 33 insertions, 41 deletions
diff --git a/src/guile/skribilo/package/base.scm b/src/guile/skribilo/package/base.scm index d287caa..647ebb5 100644 --- a/src/guile/skribilo/package/base.scm +++ b/src/guile/skribilo/package/base.scm @@ -32,15 +32,20 @@ #:use-module (skribilo utils keywords) #:autoload (srfi srfi-1) (every any filter) #:autoload (skribilo evaluator) (include-document) - #:autoload (skribilo engine) (engine?) + #:use-module (skribilo engine) #:autoload (skribilo parameters)(*document-path* *sui-path*) ;; optional ``sub-packages'' #:autoload (skribilo biblio) (*bib-table* resolve-bib - bib-load! bib-add! bib-sort-refs/number) - #:autoload (skribilo source) (language? source-read-lines source-fontify) + bib-load! bib-add! bib-sort-refs/number + bib-sort/authors assign-entries-numbers! + assign-entries-name+years! + resolve-the-bib) + #:autoload (skribilo source) (language? source-read-lines + source-fontify source-read-definition) #:autoload (skribilo prog) (make-prog-body resolve-line) - #:autoload (skribilo index) (make-index-table default-index) + #:autoload (skribilo index) (make-index-table default-index + index? resolve-the-index) #:autoload (skribilo sui) (load-sui sui-ref->url) #:replace (symbol)) diff --git a/src/guile/skribilo/package/eq.scm b/src/guile/skribilo/package/eq.scm index 4d640c9..3d57ddd 100644 --- a/src/guile/skribilo/package/eq.scm +++ b/src/guile/skribilo/package/eq.scm @@ -1,7 +1,6 @@ ;;; eq.scm -- An equation formatting package. -;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2005, 2006, 2007, 2008, 2009, 2012 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2007, 2008, 2009, 2012, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -20,8 +19,8 @@ ;;; along with Skribilo. If not, see <http://www.gnu.org/licenses/>. (define-module (skribilo package eq) - #:autoload (skribilo ast) (markup? find1-up) - #:autoload (skribilo output) (output) + #:use-module (skribilo ast) + #:use-module (skribilo output) #:use-module (skribilo writer) #:use-module (skribilo engine) #:use-module (skribilo lib) @@ -38,7 +37,7 @@ #:use-module (srfi srfi-39) #:use-module (ice-9 optargs)) -;;; Author: Ludovic Courtès +;;; Author: Ludovic Courtès ;;; ;;; Commentary: ;;; diff --git a/src/guile/skribilo/package/jfp.scm b/src/guile/skribilo/package/jfp.scm index 5052092..140ff4c 100644 --- a/src/guile/skribilo/package/jfp.scm +++ b/src/guile/skribilo/package/jfp.scm @@ -1,8 +1,7 @@ ;;; jfp.scm -- The Skribe style for JFP articles. -;;; -*- coding: iso-8859-1 -*- ;;; ;;; Copyright 2003, 2004 Manuel Serrano -;;; Copyright 2007 Ludovic Courtès <ludo@chbouib.org> +;;; Copyright 2007, 2020 Ludovic Courtès <ludo@chbouib.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -26,7 +25,7 @@ #:use-module (skribilo writer) #:autoload (skribilo output) (output) #:autoload (skribilo evaluator) (evaluate-document) - #:autoload (skribilo lib) (skribe-error) + #:use-module (skribilo lib) #:autoload (skribilo biblio template) (output-bib-entry-template) #:autoload (skribilo utils keywords) (the-body) #:use-module (skribilo package base) @@ -38,7 +37,7 @@ #:export (abstract references)) -;;; Author: Manuel Serrano, Ludovic Courtès +;;; Author: Manuel Serrano, Ludovic Courtès ;;; ;;; Commentary: ;;; diff --git a/src/guile/skribilo/package/lncs.scm b/src/guile/skribilo/package/lncs.scm index 8ad5240..2e6bb21 100644 --- a/src/guile/skribilo/package/lncs.scm +++ b/src/guile/skribilo/package/lncs.scm @@ -1,8 +1,7 @@ ;;; lncs.scm -- The Skribilo style for LNCS articles. -;;; -*- coding: iso-8859-1 -*- ;;; ;;; Copyright 2003, 2004 Manuel Serrano -;;; Copyright 2007, 2015, 2018 Ludovic Courtès <ludovic.courtes@laas.fr> +;;; Copyright 2007, 2015, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -25,12 +24,13 @@ #:use-module (skribilo engine) #:use-module (skribilo writer) #:autoload (skribilo output) (output) - #:autoload (skribilo package base) (chapter font flush - toc the-bibliography) + #:use-module (skribilo package base) #:autoload (skribilo utils keywords) (the-options the-body) #:autoload (skribilo biblio template)(output-bib-entry-template make-bib-entry-template/default) - #:autoload (skribilo biblio author) (bib-sort/first-author-last-name) + #:autoload (skribilo biblio author) (bib-sort/first-author-last-name + abbreviate-author-first-names/family-first + abbreviate-first-names) #:autoload (skribilo evaluator) (evaluate-document) #:use-module (skribilo lib) @@ -44,7 +44,7 @@ (skribilo-module-syntax) -;;; Author: Manuel Serrano, Ludovic Courtès +;;; Author: Manuel Serrano, Ludovic Courtès ;;; ;;; Commentary: ;;; diff --git a/src/guile/skribilo/package/pie.scm b/src/guile/skribilo/package/pie.scm index e08acee..54bc718 100644 --- a/src/guile/skribilo/package/pie.scm +++ b/src/guile/skribilo/package/pie.scm @@ -1,7 +1,6 @@ ;;; pie.scm -- An pie-chart formatting package. -;;; -*- coding: utf-8 -*- ;;; -;;; Copyright 2005, 2006, 2007, 2009, 2010 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2007, 2009, 2010, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -29,9 +28,9 @@ #:use-module (skribilo utils keywords) ;; `the-options', etc. #:use-module (skribilo utils strings) ;; `make-string-replace' #:autoload (skribilo color) (color->rgb) - #:autoload (skribilo package base) (bold) + #:use-module (skribilo package base) #:autoload (srfi srfi-13) (string-concatenate) - #:autoload (ice-9 popen) (open-output-pipe) + #:autoload (ice-9 popen) (open-output-pipe close-pipe) #:use-module (ice-9 optargs) #:export (%ploticus-program %ploticus-debug? pie-sliceweight-value pie-remove-markup)) diff --git a/src/guile/skribilo/package/sigplan.scm b/src/guile/skribilo/package/sigplan.scm index 6d049c7..d62389e 100644 --- a/src/guile/skribilo/package/sigplan.scm +++ b/src/guile/skribilo/package/sigplan.scm @@ -1,7 +1,6 @@ ;;; sigplan.scm -- The Skribe style for ACMPROC articles. -;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2007, 2009 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2007, 2009, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Manuel Serrano ;;; ;;; @@ -27,7 +26,7 @@ #:autoload (skribilo output) (output) #:autoload (skribilo evaluator) (evaluate-document) #:use-module (skribilo lib) - #:autoload (skribilo utils keywords) (the-body) + #:use-module (skribilo utils keywords) #:use-module (skribilo package base) #:use-module (srfi srfi-1) diff --git a/src/guile/skribilo/package/slide/base.scm b/src/guile/skribilo/package/slide/base.scm index f840b18..de8f983 100644 --- a/src/guile/skribilo/package/slide/base.scm +++ b/src/guile/skribilo/package/slide/base.scm @@ -1,6 +1,6 @@ ;;; base.scm -- Overhead transparencies, `base' engine. ;;; -;;; Copyright 2006, 2008 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2006, 2008, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Manuel Serrano ;;; ;;; @@ -27,7 +27,7 @@ #:use-module (skribilo engine) #:use-module (skribilo ast) #:autoload (skribilo output) (output) - #:autoload (skribilo package base) (symbol color itemize item) + #:use-module (skribilo package base) #:use-module (srfi srfi-1) diff --git a/src/guile/skribilo/package/slide/lout.scm b/src/guile/skribilo/package/slide/lout.scm index 41c47cd..bb166a9 100644 --- a/src/guile/skribilo/package/slide/lout.scm +++ b/src/guile/skribilo/package/slide/lout.scm @@ -1,6 +1,6 @@ ;;; lout.scm -- Lout implementation of the `slide' package. ;;; -;;; Copyright 2005, 2006, 2008 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2008, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -30,15 +30,7 @@ #:use-module (srfi srfi-13) ;; `string-join' - ;; XXX: If changing the following `autoload' to `use-module' doesn't work, - ;; then you need to fix your Guile. See this thread about - ;; `make-autoload-interface': - ;; - ;; http://article.gmane.org/gmane.lisp.guile.devel/5748 - ;; http://lists.gnu.org/archive/html/guile-devel/2006-03/msg00004.html . - - #:autoload (skribilo engine lout) (lout-tagify lout-output-pdf-meta-info - lout-verbatim-encoding)) + #:use-module (skribilo engine lout)) (skribilo-module-syntax) diff --git a/src/guile/skribilo/package/web-article.scm b/src/guile/skribilo/package/web-article.scm index 8ef5adc..e7a1b46 100644 --- a/src/guile/skribilo/package/web-article.scm +++ b/src/guile/skribilo/package/web-article.scm @@ -1,7 +1,6 @@ ;;; web-article.scm -- A style to produce web articles. -;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2007, 2008 Ludovic Courtès <ludo@chbouib.org> +;;; Copyright 2007, 2008, 2020 Ludovic Courtès <ludo@chbouib.org> ;;; Copyright 2003, 2004 Manuel Serrano ;;; ;;; @@ -29,7 +28,7 @@ #:use-module (skribilo package base) #:autoload (skribilo output) (output) - #:autoload (skribilo evaluator) (evaluate-document) + #:autoload (skribilo evaluator) (evaluate-document *load-options*) #:autoload (skribilo engine html) (html-width html-title-authors) #:autoload (skribilo utils strings) (string-canonicalize) |