From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id +CgWLZ7HvmXMnwAA62LTzQ:P1 (envelope-from ) for ; Sun, 04 Feb 2024 00:09:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id +CgWLZ7HvmXMnwAA62LTzQ (envelope-from ) for ; Sun, 04 Feb 2024 00:09:18 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707001758; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=FaQYeTTiIt+m6CUzi4L52qp3mKrdenKvWXDZ0TSfmHc=; b=rImWmjE3VkmquTK5o8X18cofFqIS8/zOMVdeFnMfytW6uNODdmkPIKI88rjz3DU1TbG70P OEvxCjkS0cKC3uwK4hGXdbFsE5ssFk3h6Z31eDknJ92C7DQD6P5olyXjL8Zw8jAaovjdsh oe6urKNevrmbGZ8N4dXVEj+it7EcgbJfJ7us9EsgS5sddzYvLDm7AWldZdLeEcs1FCequU Q7nAt2qR6phi82LWaFujc8AyasdfRo0vX7w9hrEt4nBM8DLHB9hbp0bOhrOr+1DqdnNma2 L51PBMrDEil6mL5TcUftGDDVH60da4Uff2I+G8EnY+BBG63kgiJPE+FeBlZAlA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707001758; a=rsa-sha256; cv=none; b=eMX3eMjXqunvPO4/D1D8TtJoWUPW56Tqy0UqmwNnIPNIgH8qNDC/5QpBpODYGWNG44S04J layqHmtO+b4ussJ8nus14w4fGZGWewugD4F7KmzhJyJ7dqsbsXVXTFAvIutfI99RTsQfS3 8uczcMcN9Xz7fMeWbxMT6D3LRoE9rYzRqrnkHrtvzi6D1XriHUeA9L/HTkmF8tieB2uSWR OGQPM2sP0NWrU+8DPL2HvYPtLMcl6mUU0oHdzhcBVr15PmREnolWt2A+fKZLmSi2dSEDTP Ph4Uf8SI4yEHYLiB+kBOZgmreYKFAqRRGWgf8D34WS4cMRFRl0uvxFin1w3INg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 64133339E8 for ; Sun, 4 Feb 2024 00:09:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWP82-0008C5-83; Sat, 03 Feb 2024 18:08:54 -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 1rWP80-0008B5-9f for guix-patches@gnu.org; Sat, 03 Feb 2024 18:08:52 -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 1rWP80-0008EJ-1h for guix-patches@gnu.org; Sat, 03 Feb 2024 18:08:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWP8B-0001He-JB for guix-patches@gnu.org; Sat, 03 Feb 2024 18:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v4 4/6] 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: Sat, 03 Feb 2024 23:09:03 +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, zimoun.toutoune@gmail.com Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.17070017124855 (code B ref 62202); Sat, 03 Feb 2024 23:09:03 +0000 Received: (at 62202) by debbugs.gnu.org; 3 Feb 2024 23:08:32 +0000 Received: from localhost ([127.0.0.1]:47252 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWP7f-0001G7-Tc for submit@debbugs.gnu.org; Sat, 03 Feb 2024 18:08:32 -0500 Received: from 11.mo584.mail-out.ovh.net ([46.105.34.195]:39809) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWP7b-0001FK-SZ for 62202@debbugs.gnu.org; Sat, 03 Feb 2024 18:08:28 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.17.34]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 32FA725BCC for <62202@debbugs.gnu.org>; Sat, 3 Feb 2024 23:08:15 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-f7jcc (unknown [10.110.168.153]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id D9B741FDEC; Sat, 3 Feb 2024 23:08:14 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-6684bf9d7b-f7jcc with ESMTPSA id 3jLSK17HvmXKigYAqzIo+Q (envelope-from ); Sat, 03 Feb 2024 23:08:14 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Sun, 4 Feb 2024 00:07:14 +0100 Message-ID: <20240203230807.25751-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240203230807.25751-1-ngraves@ngraves.fr> References: <20240203230807.25751-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14366201339026268775 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrfedujedgtdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedvvddtvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.67 X-Spam-Score: -6.67 X-Migadu-Queue-Id: 64133339E8 X-Migadu-Scanner: mx12.migadu.com X-TUID: Z61UXEsvQJdV --- 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])"))) -- 2.41.0