[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.2-51-g31d5976

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=31d5976931adf4bd7cd4b0b0cbcbf3b84335f4a1

The branch, stable-2.0 has been updated
       via  31d5976931adf4bd7cd4b0b0cbcbf3b84335f4a1 (commit)
      from  b8287e882316bce594c0be0c9db7c5be12c27b96 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31d5976931adf4bd7cd4b0b0cbcbf3b84335f4a1
Author: Andy Wingo <address@hidden>
Date:   Tue Aug 23 12:47:51 2011 +0200

    texinfo: alias `url' to `uref'.
    
    * 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.

-----------------------------------------------------------------------

Summary of changes:
 module/texinfo.scm            |    9 +++++++--
 test-suite/tests/texinfo.test |    5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/module/texinfo.scm b/module/texinfo.scm
index 0b8285e..c43e64e 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 273227b..49d1086 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{}    }"


hooks/post-receive
-- 
GNU Guile