diff options
Diffstat (limited to 'src')
27 files changed, 80 insertions, 105 deletions
diff --git a/src/guile/skribilo.scm b/src/guile/skribilo.scm index 02efec1..223fffe 100644 --- a/src/guile/skribilo.scm +++ b/src/guile/skribilo.scm @@ -1,7 +1,7 @@ ;;; skribilo.scm -- The Skribilo document processor. ;;; ;;; Copyright 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2013, -;;; 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org> +;;; 2015, 2016, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr> ;;; ;;; @@ -32,8 +32,8 @@ (define-module (skribilo) #:autoload (skribilo module) (make-user-module *skribilo-user-module*) - #:autoload (skribilo engine) (*current-engine*) - #:autoload (skribilo reader) (*document-reader*) + #:use-module (skribilo engine) + #:use-module (skribilo reader) #:use-module (skribilo utils syntax) #:use-module (skribilo evaluator) @@ -436,8 +436,4 @@ options." (force-output (*skribilo-output-port*))))))) -;;; Local Variables: -;;; coding: latin-1 -;;; End: - ;;; skribilo ends here. diff --git a/src/guile/skribilo/biblio.scm b/src/guile/skribilo/biblio.scm index f255441..9d83cde 100644 --- a/src/guile/skribilo/biblio.scm +++ b/src/guile/skribilo/biblio.scm @@ -1,7 +1,6 @@ ;;; biblio.scm -- Bibliography functions. -;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2005, 2006, 2007, 2009, 2013, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2007, 2009, 2013, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2001, 2002, 2003, 2004 Manuel Serrano ;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI <eg@essi.fr> ;;; @@ -32,8 +31,8 @@ #:use-module (skribilo condition) #:autoload (skribilo reader) (*document-reader*) - #:autoload (skribilo parameters) (*bib-path*) - #:autoload (skribilo ast) (<markup> <handle> is-markup?) + #:use-module (skribilo parameters) + #:use-module (skribilo ast) #:autoload (skribilo lib) (skribe-warning) #:autoload (skribilo biblio author)(short-author-names) @@ -65,8 +64,6 @@ biblio-template-error:template biblio-parse-error:sexp)) -;;; Author: Erick Gallesio, Manuel Serrano, Ludovic Courtès -;;; ;;; Commentary: ;;; ;;; Provides the bibliography data type and basic bibliography handling, diff --git a/src/guile/skribilo/biblio/abbrev.scm b/src/guile/skribilo/biblio/abbrev.scm index 35a0758..a65df3d 100644 --- a/src/guile/skribilo/biblio/abbrev.scm +++ b/src/guile/skribilo/biblio/abbrev.scm @@ -1,6 +1,6 @@ ;;; abbrev.scm -- Determining abbreviations. ;;; -;;; Copyright 2006 Ludovic Courtès <ludovic.courtes@laas.fr> +;;; Copyright 2006, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -20,7 +20,7 @@ (define-module (skribilo biblio abbrev) #:use-module (srfi srfi-13) - #:autoload (skribilo ast) (markup? markup-body-set!) + #:use-module (skribilo ast) #:autoload (skribilo utils strings) (make-string-replace) #:autoload (ice-9 regex) (regexp-substitute/global) #:export (is-abbreviation? is-acronym? abbreviate-word diff --git a/src/guile/skribilo/biblio/author.scm b/src/guile/skribilo/biblio/author.scm index d38ecaa..b110e9c 100644 --- a/src/guile/skribilo/biblio/author.scm +++ b/src/guile/skribilo/biblio/author.scm @@ -1,7 +1,6 @@ ;;; author.scm -- Handling author names. -;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2006, 2007, 2008, 2009, 2015, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2006, 2007, 2008, 2009, 2015, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -26,7 +25,7 @@ #:use-module (srfi srfi-35) #:use-module (ice-9 match) #:use-module (skribilo biblio abbrev) - #:autoload (skribilo ast) (markup-option markup-body markup-ident) + #:use-module (skribilo ast) #:autoload (skribilo utils strings) (make-string-replace) #:autoload (skribilo package base) (it) #:use-module (skribilo utils syntax) @@ -43,7 +42,7 @@ bib-sort/first-author-last-name)) -;;; Author: Ludovic Courtès +;;; Author: Ludovic Courtès ;;; ;;; Commentary: ;;; @@ -101,8 +100,8 @@ #:optional (abbreviate-author-names abbreviate-author-first-names)) ;; Abbreviate first names in NAMES. NAMES is supposed to be - ;; something like "Ludovic Courtès, Marc-Olivier Killijian". The result - ;; is something like "L. Courtès, M-O. Killijian". + ;; something like "Ludovic Courtès, Marc-Olivier Killijian". The result + ;; is something like "L. Courtès, M-O. Killijian". (let loop ((names ((make-string-replace '((#\newline " ") (#\tab " "))) names)) diff --git a/src/guile/skribilo/biblio/bibtex.scm b/src/guile/skribilo/biblio/bibtex.scm index e8ec613..457e37a 100644 --- a/src/guile/skribilo/biblio/bibtex.scm +++ b/src/guile/skribilo/biblio/bibtex.scm @@ -1,6 +1,6 @@ ;;; bibtex.scm -- Handling BibTeX references. ;;; -;;; Copyright 2006, 2007 Ludovic Courtès <ludovic.courtes@laas.fr> +;;; Copyright 2006, 2007, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -21,14 +21,14 @@ (define-module (skribilo biblio bibtex) #:autoload (skribilo utils strings) (make-string-replace) - #:autoload (skribilo ast) (markup-option ast->string) + #:use-module (skribilo ast) #:autoload (skribilo engine) (engine-filter find-engine) #:use-module (skribilo biblio author) #:use-module (srfi srfi-39) #:use-module (srfi srfi-13) #:export (print-as-bibtex-entry)) -;;; Author: Ludovic Courtès +;;; Author: Ludovic Courtès ;;; ;;; Commentary: ;;; diff --git a/src/guile/skribilo/color.scm b/src/guile/skribilo/color.scm index 9697ea1..3ef3744 100644 --- a/src/guile/skribilo/color.scm +++ b/src/guile/skribilo/color.scm @@ -1,7 +1,6 @@ ;;; color.scm -- Color management. -;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2006, 2007 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2006, 2007, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI <eg@essi.fr> ;;; ;;; @@ -23,7 +22,7 @@ (define-module (skribilo color) #:use-module (skribilo utils syntax) - #:autoload (skribilo ast) (search-down) + #:use-module (skribilo ast) #:autoload (srfi srfi-1) (append-map) #:autoload (srfi srfi-60) (bitwise-and arithmetic-shift) #:export (color->rgb document-used-colors)) diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm index edbd69e..9055486 100644 --- a/src/guile/skribilo/engine/html.scm +++ b/src/guile/skribilo/engine/html.scm @@ -1,7 +1,6 @@ ;;; html.scm -- HTML engine. -;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Manuel Serrano ;;; ;;; @@ -63,7 +62,7 @@ (define unspecified? ;; XXX: Hack to recognize the unspecified value as understood by ;; `engine-custom' et al. - (let ((really-unspecified? unspecified?)) + (let ((really-unspecified? (@ (guile) unspecified?))) (lambda (x) (or (really-unspecified? x) (eq? x 'unspecified))))) diff --git a/src/guile/skribilo/engine/info.scm b/src/guile/skribilo/engine/info.scm index 9bebd02..81b4071 100644 --- a/src/guile/skribilo/engine/info.scm +++ b/src/guile/skribilo/engine/info.scm @@ -1,7 +1,6 @@ ;;; info.scm -- GNU Info engine. -;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2008, 2009, 2012, 2015, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2008, 2009, 2012, 2015, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2001, 2002 Manuel Serrano ;;; ;;; @@ -28,12 +27,11 @@ #:use-module (skribilo utils syntax) #:use-module (skribilo package base) #:autoload (skribilo parameters) (*destination-file*) - #:autoload (skribilo output) (output) - #:autoload (skribilo utils justify) (output-justified make-justifier - with-justification) + #:use-module (skribilo output) + #:use-module (skribilo utils justify) #:autoload (skribilo utils text-table) (table->ascii) #:autoload (skribilo utils images) (convert-image) - #:autoload (srfi srfi-1) (fold) + #:use-module (srfi srfi-1) #:use-module (srfi srfi-8) #:use-module (srfi srfi-11) #:use-module (srfi srfi-13) diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm index ba39280..42fe065 100644 --- a/src/guile/skribilo/engine/lout.scm +++ b/src/guile/skribilo/engine/lout.scm @@ -2,7 +2,7 @@ ;;; -*- coding: iso-8859-1 -*- ;;; ;;; Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, -;;; 2012, 2015, 2018 Ludovic Courtès <ludo@gnu.org> +;;; 2012, 2015, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -33,7 +33,7 @@ #:use-module (skribilo package base) #:autoload (skribilo utils images) (convert-image) #:autoload (skribilo evaluator) (evaluate-document) - #:autoload (skribilo output) (output) + #:autoload (skribilo output) (output *document-being-output*) #:autoload (skribilo color) (color->rgb) #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) @@ -42,7 +42,7 @@ #:use-module (srfi srfi-14) #:autoload (srfi srfi-34) (raise) #:use-module (srfi srfi-35) - #:autoload (ice-9 popen) (open-output-pipe) + #:autoload (ice-9 popen) (open-output-pipe close-pipe) #:autoload (ice-9 rdelim) (read-line) #:export (lout-engine diff --git a/src/guile/skribilo/evaluator.scm b/src/guile/skribilo/evaluator.scm index e1a5a7d..02babfd 100644 --- a/src/guile/skribilo/evaluator.scm +++ b/src/guile/skribilo/evaluator.scm @@ -1,7 +1,6 @@ ;;; eval.scm -- Skribilo evaluator. -;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2005, 2006, 2009, 2012 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2009, 2012, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI <eg@essi.fr> ;;; ;;; @@ -26,8 +25,7 @@ evaluate-document evaluate-document-from-port load-document include-document *load-options*) #:autoload (skribilo parameters) (*verbose* *document-path*) - #:autoload (skribilo engine) (*current-engine* - engine? find-engine engine-ident) + #:use-module (skribilo engine) #:autoload (skribilo reader) (*document-reader*) #:autoload (skribilo verify) (verify) diff --git a/src/guile/skribilo/index.scm b/src/guile/skribilo/index.scm index c0c779e..26dd266 100644 --- a/src/guile/skribilo/index.scm +++ b/src/guile/skribilo/index.scm @@ -1,6 +1,6 @@ -;;; index.scm -- Document indices. -*- coding: iso-8859-1 -*- +;;; index.scm -- Document indices. ;;; -;;; Copyright 2005, 2006, 2008, 2009, 2015, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2008, 2009, 2015, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Manuel Serrano ;;; ;;; @@ -31,9 +31,9 @@ ;; XXX: The use of `mark' here introduces a cross-dependency between ;; `index' and `package base'. Thus, we require that each of these two ;; modules autoloads the other one. - #:autoload (skribilo package base) (mark) + #:autoload (skribilo package base) (mark ref) - #:autoload (skribilo location) (location?) + #:use-module (skribilo location) #:export (index? make-index-table *index-table* default-index resolve-the-index)) diff --git a/src/guile/skribilo/output.scm b/src/guile/skribilo/output.scm index e789a00..9b35011 100644 --- a/src/guile/skribilo/output.scm +++ b/src/guile/skribilo/output.scm @@ -1,7 +1,6 @@ ;;; output.scm -- Skribilo output stage. -;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2005, 2006, 2008 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2008, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr> ;;; ;;; @@ -23,8 +22,9 @@ (define-module (skribilo output) #:autoload (skribilo engine) (engine-ident processor-get-engine) - #:autoload (skribilo writer) (writer? writer-ident lookup-markup-writer) - #:autoload (skribilo location) (location?) + #:autoload (skribilo writer) (<writer> writer? writer-ident + lookup-markup-writer invoke) + #:use-module (skribilo location) #:use-module (skribilo ast) #:use-module (skribilo debug) #:use-module (skribilo utils syntax) 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) diff --git a/src/guile/skribilo/reader/outline.scm b/src/guile/skribilo/reader/outline.scm index e416080..103dc3b 100644 --- a/src/guile/skribilo/reader/outline.scm +++ b/src/guile/skribilo/reader/outline.scm @@ -1,6 +1,6 @@ ;;; outline.scm -- A reader for Emacs' outline syntax. ;;; -;;; Copyright 2006, 2008, 2009 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2006, 2008, 2009, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; ;;; This file is part of Skribilo. @@ -29,7 +29,7 @@ #:use-module (srfi srfi-14) #:autoload (ice-9 rdelim) (read-line) - #:autoload (ice-9 regex) (make-regexp) + #:use-module (ice-9 regex) #:export (reader-specification make-outline-reader)) diff --git a/src/guile/skribilo/source/lisp.scm b/src/guile/skribilo/source/lisp.scm index ac161cb..f949582 100644 --- a/src/guile/skribilo/source/lisp.scm +++ b/src/guile/skribilo/source/lisp.scm @@ -1,6 +1,6 @@ ;;; lisp.scm -- Lisp Family Fontification ;;; -;;; Copyright 2005, 2006, 2007, 2008 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2007, 2008, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI <eg@essi.fr> ;;; ;;; @@ -28,7 +28,7 @@ #:use-module (srfi srfi-39) #:use-module (ice-9 match) #:autoload (skribilo reader) (make-reader) - #:autoload (skribilo source lisp-lex) (lexer-init) + #:autoload (skribilo source lisp-lex) (lexer-init lexer) #:export (skribe scheme stklos bigloo lisp)) diff --git a/src/guile/skribilo/utils/compat.scm b/src/guile/skribilo/utils/compat.scm index a1d5b74..81f2570 100644 --- a/src/guile/skribilo/utils/compat.scm +++ b/src/guile/skribilo/utils/compat.scm @@ -32,7 +32,7 @@ #:autoload (srfi srfi-13) (string-rindex) #:use-module (srfi srfi-34) #:use-module (ice-9 optargs) - #:autoload (skribilo ast) (ast? document? document-lookup-node) + #:use-module (skribilo ast) #:autoload (skribilo condition) (file-search-error? &file-search-error) #:autoload (skribilo reader) (make-reader) #:autoload (skribilo resolve) (*document-being-resolved*) diff --git a/src/guile/skribilo/utils/images.in b/src/guile/skribilo/utils/images.in index 672e8b5..9dc5999 100644 --- a/src/guile/skribilo/utils/images.in +++ b/src/guile/skribilo/utils/images.in @@ -1,6 +1,6 @@ ;;; images.scm -- Images handling utilities. ;;; -;;; Copyright 2005, 2006, 2007, 2008 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2006, 2007, 2008, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr> ;;; ;;; @@ -24,14 +24,12 @@ *fig-convert-program* *generic-convert-program*) #:autoload (skribilo utils files) (file-suffix file-prefix) - #:autoload (skribilo parameters) (*image-path* *verbose*) + #:use-module (skribilo parameters) #:autoload (skribilo condition) (&file-search-error) #:autoload (srfi srfi-34) (raise) #:use-module (srfi srfi-35) #:use-module (srfi srfi-39)) -;;; Author: Erick Gallesio, Ludovic Courtès -;;; ;;; Commentary: ;;; ;;; This module provides convenience functions to handle image files, notably diff --git a/src/guile/skribilo/verify.scm b/src/guile/skribilo/verify.scm index 0689c2a..02f21fb 100644 --- a/src/guile/skribilo/verify.scm +++ b/src/guile/skribilo/verify.scm @@ -1,7 +1,6 @@ ;;; verify.scm -- Skribe AST verification. -;;; -*- coding: iso-8859-1 -*- ;;; -;;; Copyright 2005, 2007, 2008, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright 2005, 2007, 2008, 2018, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr> ;;; ;;; @@ -28,7 +27,7 @@ #:use-module (skribilo ast) #:use-module (skribilo condition) #:use-module (skribilo utils syntax) - #:autoload (skribilo location) (location?) + #:use-module (skribilo location) #:autoload (srfi srfi-34) (raise) #:use-module (srfi srfi-35) diff --git a/src/guile/skribilo/writer.scm b/src/guile/skribilo/writer.scm index b757f03..77d85f0 100644 --- a/src/guile/skribilo/writer.scm +++ b/src/guile/skribilo/writer.scm @@ -30,7 +30,7 @@ #:use-module (skribilo utils syntax) #:autoload (srfi srfi-1) (find filter) #:autoload (srfi srfi-34) (raise) - #:autoload (skribilo engine) (engine? engine-ident? default-engine) + #:autoload (skribilo engine) (engine? engine-ident default-engine) #:use-module (srfi srfi-35) #:use-module (skribilo condition) |