summaryrefslogtreecommitdiff
path: root/module/texinfo.scm
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-08-25 11:52:44 +0200
committerAndy Wingo <wingo@pobox.com>2012-08-25 14:11:45 +0200
commitdc7a9cefbf5434b6e7e503fe83faa07b24a1a6cd (patch)
tree49c1a4aa9fd861e16d611aa340889ff391c2a793 /module/texinfo.scm
parent6c9220064d987deee813cfd933d50353d14d4c0f (diff)
downloadguile-dc7a9cefbf5434b6e7e503fe83faa07b24a1a6cd.tar.gz
more robust texinfo alias handling
* module/texinfo.scm (command-spec): Resolve aliases here. (complete-start-command, make-command-parser): (make-dom-parser, parse-environment-args): Reload command after resolving spec, so we get the alias target.
Diffstat (limited to 'module/texinfo.scm')
-rw-r--r--module/texinfo.scm28
1 files changed, 19 insertions, 9 deletions
diff --git a/module/texinfo.scm b/module/texinfo.scm
index 2ffd85393..519db485d 100644
--- a/module/texinfo.scm
+++ b/module/texinfo.scm
@@ -384,8 +384,14 @@ Examples:
;; Like a DTD for texinfo
(define (command-spec command)
- (or (assq command texi-command-specs)
- (parser-error #f "Unknown command" command)))
+ (let ((spec (assq command texi-command-specs)))
+ (cond
+ ((not spec)
+ (parser-error #f "Unknown command" command))
+ ((eq? (cadr spec) 'ALIAS)
+ (command-spec (cddr spec)))
+ (else
+ spec))))
(define (inline-content? content)
(case content
@@ -647,11 +653,10 @@ Examples:
(arguments->attlist port (read-arguments port stop-char) arg-names))
(let* ((spec (command-spec command))
+ (command (car spec))
(type (cadr spec))
(arg-names (cddr spec)))
(case type
- ((ALIAS)
- (complete-start-command arg-names port))
((INLINE-TEXT)
(assert-curr-char '(#\{) "Inline element lacks {" port)
(values command '() type))
@@ -954,7 +959,9 @@ Examples:
(loop port expect-eof? end-para need-break? seed)))
((START) ; Start of an @-command
(let* ((head (token-head token))
- (type (cadr (command-spec head)))
+ (spec (command-spec head))
+ (head (car spec))
+ (type (cadr spec))
(inline? (inline-content? type))
(seed ((if (and inline? (not need-break?))
identity end-para) seed))
@@ -1045,8 +1052,9 @@ Examples:
(lambda (command args content seed) ; fdown
'())
(lambda (command args parent-seed seed) ; fup
- (let ((seed (reverse-collect-str-drop-ws seed))
- (spec (command-spec command)))
+ (let* ((seed (reverse-collect-str-drop-ws seed))
+ (spec (command-spec command))
+ (command (car spec)))
(if (eq? (cadr spec) 'INLINE-TEXT-ARGS)
(cons (list command (cons '% (parse-inline-text-args #f spec seed)))
parent-seed)
@@ -1062,8 +1070,10 @@ Examples:
(let ((parser (make-dom-parser)))
;; duplicate arguments->attlist to avoid unnecessary splitting
(lambda (command port)
- (let ((args (cdar (parser '*ENVIRON-ARGS* port '())))
- (arg-names (cddr (command-spec command))))
+ (let* ((args (cdar (parser '*ENVIRON-ARGS* port '())))
+ (spec (command-spec command))
+ (command (car spec))
+ (arg-names (cddr spec)))
(cond
((not arg-names)
(if (null? args) '()