[LyX/master] Add missing empty line (par break) between pars with differing line spacing (#12638)
commit 8c6db951353ae1bb622e0057fafd8adfae391c42
Author: Juergen Spitzmueller
Date: Thu Feb 9 17:23:18 2023 +0100
Add missing empty line (par break) between pars with differing line spacing
(#12638)
---
src/output_latex.cpp | 36 +++-
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 04d63ae..c24a532 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1174,7 +1174,7 @@ void TeXOnePar(Buffer const & buf,
&& (pit == 0 || !priorpar->hasSameLayout(par)))
{
os <<
from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace))
- << '\n';
+ << '\n';
}
if (style.isCommand()) {
@@ -1499,21 +1499,22 @@ void TeXOnePar(Buffer const & buf,
Layout const & next_layout = nextpar->layout();
if (!next_layout.isCommand()) {
// Here we now try to avoid spurious empty lines by
- // outputting a paragraph break only if: (case 1) the
- // paragraph style allows parbreaks and no \begin, \end
- // or \item tags are going to follow (i.e., if the next
- // isn't the first or the current isn't the last
- // paragraph of an environment or itemize) and the
- // depth and alignment of the following paragraph is
- // unchanged, or (case 2) the following is a
- // non-environment paragraph whose depth is increased
- // but whose alignment is unchanged, or (case 3) the
- // paragraph is not an environment and the next one is a
- // non-itemize-like env at lower depth, or (case 4) the
- // paragraph is a command not followed by an environment
- // and the alignment of the current and next paragraph
- // is unchanged, or (case 5) the current alignment is
- // changed and a standard paragraph follows.
+ // outputting a paragraph break only if:
+ // (case 1) the paragraph style allows parbreaks and
+ // no \begin, \end or \item tags are going to follow
+ // (i.e., if the next isn't the first or the current
+ // isn't the last paragraph of an environment or
itemize)
+ // and the depth and alignment of the following
paragraph is
+ // unchanged, or
+ // (case 2) the following is a non-environment paragraph
+ // whose depth is increased but whose alignment is
unchanged, or
+ // (case 3) the paragraph is not an environment and the
next one
+ // is a non-itemize-like env at lower depth, or
+ // (case 4) the paragraph is a command not followed by
an
+ // environment and the alignment of the current and next
+ // paragraph is unchanged, or
+ // (case 5) the current alignment is changed and a
+ // standard paragraph follows.
DocumentClass const & tclass = bparams.documentClass();
if ((style == next_layout
&& !style.parbreak_is_newline
@@ -1523,7 +1524,8 @@ void TeXOnePar(Buffer const & buf,
&& style.latextype != LATEX_LIST_ENVIRONMENT
&& style.align == par.getAlign(bparams)
&& nextpar->getDepth() == par.getDepth()
-&& nextpar->getAlign(bparams) ==
par.getAlign(bparams))
+&& (nextpar->getAlign(bparams) ==
par.getAlign(bparams)
+|| par.params().spacing() !=
nextpar->params().spacing()))
|| (!next_layout.isEnvironment()
&& nextpar->getDepth() > par.getDepth()
&& nextpar->getAlign(bparams) ==
next_layout.align)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update sk.po
commit c7b5d156a2002fc9d66a970e0ded9e90d5afef49 Author: Kornel Benko Date: Thu Feb 9 12:10:58 2023 +0100 Update sk.po --- po/sk.po | 151 - 1 files changed, 128 insertions(+), 23 deletions(-) diff --git a/po/sk.po b/po/sk.po index fa391d2..813e449 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX-2.4\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2023-02-06 15:44+0100\n" -"PO-Revision-Date: 2023-02-07 11:47+\n" +"POT-Creation-Date: 2023-02-09 11:11+0100\n" +"PO-Revision-Date: 2023-02-09 10:49+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -10657,20 +10657,20 @@ msgid "Right Address" msgstr "Adresa vpravo" #: lib/layouts/bxjsarticle.layout:3 -msgid "Japanese Article (BXJS Class)" -msgstr "Japonský článok (Trieda BXJS)" +msgid "Japanese Article (BX Bundle)" +msgstr "Japonský článok (BX zväzok)" #: lib/layouts/bxjsbook.layout:3 -msgid "Japanese Book (BXJS Class)" -msgstr "Japonská kniha (Trieda BXJS)" +msgid "Japanese Book (BX Bundle)" +msgstr "Japonská kniha (BX zväzok)" #: lib/layouts/bxjsreport.layout:3 -msgid "Japanese Report (BXJS Class)" -msgstr "Japonský referát (Trieda BXJS)" +msgid "Japanese Report (BX Bundle)" +msgstr "Japonský referát (BX zväzok)" #: lib/layouts/bxjsslide.layout:3 -msgid "Japanese Slide (BXJS Class)" -msgstr "Japonská fólia (Trieda BXJS)" +msgid "Japanese Slides (BX Bundle)" +msgstr "Japonská fólia (BX zväzok)" #: lib/layouts/chess.layout:3 lib/examples/Articles:0 msgid "Chess" @@ -13896,17 +13896,37 @@ msgstr "Japonská kniha (Štandardná trieda)" msgid "American Geophysical Union (AGUPLUS JGR)" msgstr "Americká Únia pre Geofyziku (AGUPLUS JGR)" +#: lib/layouts/jlreq-article.layout:3 lib/examples/Articles:0 +msgid "Japanese Article (JLReq Class)" +msgstr "Japonský článok (Trieda JLReq)" + +#: lib/layouts/jlreq-book.layout:3 +msgid "Japanese Book (JLReq Class)" +msgstr "Japonská kniha (Trieda JLReq)" + +#: lib/layouts/jlreq-common.inc:13 lib/layouts/jlreq-common.inc:21 +#: lib/layouts/jlreq-common.inc:29 lib/layouts/jlreq-common.inc:37 +#: lib/layouts/jlreq-common.inc:45 lib/layouts/jlreq-common.inc:53 +#: lib/layouts/jlreq-common.inc:61 lib/layouts/jlreq-common.inc:69 +#: lib/layouts/jlreq-common.inc:77 lib/layouts/jlreq-common.inc:85 +msgid "Subtitle|u" +msgstr "Podtitul|u" + +#: lib/layouts/jlreq-common.inc:14 lib/layouts/jlreq-common.inc:22 +msgid "Subtitle of the part" +msgstr "Podtitul tejto časti" + #: lib/layouts/jreport.layout:3 msgid "Japanese Report (Standard Class)" msgstr "Japonský referát (Štandardná trieda)" #: lib/layouts/jsarticle.layout:3 -msgid "Japanese Article (JS Class)" -msgstr "Japonský článok (Trieda JS)" +msgid "Japanese Article (JS Bundle)" +msgstr "Japonský článok (JS zväzok)" #: lib/layouts/jsbook.layout:3 -msgid "Japanese Book (JS Class)" -msgstr "Japonská kniha (Trieda JS)" +msgid "Japanese Book (JS Bundle)" +msgstr "Japonská kniha (JS zväzok)" #: lib/layouts/jss.layout:3 lib/examples/Articles:0 msgid "Journal of Statistical Software (JSS) version 2" @@ -14559,6 +14579,10 @@ msgstr "Lecture Notes in Comp. Science (LNCS)" msgid "Chapter" msgstr "Kapitola" +#: lib/layouts/jlreq-common.inc:30 lib/layouts/jlreq-common.inc:38 +msgid "Subtitle of the chapter" +msgstr "Podtitul tejto kapitoly" + #: lib/layouts/llncs.layout:158 msgid "Running LaTeX Title" msgstr "LaTeX titul stĺpca" @@ -14745,6 +14769,26 @@ msgstr "Kapitola ako sa zobrazí v priebežných hlavičkách" msgid "Chapter*" msgstr "Kapitola*" +#: lib/layouts/jlreq-common.inc:46 lib/layouts/jlreq-common.inc:54 +msgid "Subtitle of the section" +msgstr "Podtitul tejto sekcie" + +#: lib/layouts/jlreq-common.inc:62 lib/layouts/jlreq-common.inc:70 +msgid "Subtitle of the subsection" +msgstr "Podtitul tejto podsekcie" + +#: lib/layouts/jlreq-common.inc:78 lib/layouts/jlreq-common.inc:86 +msgid "Subtitle of the subsubsection" +msgstr "Podtitul tejto podpodsekcie" + +#: lib/layouts/jlreq-common.inc:91 +msgid "Abstract over Columns" +msgstr "Súhrn stĺpcov" + +#: lib/layouts/jlreq-common.inc:107 lib/layouts/jlreq-common.inc:113 +msgid "JLReq Setup" +msgstr "JLReq-konfigurácia" + #: lib/layouts/memoir.layout:103 msgid "The section as it appears in the table of contents" msgstr "Sekcia ako sa zobrazí v obsahu" @@ -17323,12 +17367,12 @@ msgstr "" "pri 'Tabuľka 2.1'." #: lib/layouts/tarticle.layout:3 -msgid "Japanese Article (Standard Class: Vertical Writing)" -msgstr "Japonský článok (Štandardná trieda: Vertikálne písanie)" +msgid "Japanese Article (Standard Class, vertical Writing)" +msgstr "Japonský článok (Štandardná trieda, vertikálne písanie)" #: lib/layouts/tbook.layout:3 -msgid "Japanese Book (Standard Class: Vertical Writing)" -msgstr "Japonská kniha (Štandardná trieda: Vertikálne písanie)" +msgid "Japanese Book (Standard Class, vertical Writing)" +msgstr
