From unknown Sun Jun 15 08:55:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40944] doc: Fix building the cookbook Resent-From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Apr 2020 17:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40944 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40944@debbugs.gnu.org X-Debbugs-Original-To: Received: via spool by submit@debbugs.gnu.org id=B.158809536428359 (code B ref -1); Tue, 28 Apr 2020 17:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2020 17:36:04 +0000 Received: from localhost ([127.0.0.1]:41343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTU9C-0007Mw-Kn for submit@debbugs.gnu.org; Tue, 28 Apr 2020 13:36:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:42922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTU9A-0007Mo-FV for submit@debbugs.gnu.org; Tue, 28 Apr 2020 13:35:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43204) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTU93-0005Zu-1P for guix-patches@gnu.org; Tue, 28 Apr 2020 13:35:51 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00, FROM_EXCESS_BASE64, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTU8l-0002mr-U6 for guix-patches@gnu.org; Tue, 28 Apr 2020 13:35:44 -0400 Received: from m4s11.vlinux.de ([83.151.27.109]:56468 helo=bjoernhoefling.de) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTU8l-0002Xu-5b for guix-patches@gnu.org; Tue, 28 Apr 2020 13:35:27 -0400 Received: from alma-ubu (p508ACA3F.dip0.t-ipconnect.de [80.138.202.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bjoernhoefling.de (Postfix) with ESMTPSA id 151E83F861 for ; Tue, 28 Apr 2020 19:35:24 +0200 (CEST) Date: Tue, 28 Apr 2020 19:35:23 +0200 From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Message-ID: <20200428193523.4ba547dc@alma-ubu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/i2=_dKwjrxhqe9q//qjGJNF"; protocol="application/pgp-signature" Received-SPF: none client-ip=83.151.27.109; envelope-from=bjoern.hoefling@bjoernhoefling.de; helo=bjoernhoefling.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/28 13:35:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 83.151.27.109 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/i2=_dKwjrxhqe9q//qjGJNF Content-Type: multipart/mixed; boundary="MP_/KrcZArxDxw/hgGw9Ok/6PmP" --MP_/KrcZArxDxw/hgGw9Ok/6PmP Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline As reported in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40803 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=C3=B6rn --MP_/KrcZArxDxw/hgGw9Ok/6PmP Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-doc-Fix-building-the-cookbook.patch =46rom 0bea22f4b21b013633d6d921da824d1240c7cc4d Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Bj=3DC3=3DB6rn=3D20H=3DC3=3DB6fling?=3D Date: Tue, 28 Apr 2020 13:51:31 +0200 Subject: [PATCH] doc: Fix building the cookbook. Fixes . Reported by "operator.name" . * 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")) =20 (define %languages - '("de" "en" "es" "fr" "ru" "zh_CN")) + ;; The cookbook is currently only translated into German. + (if (string=3D? %manual "guix-cookbook") + '("de" "en") + '("de" "en" "es" "fr" "ru" "zh_CN"))) =20 (define (texinfo-manual-images source) "Return a directory containing all the images used by the user manual, t= aken @@ -451,7 +454,9 @@ its 
 blocks (as produced by 'make=
info --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$"))
=20
             ;; Next process the multi-node HTML files in two phases: (1)
             ;; collect the list of anchors, and (2) perform
--=20
2.26.0


--MP_/KrcZArxDxw/hgGw9Ok/6PmP--

--Sig_/i2=_dKwjrxhqe9q//qjGJNF
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXqhpWwAKCRC/KGy2WT5f
/ZbGAJ4tocE59dWusdGTmba5x9zPA9c5QQCdHsFodHVg0fey9XXGSWwQHj7R7C0=
=y+rs
-----END PGP SIGNATURE-----

--Sig_/i2=_dKwjrxhqe9q//qjGJNF--




From unknown Sun Jun 15 08:55:53 2025
X-Loop: help-debbugs@gnu.org
Subject: [bug#40944] doc: Fix building the cookbook
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= 
Original-Sender: "Debbugs-submit" 
Resent-CC: guix-patches@gnu.org
Resent-Date: Sat, 02 May 2020 11:06:02 +0000
Resent-Message-ID: 
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 40944
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= 
Cc: 40944@debbugs.gnu.org
Received: via spool by 40944-submit@debbugs.gnu.org id=B40944.158841751120872
          (code B ref 40944); Sat, 02 May 2020 11:06:02 +0000
Received: (at 40944) by debbugs.gnu.org; 2 May 2020 11:05:11 +0000
Received: from localhost ([127.0.0.1]:51374 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from )
	id 1jUpxG-0005Qa-Jh
	for submit@debbugs.gnu.org; Sat, 02 May 2020 07:05:10 -0400
Received: from eggs.gnu.org ([209.51.188.92]:34144)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from ) id 1jUpxE-0005QH-Gk
 for 40944@debbugs.gnu.org; Sat, 02 May 2020 07:05:09 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e]:54967)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from )
 id 1jUpx9-0004qv-9z; Sat, 02 May 2020 07:05:03 -0400
Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=45078 helo=ribbon)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
 (Exim 4.82) (envelope-from )
 id 1jUpx7-0003kZ-Kq; Sat, 02 May 2020 07:05:02 -0400
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= 
References: <20200428193523.4ba547dc@alma-ubu>
Date: Sat, 02 May 2020 13:05:00 +0200
In-Reply-To: <20200428193523.4ba547dc@alma-ubu> ("=?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?="'s message of
 "Tue, 28 Apr 2020 19:35:23 +0200")
