[Guile-commits] GNU Guile branch, master, updated. v2.1.0-155-g3f826e3

[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=3f826e3c9ed41ae822463b6ab42b93360e0e7b84

The branch, master has been updated
       via  3f826e3c9ed41ae822463b6ab42b93360e0e7b84 (commit)
      from  18c44b29e4438976dac86a3cb53a273dde42e294 (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 3f826e3c9ed41ae822463b6ab42b93360e0e7b84
Author: Andy Wingo <address@hidden>
Date:   Sun Nov 9 15:56:33 2014 +0000

    texinfo: fix @url{@@} parsing
    
    * module/texinfo.scm (texi-command-specs): The body of @url{} can have
      texinfo commands.
    
    * test-suite/tests/texinfo.test ("test-texinfo->stexinfo"): Add tests.

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

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

diff --git a/module/texinfo.scm b/module/texinfo.scm
index 02fec16..f3af5c3 100644
--- a/module/texinfo.scm
+++ b/module/texinfo.scm
@@ -219,7 +219,7 @@ lambda. Only present for @code{INLINE-ARGS}, 
@code{EOL-ARGS},
     (pxref              INLINE-TEXT-ARGS
                         . (node #:opt name section info-file manual))
     (url                ALIAS       . uref)
-    (uref               INLINE-ARGS . (url #:opt title replacement))
+    (uref               INLINE-TEXT-ARGS . (url #:opt title replacement))
     (anchor             INLINE-ARGS . (name))
     (dots               INLINE-ARGS . ())
     (result             INLINE-ARGS . ())
diff --git a/test-suite/tests/texinfo.test b/test-suite/tests/texinfo.test
index 9c6722f..6f7d4c7 100644
--- a/test-suite/tests/texinfo.test
+++ b/test-suite/tests/texinfo.test
@@ -209,6 +209,10 @@
              '((para (code "arg"))))
   (test-body "@url{arg}"
              '((para (uref (% (url "arg"))))))
+  (test-body "@url{@@}"
+             '((para (uref (% (url "@"))))))
+  (test-body "@address@hidden"
+             '((para (uref (% (url (var "foo")))))))
   (test-body "@code{     }"
              '((para (code))))
   (test-body "@code{ @code{}    }"


hooks/post-receive
-- 
GNU Guile