[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.0-134-g38c50a9

[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=38c50a99b695694b684662663294eaeba2bcba30

The branch, stable-2.0 has been updated
       via  38c50a99b695694b684662663294eaeba2bcba30 (commit)
       via  362126aa96cbe2429d2a6202d0be63de6f93505b (commit)
      from  c6e05396dc73c3bcfa71b92b4689e8cb6d4588eb (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 38c50a99b695694b684662663294eaeba2bcba30
Author: Andy Wingo <address@hidden>
Date:   Sat Mar 26 13:33:21 2011 +0100

    fix stexi->html double translation
    
    * module/texinfo/html.scm (entry): Fix to avoid double translation:
      arg-req already pulls an stexi->shtml on its arg.

commit 362126aa96cbe2429d2a6202d0be63de6f93505b
Author: Andy Wingo <address@hidden>
Date:   Sat Mar 26 12:53:10 2011 +0100

    fix (texinfo reflection) to handle nested structures like syntax patterns
    
    * module/texinfo/reflection.scm (process-args): Convert any arg to a
      string.  "Fixes" documentation of syntax-rules patterns.

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

Summary of changes:
 module/texinfo/html.scm       |   12 +++++-------
 module/texinfo/reflection.scm |    4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/module/texinfo/html.scm b/module/texinfo/html.scm
index 81dd1f1..709744d 100644
--- a/module/texinfo/html.scm
+++ b/module/texinfo/html.scm
@@ -1,6 +1,6 @@
 ;;;; (texinfo html) -- translating stexinfo into shtml
 ;;;;
-;;;;   Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;;;;   Copyright (C) 2009, 2010, 2011  Free Software Foundation, Inc.
 ;;;;    Copyright (C) 2003,2004,2009 Andy Wingo <wingo at pobox dot com>
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
@@ -148,14 +148,12 @@ name, @code{#}, and the node name."
                (apply append body)))))
 
 (define (entry tag args . body)
-  (let lp ((headings (list (arg-req 'heading args))) (body body))
+  (let lp ((out `((dt ,@(arg-req 'heading args))))
+           (body body))
     (if (and (pair? body) (pair? (car body)) (eq? (caar body) 'itemx))
-        (lp (cons (cdar body) headings)
+        (lp (append out `(dt ,@(map stexi->shtml (cdar body))))
             (cdr body))
-        `(,@(map (lambda (heading)
-                   `(dt ,@(map stexi->shtml heading)))
-                 headings)
-          (dd ,@(map stexi->shtml body))))))
+        (append out `((dd ,@(map stexi->shtml body)))))))
 
 (define tag-replacements
   '((titlepage    div (@ (class "titlepage")))
diff --git a/module/texinfo/reflection.scm b/module/texinfo/reflection.scm
index 52b1ee9..a69436f 100644
--- a/module/texinfo/reflection.scm
+++ b/module/texinfo/reflection.scm
@@ -1,6 +1,6 @@
 ;;;; (texinfo reflection) -- documenting Scheme as stexinfo
 ;;;;
-;;;;   Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;;;;   Copyright (C) 2009, 2010, 2011  Free Software Foundation, Inc.
 ;;;;    Copyright (C) 2003,2004,2009  Andy Wingo <wingo at pobox dot com>
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
@@ -86,7 +86,7 @@
                                  (cons* (car in) infix out)))))))
 
 (define (process-args args)
-  (map (lambda (x) (if (symbol? x) (symbol->string x) x))
+  (map (lambda (x) (if (string? x) x (object->string x)))
        (list*-join (or args '())
                    " " " . ")))
 


hooks/post-receive
-- 
GNU Guile