GNU bug report logs - #40944
doc: Fix building the cookbook

Previous Next

Package: guix-patches;

Reported by: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>

Date: Tue, 28 Apr 2020 17:37:02 UTC

Severity: normal

Done: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: Ludovic Courtès <ludo <at> gnu.org>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
Cc: 40944 <at> debbugs.gnu.org
Subject: [bug#40944] doc: Fix building the cookbook
Date: Sat, 02 May 2020 13:05:00 +0200
Hi Björn,

Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> skribis:

> From 0bea22f4b21b013633d6d921da824d1240c7cc4d Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?=
>  <bjoern.hoefling <at> bjoernhoefling.de>
> Date: Tue, 28 Apr 2020 13:51:31 +0200
> Subject: [PATCH] doc: Fix building the cookbook.
>
> Fixes <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40803>.
> Reported by "operator.name" <operator.name <at> protonmail.com>.
>
> * 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 | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/doc/build.scm b/doc/build.scm
> index 3907b49caf..31c4c3d122 100644
> --- a/doc/build.scm
> +++ b/doc/build.scm
> @@ -58,7 +58,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 +454,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$"))

LGTM!

Thanks,
Ludo’.




This bug report was last modified 5 years and 16 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.