From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 02 14:46:17 2023 Received: (at submit) by debbugs.gnu.org; 2 Apr 2023 18:46:17 +0000 Received: from localhost ([127.0.0.1]:42656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj2iX-0007Dd-ES for submit@debbugs.gnu.org; Sun, 02 Apr 2023 14:46:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:57960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj2iT-0007DR-5d for submit@debbugs.gnu.org; Sun, 02 Apr 2023 14:46:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pj2iQ-0001KG-0G for guix-patches@gnu.org; Sun, 02 Apr 2023 14:46:11 -0400 Received: from relay.yourmailgateway.de ([188.68.63.170]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pj2iI-00078z-La for guix-patches@gnu.org; Sun, 02 Apr 2023 14:46:09 -0400 Received: from mors-relay8203.netcup.net (localhost [127.0.0.1]) by mors-relay8203.netcup.net (Postfix) with ESMTPS id 4PqNJj2852z8Yx9 for ; Sun, 2 Apr 2023 18:45:57 +0000 (UTC) Authentication-Results: mors-relay8203.netcup.net; dkim=permerror (bad message/signature format) Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay8203.netcup.net (Postfix) with ESMTPS id 4PqNJj1RHWz8Yx8 for ; Sun, 2 Apr 2023 18:45:57 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net X-Spam-Flag: NO X-Spam-Score: -2.899 X-Spam-Level: X-Spam-Status: No, score=-2.899 required=6.31 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, URIBL_BLOCKED=0.001] autolearn=ham autolearn_force=no Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4PqNJh1hfbz8tY1 for ; Sun, 2 Apr 2023 20:45:56 +0200 (CEST) Received: from florianrock64.fritz.box (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id 03AF280974; Sun, 2 Apr 2023 20:45:54 +0200 (CEST) From: Florian Pelz To: guix-patches@gnu.org Subject: [PATCH] po: Do not auto-translate cross-references to other manuals. Date: Sun, 2 Apr 2023 20:44:01 +0200 Message-Id: <20230402184401.14505-1-pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Debbugs-Cc: julien@lepiller.eu X-Debbugs-Cc: ludo@gnu.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-NC-CID: Kx0Vqk5iYGOPVTsFH8zMOub4osxEkb0th/nnHgTE06G62KdxI2Hl9Vv3 Received-SPF: none client-ip=188.68.63.170; envelope-from=pelzflorian@pelzflorian.de; helo=relay.yourmailgateway.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_NONE=0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: Florian Pelz 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 (---) Reported by Gottfried at . * 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. --- guix/build/po.scm | 17 ++++++++++++++--- 1 file 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 ;;; Copyright © 2020 Ludovic Courtès +;;; Copyright © 2023 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -123,7 +124,15 @@ (define (canonicalize-whitespace str) (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 @@ (define translated (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) base-commit: 47ea688fd27d0ce0c8ea5481f1f94d0ebc3e37eb -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 07 10:54:44 2023 Received: (at 62625-done) by debbugs.gnu.org; 7 Apr 2023 14:54:44 +0000 Received: from localhost ([127.0.0.1]:57011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pknUB-0007Kn-VJ for submit@debbugs.gnu.org; Fri, 07 Apr 2023 10:54:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pknUA-0007Jz-1U for 62625-done@debbugs.gnu.org; Fri, 07 Apr 2023 10:54:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pknU4-0003z7-NX; Fri, 07 Apr 2023 10:54:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=a76RCIFyaf3zJ+qovTtqJuDyUHhWsXA2FF/WYOPqwXg=; b=SR88sziaRc7GqYFNcW0f cZPWHyUby0QW1E432EgHKoaYNyjyW3ncYX50l0FGeF7cnmTLkZHfsdaiexuxLZWdfFPk8bUhQGk0L BP518BpdaZGdW4DNTVBvo5ztfjSsUwTznwroDwFSbv9svLlXpKzEao8Gq/0cFPNnftkW6Rh3FKmGP F1AlqETJzgZrNt3V2fGx8Gk014H56EXv/xVMBIB12YmM1ArRZ0t2TkHA40CmwNBLgSHZ0m09CSyuD mqH9mJOUP5ApeOqwjwY2kN97CzDi4L65gE0tE01/52jSVRbeeVqfGIi/t24g7BBLtkQellVWGV/Oo Y2RjMxrX6V9mKA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pknU3-0005r7-K8; Fri, 07 Apr 2023 10:54:35 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Florian Pelz Subject: Re: bug#62625: [PATCH] po: Do not auto-translate cross-references to other manuals. References: <20230402184401.14505-1-pelzflorian@pelzflorian.de> Date: Fri, 07 Apr 2023 16:54:33 +0200 In-Reply-To: <20230402184401.14505-1-pelzflorian@pelzflorian.de> (Florian Pelz's message of "Sun, 2 Apr 2023 20:44:01 +0200") Message-ID: <87o7nzd9p2.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 62625-done Cc: 62625-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: -3.3 (---) Hi Florian, Florian Pelz skribis: > Reported by Gottfried at > . > > * 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. Applied, thanks! Ludo=E2=80=99. From unknown Fri Sep 19 16:07:12 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 06 May 2023 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator