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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40944 in the body.
You can then email your comments to 40944 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: <guix-patches <at> gnu.org>
Subject: doc: Fix building the cookbook
Date: Tue, 28 Apr 2020 19:35:23 +0200

[Message part 1 (text/plain, inline)]

As reported in

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40803

there are problems with the cookbook:

* The single-page html file was missing.
* Languages other than English and German don't make sense: There is no
translation available.

The attached patch fixes these problems.

Björn

[0001-doc-Fix-building-the-cookbook.patch (text/x-patch, attachment)]

[Message part 3 (application/pgp-signature, inline)]

Message #8 received at 40944 <at> debbugs.gnu.org (full text, mbox):

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: Re: [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’.

Message #11 received at 40944 <at> debbugs.gnu.org (full text, mbox):

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

[Message part 1 (text/plain, inline)]

On Sat, 02 May 2020 13:05:00 +0200
Ludovic Courtès <ludo <at> gnu.org> wrote:

> Hi Björn,
> 
> Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> skribis:
> 
> > Fixes <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40803>.
> > Reported by "operator.name" <operator.name <at> protonmail.com>.
> >

> LGTM!
> 
> Thanks,
> Ludo’.

Thanks,

pushed as 7c65fc378cf68b598965fd977f5844050435ac97.

Björn

[Message part 2 (application/pgp-signature, inline)]

Message #16 received at 40944-done <at> debbugs.gnu.org (full text, mbox):

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

[Message part 1 (text/plain, inline)]

... and closing.

Björn

[Message part 2 (application/pgp-signature, inline)]

Previous Next

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