anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug with wrong baseline calculation in last paragraph (2nd attempt)

Browse Source 
This time, we consider the cases where a \par is not wanted (single-par insets, tabular cells).

Fixes: #9231
This commit is contained in:
Juergen Spitzmueller 2014-09-01 09:14:26 +02:00
parent 609a50f9f9
commit d9b87d651a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output_latex.cpp
View File

@ -849,9 +849,9 @@ void TeXOnePar(Buffer const & buf,
// calculates the space between the baselines according
// to this font. (Matthias)
//
// Is this really needed ? (Dekel)
// We do not need to use to change the font for the last paragraph
// or for a command.
// We must not change the font for the last paragraph
// of non-multipar insets, tabular cells or commands,
// since this produces unwanted whitespace.
Font const font = par.empty()
? par.getLayoutFont(bparams, outerfont)
@ -860,7 +860,9 @@ void TeXOnePar(Buffer const & buf,
bool const is_command = style.isCommand();
if (style.resfont.size() != font.fontInfo().size()
&& nextpar
&& (nextpar || maintext
|| (text.inset().getLayout().isMultiPar()
&& text.inset().lyxCode() != CELL_CODE))
&& !is_command) {
os << '{';
os << "\\" << from_ascii(font.latexSize()) << " \\par}";