[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-219-g4215ea7

[Ludovic Courtès]

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=4215ea75a525a848ce9d73fad9c03983e8b3cd0d

The branch, stable-2.0 has been updated
       via  4215ea75a525a848ce9d73fad9c03983e8b3cd0d (commit)
       via  797b2aa69aeb7db607250bad83d31a31f8f4d1c7 (commit)
       via  c52ce75a1f87e72d675fc5a6ad95ef26dd517e10 (commit)
      from  14ae4725ab5cdfc334786012c0b4fdacc2851be2 (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 4215ea75a525a848ce9d73fad9c03983e8b3cd0d
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 21 16:42:54 2013 +0100

    texinfo: Recognize `@:'.
    
    * module/texinfo.scm (read-command-token): Recognize @:.
    * test-suite/tests/texinfo.test ("test-texinfo->stexinfo"): Add test.

commit 797b2aa69aeb7db607250bad83d31a31f8f4d1c7
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 21 16:37:48 2013 +0100

    texinfo: Allow markup in the arguments of address@hidden'.
    
    * module/texinfo.scm (texi-command-specs)[pxref]: Change to
      `INLINE-TEXT-ARGS'.
    * test-suite/tests/texinfo.test ("test-texinfo->stexinfo")["@pxref{Locales,
      @code{setlocale}}"]: New test.

commit c52ce75a1f87e72d675fc5a6ad95ef26dd517e10
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 21 16:36:24 2013 +0100

    test suite: Use `pass-if-equal' in texinfo.test.
    
    * test-suite/tests/texinfo.test: Replace occurrences of
      `(pass-if (equal? ...))' by `pass-if-equal'.

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

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

diff --git a/module/texinfo.scm b/module/texinfo.scm
index edee5b3..91bb46d 100644
--- a/module/texinfo.scm
+++ b/module/texinfo.scm
@@ -216,7 +216,8 @@ lambda. Only present for @code{INLINE-ARGS}, 
@code{EOL-ARGS},
     (value              INLINE-ARGS . (key))
     (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))
+    (pxref              INLINE-TEXT-ARGS
+                        . (node #:opt name section info-file manual))
     (url                ALIAS       . uref)
     (uref               INLINE-ARGS . (url #:opt title replacement))
     (anchor             INLINE-ARGS . (name))
@@ -484,7 +485,7 @@ Examples:
   (assert-curr-char '(#\@) "start of the command" port)
   (let ((peeked (peek-char port)))
     (cond
-     ((memq peeked '(#\! #\. #\? #\@ #\\ #\{ #\}))
+     ((memq peeked '(#\! #\: #\. #\? #\@ #\\ #\{ #\}))
       ;; @-commands that escape characters
       (make-token 'STRING (string (read-char port))))
      (else
diff --git a/test-suite/tests/texinfo.test b/test-suite/tests/texinfo.test
index 8a4b593..c4ee582 100644
--- a/test-suite/tests/texinfo.test
+++ b/test-suite/tests/texinfo.test
@@ -1,6 +1,6 @@
 ;;;; texinfo.test                 -*- scheme -*-
 ;;;;
-;;;; Copyright (C) 2010, 2011, 2012  Free Software Foundation, Inc.
+;;;; Copyright (C) 2010, 2011, 2012, 2013  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
@@ -56,24 +56,24 @@
       str
       (lambda (port) (texinfo:read-verbatim-body port consumer '())))))
 
-  (pass-if (equal? '()
-                   (read-verbatim-body-from-string "@end verbatim\n")))
+  (pass-if-equal '()
+      (read-verbatim-body-from-string "@end verbatim\n"))
 
   ;; after @verbatim, the current position will always directly after
   ;; the newline.
   (pass-if-exception "@end verbatim needs a newline"
                      exception:eof-while-reading-token
                      (read-verbatim-body-from-string "@end verbatim"))
-                     
-  (pass-if (equal? '("@@end verbatim" " NL\n")
-                   (read-verbatim-body-from-string "@@end address@hidden 
verbatim\n")))
 
-  (pass-if (equal? '("@@@@faosfasf adsfas " " NL\n" " asf @foo{asdf}" " NL\n")
-                   (read-verbatim-body-from-string
-                    "@@@@faosfasf adsfas \n asf @address@hidden verbatim\n")))
+  (pass-if-equal '("@@end verbatim" " NL\n")
+      (read-verbatim-body-from-string "@@end address@hidden verbatim\n"))
 
-  (pass-if (equal? '("@end verbatim " " NL\n")
-                   (read-verbatim-body-from-string "@end verbatim 
address@hidden verbatim\n"))))
+  (pass-if-equal '("@@@@faosfasf adsfas " " NL\n" " asf @foo{asdf}" " NL\n")
+      (read-verbatim-body-from-string
+       "@@@@faosfasf adsfas \n asf @address@hidden verbatim\n"))
+
+  (pass-if-equal '("@end verbatim " " NL\n")
+      (read-verbatim-body-from-string "@end verbatim address@hidden 
verbatim\n")))
 
 (define texinfo:read-arguments
   (@@ (texinfo) read-arguments))
@@ -84,8 +84,8 @@
      (lambda (port) (texinfo:read-arguments port #\}))))
 
   (define (test str expected-res)
-    (pass-if (equal? expected-res
-                     (read-arguments-from-string str))))
+    (pass-if-equal expected-res
+        (read-arguments-from-string str)))
 
   (test "}" '())
   (test "foo}" '("foo"))
@@ -111,20 +111,20 @@
              (texinfo:complete-start-command command port))
          list))))
 
-  (pass-if (equal? '(section () EOL-TEXT)
-                   (test 'section "foo bar baz bonzerts")))
-  (pass-if (equal? '(deffnx ((category "Function") (name "foo") (arguments)) 
EOL-TEXT-ARGS)
-                   (test 'deffnx "Function foo")))
+  (pass-if-equal '(section () EOL-TEXT)
+      (test 'section "foo bar baz bonzerts"))
+  (pass-if-equal '(deffnx ((category "Function") (name "foo") (arguments)) 
EOL-TEXT-ARGS)
+      (test 'deffnx "Function foo"))
   (pass-if-exception "@emph missing a start brace"
                      exception:wrong-character
                      (test 'emph "no brace here"))
-  (pass-if (equal? '(emph () INLINE-TEXT)
-                   (test 'emph "{foo bar baz bonzerts")))
-  (pass-if (equal? '(ref ((node "foo bar") (section "baz") (info-file 
"bonzerts"))
-                         INLINE-ARGS)
-                   (test 'ref "{ foo bar ,,  baz, bonzerts}")))
-  (pass-if (equal? '(node ((name "referenced node")) EOL-ARGS)
-                   (test 'node " referenced node\n"))))
+  (pass-if-equal '(emph () INLINE-TEXT)
+      (test 'emph "{foo bar baz bonzerts"))
+  (pass-if-equal '(ref ((node "foo bar") (section "baz") (info-file 
"bonzerts"))
+                       INLINE-ARGS)
+      (test 'ref "{ foo bar ,,  baz, bonzerts}"))
+  (pass-if-equal '(node ((name "referenced node")) EOL-ARGS)
+      (test 'node " referenced node\n")))
 
 (define texinfo:read-char-data
   (@@ (texinfo) read-char-data))
@@ -149,8 +149,8 @@
                 port expect-eof? preserve-ws? str-handler '()))))
         (lambda (seed token)
           (let ((result (reverse seed)))
-            (pass-if (equal? expected-data result))
-            (pass-if (equal? expected-token token))))))
+            (pass-if-equal expected-data result)
+            (pass-if-equal expected-token token)))))
 
     ;; add some newline-related tests here
     (test "" #t #f '() eof-object)
@@ -167,8 +167,8 @@
 
 (with-test-prefix "test-texinfo->stexinfo"
   (define (test str expected-res)
-    (pass-if (equal? expected-res
-                     (call-with-input-string str texi->stexi))))
+    (pass-if-equal expected-res
+        (call-with-input-string str texi->stexi)))
   (define (try-with-title title str)
     (call-with-input-string
      (string-append "foo bar address@hidden " title "\n" str)
@@ -177,9 +177,8 @@
     (test (string-append "foo bar address@hidden " title "\n" str)
           expected-res))
   (define (test-body str expected-res)
-    (pass-if str
-      (equal? expected-res
-              (cddr (try-with-title "zog" str)))))
+    (pass-if-equal str expected-res
+      (cddr (try-with-title "zog" str))))
 
   (define (list-intersperse src-l elem)
     (if (null? src-l) src-l
@@ -417,4 +416,9 @@
                           (name "foo")
                           (arguments "bar " (code "baz"))))
                (para "text that should be in a para")))
+  (test-body "@pxref{Locales, @code{setlocale}}"
+             '((para (pxref (% (node "Locales")
+                               (name (code "setlocale")))))))
+  (test-body "Like this---e.g.@:, at colon."
+             ((para "Like this---e.g.:, at colon.")))
   )


hooks/post-receive
-- 
GNU Guile