mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 14:50:19 +02:00
Code Activity

texinfo: alias url' to uref'.

Browse source 
* module/texinfo.scm (texi-command-specs, complete-start-command):
  Upstream texinfo has aliased `url' to `uref'.  Let's do the same.

* test-suite/tests/texinfo.test ("test-texinfo->stexinfo"): Add a test.
This commit is contained in:
Andy Wingo 2011-08-23 12:47:51 +02:00
parent b8287e8823
commit 31d5976931
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
module/texinfo.scm
View file

@ -1,6 +1,6 @@
;;;; (texinfo) -- parsing of texinfo into SXML ;;;; (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) 2004, 2009 Andy Wingo <wingo at pobox dot com>
;;;; Copyright (C) 2001,2002 Oleg Kiselyov <oleg 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{EOF-TEXT-ARGS} receives its arguments in its attribute list, as in
@code{ENVIRON}. @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} 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 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 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) (dfn INLINE-TEXT)
(cite INLINE-TEXT) (cite INLINE-TEXT)
(acro INLINE-TEXT) (acro INLINE-TEXT)
(url INLINE-TEXT)
(email INLINE-TEXT) (email INLINE-TEXT)
(emph INLINE-TEXT) (emph INLINE-TEXT)
(strong 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)) (ref INLINE-ARGS . (node #:opt name section info-file manual))
(xref 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)) (pxref INLINE-ARGS . (node #:opt name section info-file manual))
(url ALIAS . uref)
(uref INLINE-ARGS . (url #:opt title replacement)) (uref INLINE-ARGS . (url #:opt title replacement))
(anchor INLINE-ARGS . (name)) (anchor INLINE-ARGS . (name))
(dots INLINE-ARGS . ()) (dots INLINE-ARGS . ())
@ -654,6 +657,8 @@ Examples:
(type (cadr spec)) (type (cadr spec))
(arg-names (cddr spec))) (arg-names (cddr spec)))
(case type (case type
((ALIAS)
(complete-start-command arg-names port))
((INLINE-TEXT) ((INLINE-TEXT)
(assert-curr-char '(#\{) "Inline element lacks {" port) (assert-curr-char '(#\{) "Inline element lacks {" port)
(values command '() type)) (values command '() type))

5
test-suite/tests/texinfo.test
View file

@ -1,6 +1,6 @@
;;;; texinfo.test -*- scheme -*- ;;;; 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> ;;;; Copyright (C) 2001,2002 Oleg Kiselyov <oleg at pobox dot com>
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
@ -207,6 +207,9 @@
(test-body "@code{arg}" (test-body "@code{arg}"
'((para (code "arg")))) '((para (code "arg"))))
;; FIXME: Why no enclosing para here? Probably a bug.
(test-body "@url{arg}"
'((uref (% (url "arg")))))
(test-body "@code{ }" (test-body "@code{ }"
'((para (code)))) '((para (code))))
(test-body "@code{ @code{} }" (test-body "@code{ @code{} }"