summaryrefslogtreecommitdiff
path: root/src/guile/skribilo/engine
diff options
context:
space:
mode:
authorLudovic Courtès2007-12-11 17:07:18 +0100
committerLudovic Courtès2007-12-11 17:07:18 +0100
commitb944137b1fe3e2ba16f3942d14dc5e58d8dd28c6 (patch)
tree8d05dea6c4517cf202dd1e75b96930d85d38104b /src/guile/skribilo/engine
parent9b10150c17b02bfcb21dd21269a71db8b45ceb37 (diff)
downloadskribilo-b944137b1fe3e2ba16f3942d14dc5e58d8dd28c6.tar.gz
skribilo-b944137b1fe3e2ba16f3942d14dc5e58d8dd28c6.tar.lz
skribilo-b944137b1fe3e2ba16f3942d14dc5e58d8dd28c6.zip
Improve `(skribilo config)'.
* configure.ac: Don't generate `src/guile/skribilo/config.scm'; don't substitute `SKRIBILO_DOC_DIR', `SKRIBILO_EXT_DIR' and `SKRIBILO_SKR_PATH'. * doc/modules/skribilo/documentation/env.scm (*courtes-mail*): Update. (*skribe-user-doc-url*, *skribe-dir-doc-url*): Update. * src/guile/skribilo/Makefile.am (CLEANFILES, .in): New. Include `substitute.am'. * src/guile/skribilo/config.scm.in: Overhauled. * src/guile/skribilo/engine/context.scm: Use `skribilo-version' instead of `skribilo-release'. * src/guile/skribilo/engine/lout.scm: Likewise. * src/guile/skribilo/utils/compat.scm: Use `(skribilo config)'. (skribe-release, skribe-url, skribe-doc-dir, skribe-ext-dir, skribe-default-path, skribe-scheme): New.
Diffstat (limited to 'src/guile/skribilo/engine')
-rw-r--r--src/guile/skribilo/engine/context.scm4
-rw-r--r--src/guile/skribilo/engine/lout.scm4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/guile/skribilo/engine/context.scm b/src/guile/skribilo/engine/context.scm
index c56c9cf..970b35f 100644
--- a/src/guile/skribilo/engine/context.scm
+++ b/src/guile/skribilo/engine/context.scm
@@ -33,7 +33,7 @@
:autoload (skribilo output) (output *document-being-output*)
:autoload (skribilo color) (color->rgb
document-used-colors)
- :autoload (skribilo config) (skribilo-release)
+ :autoload (skribilo config) (skribilo-version)
:use-module (ice-9 optargs)
:use-module (ice-9 receive)
:export (context-engine
@@ -430,7 +430,7 @@
(display "% interface=en output=pdftex\n")
(display "%%%% -*- TeX -*-\n")
(format #t "%%%% File automatically generated by Skribilo ~A\n\n"
- (skribilo-release))
+ (skribilo-version))
;; Make URLs active
(display "\\setupinteraction[state=start]\n")
;; Choose the document font
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index e9483dd..49365ca 100644
--- a/src/guile/skribilo/engine/lout.scm
+++ b/src/guile/skribilo/engine/lout.scm
@@ -710,8 +710,8 @@
;; Extra PDF information, an alist of key-value
;; pairs (string pairs).
- (pdf-extra-info (("SkribeVersion"
- ,(skribilo-release))))
+ (pdf-extra-info (("SkribiloVersion"
+ ,(skribilo-version))))
;; Tells whether to produce PDF "docinfo"
;; (meta-information with title, author,