From patchwork Thu Dec 21 14:01:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 57957 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7754827BBEA; Thu, 21 Dec 2023 14:03:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AD99527BBE9 for ; Thu, 21 Dec 2023 14:03:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGJde-0005kh-P2; Thu, 21 Dec 2023 09:03:03 -0500 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 1rGJdb-0005iC-Et for guix-patches@gnu.org; Thu, 21 Dec 2023 09:02:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rGJdb-0005vR-2S for guix-patches@gnu.org; Thu, 21 Dec 2023 09:02:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rGJde-00010i-Ui for guix-patches@gnu.org; Thu, 21 Dec 2023 09:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v3 4/4] import: utils: Rule out texinfo common syntax from @ escape. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Dec 2023 14:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62202 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 62202@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.17031673283796 (code B ref 62202); Thu, 21 Dec 2023 14:03:02 +0000 Received: (at 62202) by debbugs.gnu.org; 21 Dec 2023 14:02:08 +0000 Received: from localhost ([127.0.0.1]:42700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGJcm-0000zA-AD for submit@debbugs.gnu.org; Thu, 21 Dec 2023 09:02:08 -0500 Received: from 2.mo560.mail-out.ovh.net ([188.165.53.149]:38653) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGJcc-0000xu-7E for 62202@debbugs.gnu.org; Thu, 21 Dec 2023 09:02:01 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.140.215]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 6F18B2C92B for <62202@debbugs.gnu.org>; Thu, 21 Dec 2023 14:01:52 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-kwgz9 (unknown [10.110.96.132]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 114A41FEA3; Thu, 21 Dec 2023 14:01:51 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-kwgz9 with ESMTPSA id 0wIFAFBFhGWnJgAA8T+B1w (envelope-from ); Thu, 21 Dec 2023 14:01:51 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R004bb7d06d5-3e2e-454c-a5f4-c17aef2200e3, 9D5CD1A767DEA5A8C66A052B36C551B71BBC44F2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 89.85.249.141 Date: Thu, 21 Dec 2023 15:01:03 +0100 Message-ID: <20231221140142.16523-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231221140142.16523-1-ngraves@ngraves.fr> References: <20231221140142.16523-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4994491990046139106 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdduhedgfeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekledrkeehrddvgeelrddugedupdefjedrheelrddugedvrddutddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeivddvtddvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- guix/import/utils.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 47254539a1..57e4ec0ce7 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -375,7 +375,13 @@ (define* (beautify-description description #:optional (length 80)) (cut string-trim-both <> #\') ;; Escape single @ to prevent it from being understood as ;; invalid Texinfo syntax. - (cut regexp-substitute/global #f "@" <> 'pre "@@" 'post) + (lambda (word) + (if ; Rule out some valid Texinfo syntax. + (member word '("@itemize" "@item" "@end" "@quotation" + "@enumerate" "@code" "@code{")) + word + ((cut regexp-substitute/global + #f "@" <> 'pre "@@" 'post) word))) ;; Wrap camelCase or PascalCase words in @code{...}. (lambda (word) (let ((pattern (make-regexp "([A-Z][a-z]+[A-Z]|[a-z]+[A-Z])")))