diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-04-13 12:27:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-04-14 16:01:53 +0200 |
| commit | bd4c345ef7ddf3542662fe0872b06393b414a3fc (patch) | |
| tree | c0fb5c68566691dde08bae599a756d5749298cd9 | |
| parent | 4487e42cba15110bce91d729b3e964f62347ed50 (diff) | |
| download | guix-bd4c345ef7ddf3542662fe0872b06393b414a3fc.tar guix-bd4c345ef7ddf3542662fe0872b06393b414a3fc.tar.gz | |
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.
| -rw-r--r-- | doc/build.scm | 12 |
1 files 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 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')." (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 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')." (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 |