Message-ID: <87368ibns3.fsf@gnu.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: 
List-Unsubscribe: , 
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
 
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" 
X-Spam-Score: -3.3 (---)

Hi Bj=C3=B6rn,

Bj=C3=B6rn H=C3=B6fling  skribis:

> From 0bea22f4b21b013633d6d921da824d1240c7cc4d Mon Sep 17 00:00:00 2001
> From: =3D?UTF-8?q?Bj=3DC3=3DB6rn=3D20H=3DC3=3DB6fling?=3D
>  
> Date: Tue, 28 Apr 2020 13:51:31 +0200
> Subject: [PATCH] doc: Fix building the cookbook.
>
> Fixes .
> Reported by "operator.name" .
>
> * 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"))
>=20=20
>  (define %languages
> -  '("de" "en" "es" "fr" "ru" "zh_CN"))
> +  ;; The cookbook is currently only translated into German.
> +  (if (string=3D? %manual "guix-cookbook")
> +      '("de" "en")
> +      '("de" "en" "es" "fr" "ru" "zh_CN")))
>=20=20
>  (define (texinfo-manual-images source)
>    "Return a directory containing all the images used by the user manual,=
 taken
> @@ -451,7 +454,9 @@ its 
 blocks (as produced by 'ma=
keinfo --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=E2=80=99.




From unknown Sun Jun 15 08:55:53 2025
X-Loop: help-debbugs@gnu.org
Subject: [bug#40944] doc: Fix building the cookbook
Resent-From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= 
Original-Sender: "Debbugs-submit" 
Resent-CC: guix-patches@gnu.org
Resent-Date: Sat, 02 May 2020 11:30:02 +0000
Resent-Message-ID: 
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 40944
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: Ludovic =?UTF-8?Q?Court=C3=A8s?= 
Cc: 40944@debbugs.gnu.org
Received: via spool by 40944-submit@debbugs.gnu.org id=B40944.158841897323133
          (code B ref 40944); Sat, 02 May 2020 11:30:02 +0000
Received: (at 40944) by debbugs.gnu.org; 2 May 2020 11:29:33 +0000
Received: from localhost ([127.0.0.1]:51422 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from )
	id 1jUqKr-000613-D6
	for submit@debbugs.gnu.org; Sat, 02 May 2020 07:29:33 -0400
Received: from m4s11.vlinux.de ([83.151.27.109]:59426 helo=bjoernhoefling.de)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from )
 id 1jUqKp-00060u-2A
 for 40944@debbugs.gnu.org; Sat, 02 May 2020 07:29:31 -0400
Received: from alma-ubu (p508ACC7F.dip0.t-ipconnect.de [80.138.204.127])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by bjoernhoefling.de (Postfix) with ESMTPSA id 93A083FC9C;
 Sat,  2 May 2020 13:29:29 +0200 (CEST)
Date: Sat, 2 May 2020 13:29:28 +0200
From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= 
Message-ID: <20200502132928.681115bf@alma-ubu>
In-Reply-To: <87368ibns3.fsf@gnu.org>
References: <20200428193523.4ba547dc@alma-ubu>
	<87368ibns3.fsf@gnu.org>
X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 boundary="Sig_/GXK_4KI9FxmPaVevNw=W9Ki"; protocol="application/pgp-signature"
X-Spam-Score: 0.3 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: 
List-Unsubscribe: , 
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
 
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" 
X-Spam-Score: -1.0 (-)

--Sig_/GXK_4KI9FxmPaVevNw=W9Ki
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Sat, 02 May 2020 13:05:00 +0200
Ludovic Court=C3=A8s  wrote:

> Hi Bj=C3=B6rn,
>=20
> Bj=C3=B6rn H=C3=B6fling  skribis:
>=20
> > Fixes .
> > Reported by "operator.name" .
> >

> LGTM!
>=20
> Thanks,
> Ludo=E2=80=99.

Thanks,

pushed as 7c65fc378cf68b598965fd977f5844050435ac97.

Bj=C3=B6rn

--Sig_/GXK_4KI9FxmPaVevNw=W9Ki
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXq1ZmAAKCRC/KGy2WT5f
/T36AJ91FaXblQo5okPqswapZffnUiKSpgCgqsDkTtNtVkzldyLbfxUwYiPOss4=
=rndD
-----END PGP SIGNATURE-----

--Sig_/GXK_4KI9FxmPaVevNw=W9Ki--




From unknown Sun Jun 15 08:55:53 2025
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
X-Loop: help-debbugs@gnu.org
From: help-debbugs@gnu.org (GNU bug Tracking System)
To: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?=
 
Subject: bug#40944: closed (Re: [bug#40944] doc: Fix building the cookbook)
Message-ID: 
References: <20200502132950.5bf94468@alma-ubu>
 <20200428193523.4ba547dc@alma-ubu>
X-Gnu-PR-Message: they-closed 40944
X-Gnu-PR-Package: guix-patches
Reply-To: 40944@debbugs.gnu.org
Date: Sat, 02 May 2020 11:30:03 +0000
Content-Type: multipart/mixed; boundary="----------=_1588419003-23220-1"

This is a multi-part message in MIME format...

------------=_1588419003-23220-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"

Your bug report

#40944: doc: Fix building the cookbook

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 40944@debbugs.gnu.org.

--=20
40944: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40944
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems

------------=_1588419003-23220-1
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Received: (at 40944-done) by debbugs.gnu.org; 2 May 2020 11:29:54 +0000
Received: from localhost ([127.0.0.1]:51425 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from )
	id 1jUqLB-00061c-Na
	for submit@debbugs.gnu.org; Sat, 02 May 2020 07:29:53 -0400
Received: from m4s11.vlinux.de ([83.151.27.109]:59428 helo=bjoernhoefling.de)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from )
 id 1jUqLA-00061U-3h
 for 40944-done@debbugs.gnu.org; Sat, 02 May 2020 07:29:52 -0400
Received: from alma-ubu (p508ACC7F.dip0.t-ipconnect.de [80.138.204.127])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by bjoernhoefling.de (Postfix) with ESMTPSA id 7B9993FC9C;
 Sat,  2 May 2020 13:29:51 +0200 (CEST)
Date: Sat, 2 May 2020 13:29:50 +0200
From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= 
To: Ludovic =?UTF-8?B?Q291cnTDqHM=?= 
Subject: Re: [bug#40944] doc: Fix building the cookbook
Message-ID: <20200502132950.5bf94468@alma-ubu>
In-Reply-To: <87368ibns3.fsf@gnu.org>
References: <20200428193523.4ba547dc@alma-ubu>
	<87368ibns3.fsf@gnu.org>
X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 boundary="Sig_//abkB04JZkImeSHK=Dt3wvc"; protocol="application/pgp-signature"
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 40944-done
Cc: 40944-done@debbugs.gnu.org
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: 
List-Unsubscribe: , 
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
 
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" 
X-Spam-Score: -1.0 (-)

--Sig_//abkB04JZkImeSHK=Dt3wvc
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

... and closing.

Bj=C3=B6rn

--Sig_//abkB04JZkImeSHK=Dt3wvc
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXq1ZrwAKCRC/KGy2WT5f
/UtOAJ9/P6Sc4B+JHzEe7bMOfdkMC2oCKwCgmLHM465CecTZSiA3tEiDza/LVjc=
=9QyZ
-----END PGP SIGNATURE-----

--Sig_//abkB04JZkImeSHK=Dt3wvc--


------------=_1588419003-23220-1
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Received: (at submit) by debbugs.gnu.org; 28 Apr 2020 17:36:04 +0000
Received: from localhost ([127.0.0.1]:41343 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from )
	id 1jTU9C-0007Mw-Kn
	for submit@debbugs.gnu.org; Tue, 28 Apr 2020 13:36:04 -0400
Received: from lists.gnu.org ([209.51.188.17]:42922)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from )
 id 1jTU9A-0007Mo-FV
 for submit@debbugs.gnu.org; Tue, 28 Apr 2020 13:35:52 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:43204)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from )
 id 1jTU93-0005Zu-1P
 for guix-patches@gnu.org; Tue, 28 Apr 2020 13:35:51 -0400
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00, FROM_EXCESS_BASE64, 
 URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1)
 (envelope-from )
 id 1jTU8l-0002mr-U6
 for guix-patches@gnu.org; Tue, 28 Apr 2020 13:35:44 -0400
Received: from m4s11.vlinux.de ([83.151.27.109]:56468 helo=bjoernhoefling.de)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from )
 id 1jTU8l-0002Xu-5b
 for guix-patches@gnu.org; Tue, 28 Apr 2020 13:35:27 -0400
Received: from alma-ubu (p508ACA3F.dip0.t-ipconnect.de [80.138.202.63])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by bjoernhoefling.de (Postfix) with ESMTPSA id 151E83F861
 for ; Tue, 28 Apr 2020 19:35:24 +0200 (CEST)
Date: Tue, 28 Apr 2020 19:35:23 +0200
From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= 
To: 
Subject: doc: Fix building the cookbook
Message-ID: <20200428193523.4ba547dc@alma-ubu>
X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 boundary="Sig_/i2=_dKwjrxhqe9q//qjGJNF"; protocol="application/pgp-signature"
Received-SPF: none client-ip=83.151.27.109;
 envelope-from=bjoern.hoefling@bjoernhoefling.de; helo=bjoernhoefling.de
X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/28 13:35:24
X-ACL-Warn: Detected OS   = Linux 2.2.x-3.x [generic] [fuzzy]
X-Received-From: 83.151.27.109
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: 
List-Unsubscribe: , 
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
 
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" 
X-Spam-Score: -1.0 (-)

