From: "Björn Höfling" <bjoern.hoefling@bjoernhoefling.de>
To: 40944@debbugs.gnu.org
Subject: [bug#40944] doc: Fix building the cookbook
Date: Tue, 28 Apr 2020 19:35:23 +0200 [thread overview]
Message-ID: <20200428193523.4ba547dc@alma-ubu> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 307 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-doc-Fix-building-the-cookbook.patch --]
[-- Type: text/x-patch, Size: 1803 bytes --]
From 0bea22f4b21b013633d6d921da824d1240c7cc4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?=
<bjoern.hoefling@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@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$"))
;; Next process the multi-node HTML files in two phases: (1)
;; collect the list of anchors, and (2) perform
--
2.26.0
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
next reply other threads:[~2020-04-28 17:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 17:35 Björn Höfling [this message]
2020-05-02 11:05 ` [bug#40944] doc: Fix building the cookbook Ludovic Courtès
2020-05-02 11:29 ` Björn Höfling
2020-05-02 11:29 ` bug#40944: " Björn Höfling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200428193523.4ba547dc@alma-ubu \
--to=bjoern.hoefling@bjoernhoefling.de \
--cc=40944@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.