From patchwork Wed Mar 15 12:51:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 48029 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 BC1E716CAB; Wed, 15 Mar 2023 12:53:40 +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.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 4428016961 for ; Wed, 15 Mar 2023 12:53:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcQdC-00047C-Hu; Wed, 15 Mar 2023 08:53:26 -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 1pcQcr-0003xi-Vm for guix-patches@gnu.org; Wed, 15 Mar 2023 08:53:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcQcq-0003N2-A3 for guix-patches@gnu.org; Wed, 15 Mar 2023 08:53:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcQcq-0001dk-5x for guix-patches@gnu.org; Wed, 15 Mar 2023 08:53:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH 20/21] 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: Wed, 15 Mar 2023 12:53:04 +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 To: 62202@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.16788847426199 (code B ref 62202); Wed, 15 Mar 2023 12:53:04 +0000 Received: (at 62202) by debbugs.gnu.org; 15 Mar 2023 12:52:22 +0000 Received: from localhost ([127.0.0.1]:39360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQc9-0001bp-Sr for submit@debbugs.gnu.org; Wed, 15 Mar 2023 08:52:22 -0400 Received: from 2.mo582.mail-out.ovh.net ([46.105.76.65]:42109) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQc3-0001bG-4r for 62202@debbugs.gnu.org; Wed, 15 Mar 2023 08:52:16 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.4.136]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id D17C622E14 for <62202@debbugs.gnu.org>; Wed, 15 Mar 2023 12:52:13 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-drmhd (unknown [10.110.115.179]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 5935E1FDFE; Wed, 15 Mar 2023 12:52:12 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-drmhd with ESMTPSA id j5uGGXy/EWQcgQEACTsY+Q (envelope-from ); Wed, 15 Mar 2023 12:52:12 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G0056da8d9c0-a480-4c85-ac50-57ae5c0fc30b, F74D9BBE9ED44B45FF66447495DD0B0753EB5D4A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 15 Mar 2023 13:51:29 +0100 Message-Id: <20230315125130.23041-20-ngraves@ngraves.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315125130.23041-1-ngraves@ngraves.fr> References: <20230315125130.23041-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 13798184836765770466 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvddvkedggeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeivddvtddvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvpdhmohguvgepshhmthhpohhuth 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/juliahub.scm | 5 +---- guix/import/utils.scm | 8 +++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 06574db724..0d3f89ad61 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -197,10 +197,7 @@ (define %juliahub-beautify-description-rules (li . ,(lambda args `("\n@item" ,@(cdr args)))) (code . ,(lambda args - (string-append - "@code{" - (string-join (cdr args) " ") - "}"))) + `("@code{" ,@(cdr args) "}"))) (*text* . ,(lambda (tag x) x)) (*default* . ,(lambda (tag . body) (cons tag body))))) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 171dca54e8..5ed1dfd815 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -376,7 +376,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 + (member word '("@itemize" "@item" "@end" "@quotation" + "@enumerate" "@code" "@code{")) + word + ((cut regexp-substitute/global + #f "@" <> 'pre "@@" 'post) word))))))) (words (string-tokenize (string-trim-both description) (char-set-complement