[Guile-commits] GNU Guile branch, master, updated. release_1-9-14-91-gc32f0d6

[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=c32f0d6b87b8a7ec024b3d6d54c9b03e9dfd73a4

The branch, master has been updated
       via  c32f0d6b87b8a7ec024b3d6d54c9b03e9dfd73a4 (commit)
      from  667230810b2ef95b6e8ee0b33ff1cdb61cc3ca21 (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 c32f0d6b87b8a7ec024b3d6d54c9b03e9dfd73a4
Author: Andy Wingo <address@hidden>
Date:   Tue Jan 25 17:59:45 2011 +0100

    stexi->shtml supports itemx
    
    * module/texinfo/html.scm (entry, rules): Allow @itemx,

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

Summary of changes:
 module/texinfo/html.scm |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/module/texinfo/html.scm b/module/texinfo/html.scm
index 1e37fdc..81dd1f1 100644
--- a/module/texinfo/html.scm
+++ b/module/texinfo/html.scm
@@ -148,8 +148,14 @@ name, @code{#}, and the node name."
                (apply append body)))))
 
 (define (entry tag args . body)
-  `((dt ,@(arg-req 'heading args))
-    (dd ,@body)))
+  (let lp ((headings (list (arg-req 'heading args))) (body body))
+    (if (and (pair? body) (pair? (car body)) (eq? (caar body) 'itemx))
+        (lp (cons (cdar body) headings)
+            (cdr body))
+        `(,@(map (lambda (heading)
+                   `(dt ,@(map stexi->shtml heading)))
+                 headings)
+          (dd ,@(map stexi->shtml body))))))
 
 (define tag-replacements
   '((titlepage    div (@ (class "titlepage")))
@@ -230,7 +236,7 @@ name, @code{#}, and the node name."
     (node . ,node) (anchor . ,node)
     (table . ,table)
     (enumerate . ,enumerate)
-    (entry . ,entry)
+    (entry *preorder* . ,entry)
 
     (deftp . ,def) (defcv . ,def) (defivar . ,def) (deftypeivar . ,def)
     (defop . ,def) (deftypeop . ,def) (defmethod . ,def)


hooks/post-receive
-- 
GNU Guile