From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:43878) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTUDm-0000kj-K8 for guix-patches@gnu.org; Tue, 28 Apr 2020 13:41:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTUAJ-000851-52 for guix-patches@gnu.org; Tue, 28 Apr 2020 13:40:38 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58030) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTUAI-00084r-Mh for guix-patches@gnu.org; Tue, 28 Apr 2020 13:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTUAI-0007Oe-Jy for guix-patches@gnu.org; Tue, 28 Apr 2020 13:37:02 -0400 Subject: [bug#40944] doc: Fix building the cookbook Resent-Message-ID: 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 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> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/i2=_dKwjrxhqe9q//qjGJNF"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40944@debbugs.gnu.org --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--