[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/06: doc: Improve anchor collection.
From: |
guix-commits |
Subject: |
06/06: doc: Improve anchor collection. |
Date: |
Tue, 14 Apr 2020 10:02:22 -0400 (EDT) |
civodul pushed a commit to branch version-1.1.0
in repository guix.
commit bd4c345ef7ddf3542662fe0872b06393b414a3fc
Author: Ludovic Courtès <address@hidden>
AuthorDate: Mon Apr 13 12:27:17 2020 +0200
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 ca81d81..994b94e 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
- branch version-1.1.0 updated (0ad60b2 -> bd4c345), guix-commits, 2020/04/14
- 01/06: maint: Actually check for the availablility of system packages., guix-commits, 2020/04/14
- 02/06: maint: Ensure substitutes are available for '%default-xorg-modules'., guix-commits, 2020/04/14
- 03/06: weather: Delete duplicate entries coming from '--manifest'., guix-commits, 2020/04/14
- 05/06: doc: Avoid invalid 'match' pattern in 'syntax-highlighted-html'., guix-commits, 2020/04/14
- 04/06: doc: Emit hyperlinks in HTML output for @lisp snippets., guix-commits, 2020/04/14
- 06/06: doc: Improve anchor collection.,
guix-commits <=