From deac7bf6ac7a943c9685949bf4dda7a2b1ba56c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 13 Apr 2020 12:27:17 +0200 Subject: [PATCH] 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. --- doc/build.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/build.scm b/doc/build.scm index ca81d813a9..994b94eae2 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -221,6 +221,7 @@ (define build (syntax-highlight lexers) (guix build utils) (srfi srfi-1) + (srfi srfi-26) (ice-9 match) (ice-9 threads) (ice-9 vlist)) @@ -358,9 +359,14 @@ (define (underscore-decode str) (define (anchor-id->key id) ;; Convert ID, an anchor ID such as ;; "index-pam_002dlimits_002dservice" to the corresponding key, - ;; "pam-limits-service" in this example. - (underscore-decode - (string-drop id (string-length "index-")))) + ;; "pam-limits-service" in this example. Drop the suffix of + ;; duplicate anchor IDs like "operating_002dsystem-1". + (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)) ;; Collect the anchors that appear in FILE, a makeinfo-generated