anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 03:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing empty line (par break) between pars with differing line spacing (#12638)

Browse Source 
cherry-picked from 8c6db95135
This commit is contained in:
Juergen Spitzmueller 2023-02-09 17:23:18 +01:00
parent dfbf4c4839
commit ed9a846200
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/output_latex.cpp
View File

@ -1062,7 +1062,7 @@ void TeXOnePar(Buffer const & buf,
&& (pit == 0 || !priorpar->hasSameLayout(par)))
{
os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace))
<< '\n';
<< '\n';
}
if (style.isCommand()) {
@ -1338,21 +1338,22 @@ void TeXOnePar(Buffer const & buf,
// so avoid doubling it.
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
@ -1361,7 +1362,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)

2
status.23x
View File

@ -38,6 +38,8 @@ What's new
* DOCUMENT INPUT/OUTPUT
- Fix leaking of linespace settings between paragraphs if they have
different aligment (bug 12638).
* USER INTERFACE