diff options
| author | Ludovic Courtes | 2006-01-18 23:24:41 +0000 |
|---|---|---|
| committer | Ludovic Courtes | 2006-01-18 23:24:41 +0000 |
| commit | eefcf2eac6f4df4f0576ffbbccb280df17d463e4 (patch) | |
| tree | 49d12a11c44138755cb93fbfbf11a436128828f0 /doc/skr | |
| parent | 5a6d3f06176735d654b5db8d396b3b043bfca3c8 (diff) | |
| parent | 8bdcb386f3ce26a9031ca123b4d43af0b5a3721a (diff) | |
| download | skribilo-eefcf2eac6f4df4f0576ffbbccb280df17d463e4.tar.gz skribilo-eefcf2eac6f4df4f0576ffbbccb280df17d463e4.tar.lz skribilo-eefcf2eac6f4df4f0576ffbbccb280df17d463e4.zip | |
Merge from lcourtes@laas.fr--2005-mobile
Patches applied:
* lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2 (patch 27-28)
- Merge from lcourtes@laas.fr--2004-libre
- More fixes in the hope to get the manual compiled.
git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-31
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))) |