me
/
guix
Archived
1
0
Fork 0
Code

doc: Improve anchor collection. 

This allows us to catch "operating_002dsystem-1", for instance.

* doc/build.scm (syntax-highlighted-html)[build](anchor-id->key): Drop
"-1" & co. from ID.
master
Ludovic Courtès 2020-04-13 12:27:17 +02:00
parent 4487e42cba
commit bd4c345ef7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/build.scm
View File

@ -221,6 +221,7 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
(syntax-highlight lexers) (syntax-highlight lexers)
(guix build utils) (guix build utils)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26)
(ice-9 match) (ice-9 match)
(ice-9 threads) (ice-9 threads)
(ice-9 vlist)) (ice-9 vlist))
@ -358,9 +359,14 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
(define (anchor-id->key id) (define (anchor-id->key id)
;; Convert ID, an anchor ID such as ;; Convert ID, an anchor ID such as
;; "index-pam_002dlimits_002dservice" to the corresponding key, ;; "index-pam_002dlimits_002dservice" to the corresponding key,
;; "pam-limits-service" in this example. ;; "pam-limits-service" in this example. Drop the suffix of
(underscore-decode ;; duplicate anchor IDs like "operating_002dsystem-1".
(string-drop id (string-length "index-")))) (let ((id (if (any (cut string-suffix? <> id)
'("-1" "-2" "-3" "-4" "-5"))
(string-drop-right id 2)
id)))
(underscore-decode
(string-drop id (string-length "index-")))))
(define* (collect-anchors file #:optional (vhash vlist-null)) (define* (collect-anchors file #:optional (vhash vlist-null))
;; Collect the anchors that appear in FILE, a makeinfo-generated ;; Collect the anchors that appear in FILE, a makeinfo-generated