summaryrefslogtreecommitdiff
path: root/src/guile/skribilo.scm
diff options
context:
space:
mode:
authorLudovic Courtes2006-01-18 23:22:29 +0000
committerLudovic Courtes2006-01-18 23:22:29 +0000
commit8bdcb386f3ce26a9031ca123b4d43af0b5a3721a (patch)
tree49d12a11c44138755cb93fbfbf11a436128828f0 /src/guile/skribilo.scm
parent72c195ec8923ca616648ccf64b002a80bcda1415 (diff)
downloadskribilo-8bdcb386f3ce26a9031ca123b4d43af0b5a3721a.tar.gz
skribilo-8bdcb386f3ce26a9031ca123b4d43af0b5a3721a.tar.lz
skribilo-8bdcb386f3ce26a9031ca123b4d43af0b5a3721a.zip
More fixes in the hope to get the manual compiled.
* doc/skr/api.skr (define-markup?): Accept `define-public'. (define-markup-options): Accept any kind of `define' symbol. (define-markup-rest): Likewise. * doc/user/bib.skb (bibliography): Use `src/bib1.sbib'. (bib-table?): Provide a definition. (default-bib-table): Likewise. (make-bib-table): Likewise. (bibliography): Fixed a `ref'. (example): Fixed file name. This example does not work yet. * doc/user/footnote.skb (footnote): Documented `label', removed `number'. * doc/user/table.skb (th): Documented `rowspan'. * src/guile/skribilo.scm (skribilo-options): Added `-S'/`--source-path'. Honor it. * src/guile/skribilo/coloring/lisp.scm: Use `(ice-9 match)'. Rewrote all the `match-case' code into corresponding `match' statements. (definition-search): Fixed, using `source-property' and `port-line'. Does not work yet due to a bug in guile-reader's source position recording (shows 1 line earlier). Added a READ parameter. * src/guile/skribilo/skribe/api.scm: Mark SYMBOL as replaced instead of blindly overriding the core binding. git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-28
Diffstat (limited to 'src/guile/skribilo.scm')
-rw-r--r--src/guile/skribilo.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/guile/skribilo.scm b/src/guile/skribilo.scm
index b9805b3..43885ee 100644
--- a/src/guile/skribilo.scm
+++ b/src/guile/skribilo.scm
@@ -87,7 +87,7 @@ specifications."
(set! paths (cons path paths)))
(("bib-path" :alternate "B" :arg path :help "adds <path> to bibliography path")
(skribe-bib-path-set! (cons path (skribe-bib-path))))
- (("S" :arg path :help "adds <path> to source path")
+ (("source-path" :alternate "S" :arg path :help "adds <path> to source path")
(skribe-source-path-set! (cons path (skribe-source-path))))
(("P" :arg path :help "adds <path> to image path")
(skribe-image-path-set! (cons path (skribe-image-path))))
@@ -388,6 +388,7 @@ Processes a Skribilo/Skribe source file and produces its output.
(warning-level (option-ref options 'warning "2"))
(load-path (option-ref options 'load-path "."))
(bib-path (option-ref options 'bib-path "."))
+ (source-path (option-ref options 'source-path "."))
(preload '())
(variants '())
@@ -414,6 +415,9 @@ Processes a Skribilo/Skribe source file and produces its output.
(parameterize ((*current-engine* engine)
(*document-path* (cons load-path (*document-path*)))
(*bib-path* (cons bib-path (*bib-path*)))
+ (*source-path* (cons source-path
+ (append %load-path
+ (*source-path*))))
(*warning* (string->number warning-level))
(*verbose* (let ((v (option-ref options
'verbose 0)))