mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-31 06:46:50 +01:00
doc: Adjust HTML patterns to correctly process Texinfo 6.8 output.
Prior to ceb5ef8347
, (@ (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.
This commit is contained in:
parent
085bf9cd21
commit
fb1c5d4df7
1 changed files with 13 additions and 4 deletions
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2019-2022 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2019-2023 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
|
@ -284,6 +284,9 @@ (define (worthy-entry? lst)
|
||||||
(loop rest))
|
(loop rest))
|
||||||
((('strong _ ...) _ ...)
|
((('strong _ ...) _ ...)
|
||||||
#t)
|
#t)
|
||||||
|
((('span ('@ ('class "category")) ;raw Texinfo 6.8
|
||||||
|
(? string-or-entity?) ...) rest ...)
|
||||||
|
#t)
|
||||||
((('span ('@ ('class "symbol-definition-category"))
|
((('span ('@ ('class "symbol-definition-category"))
|
||||||
(? string-or-entity?) ...) rest ...)
|
(? string-or-entity?) ...) rest ...)
|
||||||
#t)
|
#t)
|
||||||
|
@ -507,10 +510,16 @@ (define (syntax-highlight sxml anchors)
|
||||||
|
|
||||||
;; Replace the ugly <strong> used for @deffn etc., which
|
;; Replace the ugly <strong> used for @deffn etc., which
|
||||||
;; translate to <dt>, with more stylable markup.
|
;; 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 '()))
|
(highlight-definition id category thing '()))
|
||||||
(('dt (@ ('id id)) category ... ('strong thing)
|
(('dt (@ ('id id))
|
||||||
(? space?) ('em args ...))
|
('span ('@ ('class "category")) category ...)
|
||||||
|
('span ('strong thing)
|
||||||
|
(? space?) ('em args ...)
|
||||||
|
anchor))
|
||||||
(highlight-definition id category thing args))
|
(highlight-definition id category thing args))
|
||||||
|
|
||||||
((tag ('@ attributes ...) body ...)
|
((tag ('@ attributes ...) body ...)
|
||||||
|
|
Loading…
Reference in a new issue