From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 6IMkLqGK2mTvrAAASxT56A (envelope-from ) for ; Mon, 14 Aug 2023 22:12:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id eA0lLaGK2mQaSwAAG6o9tA (envelope-from ) for ; Mon, 14 Aug 2023 22:12:17 +0200 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 F288153EE1 for ; Mon, 14 Aug 2023 22:12:16 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=posteo.net header.s=2017 header.b=JJ3bB7Zb; dmarc=pass (policy=none) header.from=posteo.net; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692043937; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=+HTRClrgr7es/RhWiYKhlZdRgHUrRId02Y+GTTSqnMM=; b=ATIW934QW7kKYJRg2qjI1PkTqOEagjakSzFN+CfaGSecUI+XM+7GL9g1LLe3fkt96Ztesl o5ptay7taD2GIKWdr1ciYA0acJbCtcuHwuzZO4lWyi7uWaxN4qbjEGWT1bGhIe/g0czHtL Ald+vcBCjAnrjSGAwiVpx1Uoti0VHvgZBpXltAF8gY7A1x+Z2hNuofxZOUaMgPKNX62Xx8 dyGlNsqKusbitugXXV9UOgE2IxR9v6SRxjIc6YjWuTi+oBahjQtxhU6HcbTvPJ010k+ime WBEke5r/SNpSUoTcd5zxF5r7a+kUM6JKfvqRgEcROIK/0YwamS28wXGLu3fQHg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=posteo.net header.s=2017 header.b=JJ3bB7Zb; dmarc=pass (policy=none) header.from=posteo.net; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692043937; a=rsa-sha256; cv=none; b=SloqTkj29iQYZlaLhWAMK/MooqtNuqmtsM2EyKBZSo12llQ0UfeME6ZoX98w6wqBmPGYIy PxP+sp98QD+R4sWnBGPZ3y5qqVo/WTgyoJftKMRyBt2ZZMZntsCNK+Tu3hbZmsth45QlKm XQa5bvnDmba1iXhqLUIsP36dhudcc5YbObdAj50BdAV5PojPfaJHU0f622dVd2Yq+qMIR0 qvbqTSICYsqwnT74G8crqOd3X97R65ZAl2ZyvF0zSfSdcHq2jproKWWy3beEzTEfaptX8f 1xpxNPujXsNrqQPJGmVoUVrLICdURJUK6PCzD8CDAHgpx2iE/U9j55RJWKr7lQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVduY-0001iy-Cr; Mon, 14 Aug 2023 16:11:34 -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 1qVduG-0001hu-I9 for emacs-orgmode@gnu.org; Mon, 14 Aug 2023 16:11:20 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qVduC-0007v8-BU for emacs-orgmode@gnu.org; Mon, 14 Aug 2023 16:11:15 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 02CBF240027 for ; Mon, 14 Aug 2023 22:10:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1692043856; bh=yMDIrei53A0LTTl0HYXjZq/fbArxVo2/33j31jgLeR4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:From; b=JJ3bB7ZbaGSUNc3yM19IfU+Bkn63sBwMx6XpQN7SBxqNbOhFyrTSXKEwL5WhCAnBi kFED78zzxdQgOew0PQvvxrvDprmIpHTvRX/ILRxaHDnbN2QyQzZ/ZbJx8U+EUBW6+H MMJFgbcWTJBnFNSXYgkVQF+WWcUvMdZQLSA/a9YzLvtsJqEIoqeBpoxd1ZKj6N1MAJ zjRCnULdyBVY9/qV1ANM1w/ux18/dKNB1RrUiwpja9Cz8Zj3VmGNotj5TXYFlQNoiE ahRmrMrbzwhmJRIcWmWmHcjB/Tku87mtJ7GNfJrgsvdn3qJrn7NobMD5n8SFyKQbtm Ot1RartDMO22g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RPlrv3V4Fz9rxM; Mon, 14 Aug 2023 22:10:55 +0200 (CEST) From: =?utf-8?Q?Juan_Manuel_Mac=C3=ADas?= To: Ihor Radchenko Cc: orgmode Subject: Re: [patch] ox-latex.el: fix blank lines behavior in verse block In-Reply-To: <877cq04rt7.fsf@localhost> (Ihor Radchenko's message of "Sat, 12 Aug 2023 07:56:36 +0000") References: <87tttcml75.fsf@posteo.net> <87edkf6px1.fsf@localhost> <87350ug413.fsf@posteo.net> <87o7jgejhl.fsf@localhost> <87pm3wfvzx.fsf@posteo.net> <87il9nb62q.fsf@localhost> <871qgbb2q6.fsf@posteo.net> <874jl5526t.fsf@localhost> <87ttt59zsx.fsf@posteo.net> <877cq04rt7.fsf@localhost> Date: Mon, 14 Aug 2023 20:10:53 +0000 Message-ID: <87edk5crle.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=185.67.36.65; envelope-from=maciaschain@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: -9.87 X-Migadu-Queue-Id: F288153EE1 X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -9.87 X-TUID: abZphD8FjzOH --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ihor Radchenko writes: > Looks reasonable in general. Of course, we will also need to document > the new attribute. Here is the modified patch (with your suggestions, including the `rx' code) and the documentation of the new attribute. --=20 Juan Manuel Mac=C3=ADas https://juanmanuelmacias.com https://lunotipia.juanmanuelmacias.com https://gnutas.juanmanuelmacias.com --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-lisp-ox-latex.el-add-the-literal-attribute-to-verse-.patch >From 463e4a984b0ccc9bc1fdde699cb5cfed1ac59613 Mon Sep 17 00:00:00 2001 From: Juan Manuel Macias Date: Mon, 14 Aug 2023 21:48:58 +0200 Subject: [PATCH] lisp/ox-latex.el: add the `:literal' attribute to verse block. * (org-latex-verse-block): now the treatment of blank lines is consistent with the syntax of the LaTeX `verse' environment, and the one provided by the `verse' package. If the `:literal' attribute is used, the content is not exported within a `verse' environment, but as-is, preserving horizontal spaces, line breaks, and blank lines. The rx code has been suggested by Ihor Radchenko, to improve readability. * doc/org-manual.org (Verse blocks in LaTeX export): the new feature is documented. --- doc/org-manual.org | 12 ++++++++++-- lisp/ox-latex.el | 43 ++++++++++++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/doc/org-manual.org b/doc/org-manual.org index e59efc417..b640bbc7c 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -14425,8 +14425,8 @@ The LaTeX export backend converts horizontal rules by the specified #+cindex: verse blocks, in @LaTeX{} export #+cindex: @samp{ATTR_LATEX}, keyword -The LaTeX export backend accepts four attributes for verse blocks: -=:lines=, =:center=, =:versewidth= and =:latexcode=. The three first +The LaTeX export backend accepts five attributes for verse blocks: +=:lines=, =:center=, =:versewidth=, =:latexcode= and =:literal=. The three first require the external LaTeX package =verse.sty=, which is an extension of the standard LaTeX environment. @@ -14440,6 +14440,14 @@ of the standard LaTeX environment. verse. - =:latexcode= :: It accepts any arbitrary LaTeX code that can be included within a LaTeX =verse= environment. +- =:literal= :: With value t, the block is not exported to a =verse= + environment; instead, the content is exported as-is, preserving all + white lines as =\vspace{\baselineskip}=. Note that in the =verse= + environment, one or more blank lines between stanzas are exported as + a single blank line, and any blank lines before or after the content + are removed. If the =verse= package is loaded, the vertical spacing + between stanzas can be controlled by the length =\stanzaskip= (see + https://www.ctan.org/pkg/verse). A complete example with Shakespeare's first sonnet: diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 31cad1dc4..fcf22f87d 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -4116,32 +4116,49 @@ contextual information." (let* ((lin (org-export-read-attribute :attr_latex verse-block :lines)) (latcode (org-export-read-attribute :attr_latex verse-block :latexcode)) (cent (org-export-read-attribute :attr_latex verse-block :center)) - (attr (concat - (if cent "[\\versewidth]" "") - (if lin (format "\n\\poemlines{%s}" lin) "") - (if latcode (format "\n%s" latcode) ""))) + (lit (org-export-read-attribute :attr_latex verse-block :literal)) + (attr (if (not lit) + (concat + (if cent "[\\versewidth]" "") + (if lin (format "\n\\poemlines{%s}" lin) "") + (if latcode (format "\n%s" latcode) "")) + "")) (versewidth (org-export-read-attribute :attr_latex verse-block :versewidth)) - (vwidth (if versewidth (format "\\settowidth{\\versewidth}{%s}\n" versewidth) "")) - (linreset (if lin "\n\\poemlines{0}" ""))) + (vwidth (if (and versewidth (not lit)) (format "\\settowidth{\\versewidth}{%s}\n" versewidth) "")) + (linreset (if (and lin (not lit)) "\n\\poemlines{0}" ""))) (concat (org-latex--wrap-label verse-block ;; In a verse environment, add a line break to each newline ;; character and change each white space at beginning of a line - ;; into a space of 1 em. Also change each blank line with - ;; a vertical space of 1 em. - (format "%s\\begin{verse}%s\n%s\\end{verse}%s" + ;; into a normal space, calculated with `\fontdimen2\font'. + ;; One or more blank lines between lines are exported as a + ;; single blank line. If the `:literal' attribute is used, + ;; CONTENTS is exported as is, with no environment, preserving + ;; line breaks and vertical and horizontal spaces. + (format (if (not lit) + "%s\\begin{verse}%s\n%s\\end{verse}%s" + "%s%s\n%s%s") vwidth attr (replace-regexp-in-string - "^[ \t]+" (lambda (m) (format "\\hspace*{%dem}" (length m))) + "^[ \t]+" (lambda (m) (format "\\hspace*{%d\\fontdimen2\\font}" (length m))) (replace-regexp-in-string - (concat "^[ \t]*" (regexp-quote org-latex-line-break-safe) "$") - "\\vspace*{1em}" + (if (not lit) + (rx-to-string + `(seq (group ,org-latex-line-break-safe "\n") + (1+ (group line-start (0+ space) ,org-latex-line-break-safe "\n")))) + (concat "^[ \t]*" (regexp-quote org-latex-line-break-safe) "$")) + (if (not lit) + (if lin "\\\\!\n\n" "\n\n") + "\\vspace*{\\baselineskip}") (replace-regexp-in-string "\\([ \t]*\\\\\\\\\\)?[ \t]*\n" (concat org-latex-line-break-safe "\n") - contents nil t) + (if (not lit) + (concat (org-trim contents t) "\n") + contents) + nil t) nil t) nil t) linreset) -- 2.41.0 --=-=-=--