1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 04:10:18 +02:00

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.
This commit is contained in:
Andy Wingo 2011-03-26 13:33:21 +01:00
parent 362126aa96
commit 38c50a99b6

View file

@ -1,6 +1,6 @@
;;;; (texinfo html) -- translating stexinfo into shtml ;;;; (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> ;;;; Copyright (C) 2003,2004,2009 Andy Wingo <wingo at pobox dot com>
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
@ -148,14 +148,12 @@ name, @code{#}, and the node name."
(apply append body))))) (apply append body)))))
(define (entry tag args . 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)) (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)) (cdr body))
`(,@(map (lambda (heading) (append out `((dd ,@(map stexi->shtml body)))))))
`(dt ,@(map stexi->shtml heading)))
headings)
(dd ,@(map stexi->shtml body))))))
(define tag-replacements (define tag-replacements
'((titlepage div (@ (class "titlepage"))) '((titlepage div (@ (class "titlepage")))