diff options
| author | Ludovic Courtès | 2020-08-01 16:58:33 +0200 |
|---|---|---|
| committer | Ludovic Courtès | 2020-08-01 17:00:15 +0200 |
| commit | 6a890c20d685e1862c2af0fb8b69c116c5e3f857 (patch) | |
| tree | 45af85b4c7d3f66ce346ad43145fe10a7f4c9f43 /src/guile/skribilo/engine | |
| parent | 6b64f84d234927e84fdd9290721384a0aba27de7 (diff) | |
| download | skribilo-6a890c20d685e1862c2af0fb8b69c116c5e3f857.tar.gz skribilo-6a890c20d685e1862c2af0fb8b69c116c5e3f857.tar.lz skribilo-6a890c20d685e1862c2af0fb8b69c116c5e3f857.zip | |
Adjust autoload lists.
In preparation for Guile 3 support, adjust #:autoload clauses to include list all the necessary bindings, or replace them with #:use-module.
Diffstat (limited to 'src/guile/skribilo/engine')
| -rw-r--r-- | src/guile/skribilo/engine/html.scm | 5 | ||||
| -rw-r--r-- | src/guile/skribilo/engine/info.scm | 10 | ||||
| -rw-r--r-- | src/guile/skribilo/engine/lout.scm | 6 |
3 files changed, 9 insertions, 12 deletions
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 |