diff options
| author | Florian Pelz <pelzflorian@pelzflorian.de> | 2023-04-02 20:44:01 +0200 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-12 08:29:18 -0400 |
| commit | 83ee4dcf87943167e15efff29c59fd92a28668b7 (patch) | |
| tree | 83823c92ca09f5e9147c2c49ea0174e159f5d8f7 /guix/build | |
| parent | 58f4d7566fabac37ea596068b6d710ddd8ed0c2d (diff) | |
po: Do not auto-translate cross-references to other manuals.
Reported by Gottfried at
<https://lists.gnu.org/archive/html/help-guix/2023-04/msg00000.html>.
* guix/build/po.scm (xref-regexp): Dispatch on the number of
arguments. Ensure there is no info-manual argument or it is empty.
(translate-cross-references): Adapt to changed regexp.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/po.scm | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/guix/build/po.scm b/guix/build/po.scm index 7f88164cd8..62362e933e 100644 --- a/guix/build/po.scm +++ b/guix/build/po.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2021 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2023 Florian Pelz <pelzflorian@pelzflorian.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -123,7 +124,15 @@ and the value is the msgstr. The result only contains non fuzzy strings." (define xref-regexp ;; Texinfo cross-reference regexp. - (make-regexp "@(px|x)?ref\\{([^,}]+)")) + (make-regexp + (string-append "@(px|x)?ref\\{([^,}]+)(" + "\\}" ;Match xref with one argument + "|,[^,}]*\\}" ;or two arguments + "|,[^,}]*,[^,}]*\\}" ;or three arguments + ;; or with an *empty* fourth argument: + "|,[^,}]*,[^,}]*, *," + "|,[^,}]*,[^,}]*, *\\}" + ")"))) (define (translate-cross-references texi pofile) "Translate the cross-references that appear in @var{texi}, the initial @@ -157,13 +166,15 @@ translation of a Texinfo file, using the msgid/msgstr pairs from @var{pofile}." (cons (string-drop content offset) result))) ((head . tail) (let ((prefix (match:substring head 1)) - (ref (canonicalize-whitespace (match:substring head 2)))) + (ref (canonicalize-whitespace (match:substring head 2))) + (rest (match:substring head 3))) (define translated (string-append "@" (or prefix "") "ref{" (match (vhash-assoc ref translation-map) (#f ref) - ((_ . str) str)))) + ((_ . str) str)) + (or rest ""))) (loop tail (match:end head) |