branch master updated: doc: Fix building the cookbook.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

hoebjo pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 7c65fc3  doc: Fix building the cookbook.
7c65fc3 is described below

commit 7c65fc378cf68b598965fd977f5844050435ac97
Author: Björn Höfling <address@hidden>
AuthorDate: Tue Apr 28 13:51:31 2020 +0200

    doc: Fix building the cookbook.
    
    Fixes <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40803>.
    Reported by "operator.name" <address@hidden>.
    
    * doc/build.scm (%languages): Add smaller list for the cookbook.
    (syntax-highlighted-html): Adapt regexp for mono-node files to include
    the cookbook.
---
 doc/build.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/build.scm b/doc/build.scm
index 3907b49..2b6d0c4 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019, 2020 Ludovic Courtès <address@hidden>
+;;; Copyright © 2020 Björn Höfling <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -58,7 +59,10 @@
       "guix"))
 
 (define %languages
-  '("de" "en" "es" "fr" "ru" "zh_CN"))
+  ;; The cookbook is currently only translated into German.
+  (if (string=? %manual "guix-cookbook")
+      '("de" "en")
+      '("de" "en" "es" "fr" "ru" "zh_CN")))
 
 (define (texinfo-manual-images source)
   "Return a directory containing all the images used by the user manual, taken
@@ -451,7 +455,9 @@ its <pre class=\"lisp\"> blocks (as produced by 'makeinfo 
--html')."
                             (lambda (mono)
                               (let ((anchors (collect-anchors mono)))
                                 (process-html mono anchors)))
-                            (find-files #$input 
"^guix(\\.[a-zA-Z_-]+)?\\.html$"))
+                            (find-files
+                             #$input
+                             "^guix(-cookbook|)(\\.[a-zA-Z_-]+)?\\.html$"))
 
             ;; Next process the multi-node HTML files in two phases: (1)
             ;; collect the list of anchors, and (2) perform