This is an automated email from the git hooks/post-receive script.
civodul pushed a commit to branch version-1.4.0
in repository guix.
The following commit(s) were added to refs/heads/version-1.4.0 by this push:
new efc8489651 doc: Adjust HTML patterns to correctly process Texinfo 6.8
output.
efc8489651 is described below
commit efc8489651e656994402843f053742ce1c58aa7a
Author: Ludovic Courtès <[email protected]>
AuthorDate: Thu May 25 23:19:40 2023 +0200
doc: Adjust HTML patterns to correctly process Texinfo 6.8 output.
Prior to ceb5ef8347ae0e3015296f5c169ab903bac526a8, (@ (gnu packages
texinfo) texinfo), which is what is used here, was pointing to version 6.7.
* doc/build.scm (html-manual-identifier-index)[build](worthy-entry?):
Adjust patterns for Texinfo 6.8.
(syntax-highlighted-html)[build](syntax-highlight): Likewise.
---
doc/build.scm | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/doc/build.scm b/doc/build.scm
index 8b8eed639f..0a5bddbcb6 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019-2022 Ludovic Courtès <[email protected]>
+;;; Copyright © 2019-2023 Ludovic Courtès <[email protected]>
;;; Copyright © 2020 Björn Höfling <[email protected]>
;;; Copyright © 2022 Maxim Cournoyer <[email protected]>
;;;
@@ -284,6 +284,9 @@ actual file name."
(loop rest))
((('strong _ ...) _ ...)
#t)
+ ((('span ('@ ('class "category")) ;raw Texinfo 6.8
+ (? string-or-entity?) ...) rest ...)
+ #t)
((('span ('@ ('class "symbol-definition-category"))
(? string-or-entity?) ...) rest ...)
#t)
@@ -507,10 +510,16 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo
--html')."
;; Replace the ugly <strong> used for @deffn etc., which
;; translate to <dt>, with more stylable markup.
- (('dt (@ ('id id)) category ... ('strong thing))
+ (('dt ('@ ('id id)) ;raw Texinfo 6.8
+ ('span ('@ ('class "category")) category ...)
+ ('span ('strong thing)
+ anchor))
(highlight-definition id category thing '()))
- (('dt (@ ('id id)) category ... ('strong thing)
- (? space?) ('em args ...))
+ (('dt (@ ('id id))
+ ('span ('@ ('class "category")) category ...)
+ ('span ('strong thing)
+ (? space?) ('em args ...)
+ anchor))
(highlight-definition id category thing args))
((tag ('@ attributes ...) body ...)
