From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:700:3204::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id KKV/A6FFhGXQ8QAAkFu2QA (envelope-from ) for ; Thu, 21 Dec 2023 15:03:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id +LmtNqBFhGWHggEAe85BDQ (envelope-from ) for ; Thu, 21 Dec 2023 15:03:13 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1703167392; 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=gIAcUguVPsRpvyzHOYCYf/Qq7O9R5AHVq1WQrq0uOYctkpGRdOktbl1mIablqrlCFQ0MJb tQJ5cVLyJmomb5QsMemB+qU8zq5V/6OXdwb6TPQJPZjQeVo1xiuo/kjr5csEGAQkPPvdAQ mRArACdRxKai59BaQ7sTcmhDwz8vjo1xxmP2wrTOvFTszV72wiP9xN2BWAuGhgMs43PNon 1tcFZvYp8YMAGeL6DRUmj8mkl74l+Fdzq8G+lM9FmlmNKbCGU8jx4y/7bHjPVxzMYE/YJy K7bSEH/6qlnNIWP8ZXwTweULAihYiHfTsKLNSyGQl4QQTpPtkGr6SPKPcbbg/g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1703167392; a=rsa-sha256; cv=none; b=T1yfldIUxdmddmIXupe1lcC36881HtX9o9IN4S/bIti7JvyQPwTFoXUjZtxwRhO/uUUx+B YKHx3UgH7Fv+2KRyxbN5wuFtOPKHjiw09/eH/8UfhpbAnHQQzNkzDINRSJ/njWbVes0IGt JjclPhD85gjs6CvWc0V/tnrCVIEGqnkpqPLBUzju3+JnYmXQyOKkEdmEo2oCIUwjl5p8v7 NN8ffoJdmFFWeiT9xQNMQBGm+7+zQL8c1br8PFEeXFjqobfWhMPd1iDcjyZpxYbNh/g1xX fKSKe9Q0RUr0JcC4z2GIeZTeeuJyfzl+GzZdOC2QWIWbhzQxkokVVBUmSOXNSQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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"; dmarc=pass (policy=none) header.from=gnu.org 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 A3BE85569E for ; Thu, 21 Dec 2023 15:03:12 +0100 (CET) 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 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 Content-Transfer-Encoding: 8bit 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 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.19 X-Spam-Score: -6.19 X-Migadu-Queue-Id: A3BE85569E X-Migadu-Scanner: mx11.migadu.com X-TUID: BGRoAjVwY6y/ --- 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