summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-03-20 14:19:29 -0400
committerMathieu Othacehe <othacehe@gnu.org>2021-04-02 11:09:06 +0200
commit8603bcd5822a1a8364a7a74a698059d3d147568b (patch)
treeb9e64a630a9436883dddadd5d3d183b7dbc0afca
parentf350df405fbcd5b9e27e6b6aa500da7f101f41e7 (diff)
downloadguix-8603bcd5822a1a8364a7a74a698059d3d147568b.tar.gz
doc: Remove the guile-lib/htmlprag-fixed package.
This hotfix package is no longer necessary as the ability to parameterize the
way htmlprag tokenizes HTML was added in guile-lib 0.2.7.

* doc/build.scm (guile-lib/htmlprag-fixed): Remove variable.
(html-manual-identifier-index): Replace guile-lib/htmlprag-fixed by guile-lib,
and make set the %strict-tokenizer? parameter to #t.
(syntax-highlighted-html): Likewise.
-rw-r--r--doc/build.scm34
1 files changed, 6 insertions, 28 deletions
diff --git a/doc/build.scm b/doc/build.scm
index d77fc0a700..e96df1991f 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -182,32 +182,6 @@ as well as images, OS examples, and translations."
     "-c" "EXTRA_HEAD=<meta name=\"viewport\" \
 content=\"width=device-width, initial-scale=1\" />"))
 
-(define guile-lib/htmlprag-fixed
-  ;; Guile-Lib with a hotfix for (htmlprag).
-  (package
-    (inherit guile-lib)
-    (arguments
-     (substitute-keyword-arguments (package-arguments guile-lib)
-       ((#:phases phases '%standard-phases)
-        `(modify-phases ,phases
-           (add-before 'build 'fix-htmlprag
-             (lambda _
-               ;; When parsing
-               ;; "<body><blockquote><p>foo</p>\n</blockquote></body>",
-               ;; 'html->shtml' would mistakenly close 'blockquote' right
-               ;; before <p>.  This patch removes 'p' from the
-               ;; 'parent-constraints' alist to fix that.
-               (substitute* "src/htmlprag.scm"
-                 (("^[[:blank:]]*\\(p[[:blank:]]+\\. \\(body td th\\)\\).*")
-                  ""))
-               #t))
-           (add-before 'check 'skip-known-failure
-             (lambda _
-               ;; XXX: The above change causes one test failure among
-               ;; the htmlprag tests.
-               (setenv "XFAIL_TESTS" "htmlprag.scm")
-               #t))))))))
-
 (define (normalize-language-code language)        ;XXX: deduplicate
   ;; Normalize LANGUAGE.  For instance, "zh_CN" becomes "zh-cn".
   (string-map (match-lambda
@@ -224,7 +198,7 @@ key is an identifier and the associated value is the URL reference pointing to
 that identifier.  The URL is constructed by concatenating BASE-URL to the
 actual file name."
   (define build
-    (with-extensions (list guile-lib/htmlprag-fixed)
+    (with-extensions (list guile-lib)
       (with-imported-modules '((guix build utils))
         #~(begin
             (use-modules (guix build utils)
@@ -236,6 +210,8 @@ actual file name."
                          (ice-9 threads)
                          (ice-9 pretty-print))
 
+            (%strict-tokenizer? #t)
+
             (define file-url
               (let ((prefix (string-append #$manual "/")))
                 (lambda (file)
@@ -380,7 +356,7 @@ actual file name."
 to (1) add them a link to SYNTAX-CSS-URL, and (2) highlight the syntax of all
 its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
   (define build
-    (with-extensions (list guile-lib/htmlprag-fixed guile-syntax-highlight)
+    (with-extensions (list guile-lib guile-syntax-highlight)
       (with-imported-modules '((guix build utils))
         #~(begin
             (use-modules (htmlprag)
@@ -394,6 +370,8 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
                          (ice-9 threads)
                          (ice-9 vlist))
 
+            (%strict-tokenizer? #t)
+
             (define (pair-open/close lst)
               ;; Pair 'open' and 'close' tags produced by 'highlights' and
               ;; produce nested 'paren' tags instead.