From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id aFFjOBTZ3GSs6wAASxT56A (envelope-from ) for ; Wed, 16 Aug 2023 16:11:33 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id QApvNxTZ3GRujgAAG6o9tA (envelope-from ) for ; Wed, 16 Aug 2023 16:11:32 +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 47A8033886 for ; Wed, 16 Aug 2023 16:11:32 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=posteo.net header.s=2017 header.b="L/Xacjkv"; 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=1692195092; 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=+A/cWEk254kC+Ag+TICioTxPrOyLbDrldJ/rzx4rvwQ=; b=UG9UISkJVAxiQcSyH7GMBhbzzJYBlf4jgBjFBsYk6wtpYvTE2rOgjfUTkfXLN+VhofABGW 1+Yn9nttoY5iuVPiHjYlTYVG2cZ7LLHwRGZ+WokFj1ubVxlKj1ke9f1a+HkaoMoSi58udL SHTxBfrYa3Q+dj0uiXNtGSx8Tk2hMkTUsgGfBX8lzEexooBUAb/i6E55Ip1gev5BrTGIZr aaqUNDbtSzFtcD+oE7j2wsIv0pUeck8MG5EdM2zuiGoLk0wm/XpbXwqo2N0PHq5K5ypsVx lF/ByzXHuudGlPLvBOSL79BAdxuxgZbsKLx7R1+sGEt1jI4U9vCf1Y1idyE0JQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=posteo.net header.s=2017 header.b="L/Xacjkv"; 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=1692195092; a=rsa-sha256; cv=none; b=QIL2N9zghAYXDw3ogcuEFhDfJQRBhWb/McKq2VCEmgNFGxj4e45fwgGxGdEaA3MWIkQfei u80q61UmcWSoSeLlpzwU3zIm5g9bXb5z7kKqqHTQi5zrThj1j1PM0zs1R8s10mTv+NmDQR RIJqv5D+PEYelfFB1sfgHz5g2Re0X1CjS27zjbWt+fNIy2G375X9YYrGH+n+cADBWRW01m HNoAbTJscbIiR3xIZcwhY9fyxThN3pERWRKQWBQ9RmwjNrCp2gekRDeCWJAqTwPMpTQril /2KYX/eKdGP2YteYwp6oWfldWrRR7G/cb8JPd6DxTpXvcIUk97KlXe7awdlXtA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWHEK-00044o-IP; Wed, 16 Aug 2023 10:10:36 -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 1qWHEI-00044W-AO for emacs-orgmode@gnu.org; Wed, 16 Aug 2023 10:10:34 -0400 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWHEF-0000Qo-3a for emacs-orgmode@gnu.org; Wed, 16 Aug 2023 10:10:34 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 95E5C240104 for ; Wed, 16 Aug 2023 16:10:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1692195026; bh=l3w/Z5od4ebKjXTWtOKy0KcSRTouk6LbbzqFeaUn5oE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:From; b=L/Xacjkvb1ZZHjOFUT6Bqz5uOFgvAwaPBdNs2GmpFSC9nnemE9DDXsm/0QwB9kM7D 7aMDTV0OuG9psDpkolOHANUaR5rEZl8qY/94YrImGOXrzVSZAPGspyJApU6iVqwv1i 8hXnuHlEUJqXL4i+T2gAUD4QPUVZkEm1VM5T8hd9nlB63uKMO85ApUE0LPcjyxkywH SWN4Qm4dNrpvuZhmcvVF1J60Os5AVC5uB5HWQwqbtR5QMcdHN93Sw9r3zzYehv4Dn5 sIgfyKR1F2dCAf9gPtC4s2uSTyHhnFKchrCoDPUNWcFwjSfzX+jG9hBi48VxfV8I65 ouOnkucuCz+5g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RQqm20BZfz9rxB; Wed, 16 Aug 2023 16:10:25 +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: <87fs4jpfuz.fsf@localhost> (Ihor Radchenko's message of "Wed, 16 Aug 2023 08:10:28 +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> <87edk5crle.fsf@posteo.net> <87r0o4ipms.fsf@localhost> <87edk4jzii.fsf@posteo.net> <87350kr06o.fsf@localhost> <874jl0jsba.fsf@posteo.net> <87fs4jpfuz.fsf@localhost> Date: Wed, 16 Aug 2023 14:10:23 +0000 Message-ID: <87bkf7qdrk.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=185.67.36.66; envelope-from=maciaschain@posteo.net; helo=mout02.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-Migadu-Spam-Score: -6.88 X-Spam-Score: -6.88 X-Migadu-Queue-Id: 47A8033886 X-Migadu-Scanner: mx2.migadu.com X-TUID: XC9JmfQ0SgpQ --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ihor Radchenko writes: > Juan Manuel Mac=C3=ADas writes: > >> I think the best thing is to rethink the :literal attribute, as I >> commented at the end of my other email: >> >> - without :literal --> verse environment with a more "canonical" syntax. >> >> - with :literal --> verse environment seen in the "old (org) style", >> preserving the blank lines. In that context \vspace does work. > > +1 Here is the modified patch. -- 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 8c77b42404ef5d96b2944e8e43bbc6c9412ad808 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, all blank lines are preserved and exported as `\vspace*{\baselineskip}', including the blank lines before or after contents. 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 | 18 ++++++++++++++---- lisp/ox-latex.el | 36 +++++++++++++++++++++++++++--------- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/doc/org-manual.org b/doc/org-manual.org index e59efc417..e52792183 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -14425,10 +14425,10 @@ 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 -require the external LaTeX package =verse.sty=, which is an extension -of the standard LaTeX environment. +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. - =:lines= :: To add marginal verse numbering. Its value is an integer, the sequence in which the verses should be numbered. @@ -14440,6 +14440,16 @@ 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, all blank lines are preserved and + exported as =\vspace*{\baselineskip}=, including the blank lines + before or after contents. Note that without the =:literal= + attribute, 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, which is more consistent with the syntax of the LaTeX + `verse' environment, and the one provided by the `verse' package. + If the =verse= package is loaded, the vertical spacing between all + stanzas can be controlled by the global 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..d11e3befa 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -4116,10 +4116,11 @@ 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)) + (lit (org-export-read-attribute :attr_latex verse-block :literal)) (attr (concat - (if cent "[\\versewidth]" "") - (if lin (format "\n\\poemlines{%s}" lin) "") - (if latcode (format "\n%s" latcode) ""))) + (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}" ""))) @@ -4128,20 +4129,37 @@ contextual information." 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. + ;; into a normal space, calculated with `\fontdimen2\font'. One + ;; or more blank lines between lines are exported as a single + ;; blank line. If the `:lines' attribute is used, the last + ;; verse of each stanza ends with the string `\\!', according to + ;; the syntax of the `verse' package. The separation between + ;; stanzas can be controlled with the length `\stanzaskip', of + ;; the aforementioned package. If the `:literal' attribute is + ;; used, all blank lines are preserved and exported as + ;; `\vspace*{\baselineskip}', including the blank lines before + ;; or after CONTENTS. (format "%s\\begin{verse}%s\n%s\\end{verse}%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 --=-=-=--