--Sig_/i2=_dKwjrxhqe9q//qjGJNF
Content-Type: multipart/mixed; boundary="MP_/KrcZArxDxw/hgGw9Ok/6PmP"

--MP_/KrcZArxDxw/hgGw9Ok/6PmP
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

As reported in

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

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=C3=B6rn

--MP_/KrcZArxDxw/hgGw9Ok/6PmP
Content-Type: text/x-patch
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
 filename=0001-doc-Fix-building-the-cookbook.patch

=46rom 0bea22f4b21b013633d6d921da824d1240c7cc4d Mon Sep 17 00:00:00 2001
From: =3D?UTF-8?q?Bj=3DC3=3DB6rn=3D20H=3DC3=3DB6fling?=3D
 
Date: Tue, 28 Apr 2020 13:51:31 +0200
Subject: [PATCH] doc: Fix building the cookbook.

Fixes .
Reported by "operator.name" .

* 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"))
=20
 (define %languages
-  '("de" "en" "es" "fr" "ru" "zh_CN"))
+  ;; The cookbook is currently only translated into German.
+  (if (string=3D? %manual "guix-cookbook")
+      '("de" "en")
+      '("de" "en" "es" "fr" "ru" "zh_CN")))
=20
 (define (texinfo-manual-images source)
   "Return a directory containing all the images used by the user manual, t=
aken
@@ -451,7 +454,9 @@ its 
 blocks (as produced by 'make=
info --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$"))
=20
             ;; Next process the multi-node HTML files in two phases: (1)
             ;; collect the list of anchors, and (2) perform
--=20
2.26.0


--MP_/KrcZArxDxw/hgGw9Ok/6PmP--

--Sig_/i2=_dKwjrxhqe9q//qjGJNF
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXqhpWwAKCRC/KGy2WT5f
/ZbGAJ4tocE59dWusdGTmba5x9zPA9c5QQCdHsFodHVg0fey9XXGSWwQHj7R7C0=
=y+rs
-----END PGP SIGNATURE-----

--Sig_/i2=_dKwjrxhqe9q//qjGJNF--



------------=_1588419003-23220-1--