summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--module/texinfo.scm9
-rw-r--r--test-suite/tests/texinfo.test5
2 files changed, 11 insertions, 3 deletions
diff --git a/module/texinfo.scm b/module/texinfo.scm
index 0b8285e0f..c43e64eb6 100644
--- a/module/texinfo.scm
+++ b/module/texinfo.scm
@@ -1,6 +1,6 @@
;;;; (texinfo) -- parsing of texinfo into SXML
;;;;
-;;;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;;;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
;;;; Copyright (C) 2004, 2009 Andy Wingo <wingo at pobox dot com>
;;;; Copyright (C) 2001,2002 Oleg Kiselyov <oleg at pobox dot com>
;;;;
@@ -168,6 +168,9 @@ line, received through their attribute list, and parsed text until the
@code{EOF-TEXT-ARGS} receives its arguments in its attribute list, as in
@code{ENVIRON}.
+In addition, @code{ALIAS} can alias one command to another. The alias
+will never be seen in parsed stexinfo.
+
There are four @@-commands that are treated specially. @code{@@include}
is a low-level token that will not be seen by higher-level parsers, so
it has no content-model. @code{@@para} is the paragraph command, which
@@ -210,7 +213,6 @@ lambda. Only present for @code{INLINE-ARGS}, @code{EOL-ARGS},
(dfn INLINE-TEXT)
(cite INLINE-TEXT)
(acro INLINE-TEXT)
- (url INLINE-TEXT)
(email INLINE-TEXT)
(emph INLINE-TEXT)
(strong INLINE-TEXT)
@@ -230,6 +232,7 @@ lambda. Only present for @code{INLINE-ARGS}, @code{EOL-ARGS},
(ref INLINE-ARGS . (node #:opt name section info-file manual))
(xref INLINE-ARGS . (node #:opt name section info-file manual))
(pxref INLINE-ARGS . (node #:opt name section info-file manual))
+ (url ALIAS . uref)
(uref INLINE-ARGS . (url #:opt title replacement))
(anchor INLINE-ARGS . (name))
(dots INLINE-ARGS . ())
@@ -654,6 +657,8 @@ Examples:
(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))
diff --git a/test-suite/tests/texinfo.test b/test-suite/tests/texinfo.test
index 273227b5f..49d108698 100644
--- a/test-suite/tests/texinfo.test
+++ b/test-suite/tests/texinfo.test
@@ -1,6 +1,6 @@
;;;; texinfo.test -*- scheme -*-
;;;;
-;;;; Copyright (C) 2010 Free Software Foundation, Inc.
+;;;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
;;;; Copyright (C) 2001,2002 Oleg Kiselyov <oleg at pobox dot com>
;;;;
;;;; This library is free software; you can redistribute it and/or
@@ -207,6 +207,9 @@
(test-body "@code{arg}"
'((para (code "arg"))))
+ ;; FIXME: Why no enclosing para here? Probably a bug.
+ (test-body "@url{arg}"
+ '((uref (% (url "arg")))))
(test-body "@code{ }"
'((para (code))))
(test-body "@code{ @code{} }"