diff options
| author | Ludovic Courtes | 2006-01-18 23:22:29 +0000 |
|---|---|---|
| committer | Ludovic Courtes | 2006-01-18 23:22:29 +0000 |
| commit | 8bdcb386f3ce26a9031ca123b4d43af0b5a3721a (patch) | |
| tree | 49d12a11c44138755cb93fbfbf11a436128828f0 /doc/skr | |
| parent | 72c195ec8923ca616648ccf64b002a80bcda1415 (diff) | |
| download | skribilo-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 'doc/skr')
| -rw-r--r-- | doc/skr/api.skr | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/skr/api.skr b/doc/skr/api.skr index 6d0c5bd..ec51e95 100644 --- a/doc/skr/api.skr +++ b/doc/skr/api.skr @@ -105,7 +105,7 @@ ;*---------------------------------------------------------------------*/ (define (define-markup? id o) (match o - (((or 'define-markup 'define 'define-inline) + (((or 'define-markup 'define 'define-public 'define-inline) ((? (lambda (x) (eq? x id))) . (? (lambda (x) (or (pair? x) (null? x))))) . _) @@ -185,7 +185,7 @@ ;*---------------------------------------------------------------------*/ (define (define-markup-options def) (match def - (('define-markup (args ___) _) + ((_ (args ___) _ ___) (if (not (list? args)) '() (let ((keys (memq #!key args))) @@ -197,7 +197,7 @@ (('define-simple-container _) '((ident #f) (class #f))) (else - (skribe-error 'define-markup-formals + (skribe-error 'define-markup-options "Illegal `define-markup' form" def)))) @@ -208,7 +208,7 @@ ;*---------------------------------------------------------------------*/ (define (define-markup-rest def) (match def - (('define-markup (args ___) _) + ((_ (args ___) _) (if (not (pair? args)) args (let ((l (last-pair args))) |