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

Revert "No \\par after greyedout notes (bug #9598)"

Browse Source 
This reverts commit f929f21228.

It is not as easy as this. See ticket.
This commit is contained in:
Juergen Spitzmueller 2015-06-09 07:57:19 +02:00
parent f929f21228
commit 8e671a5cdc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/output_latex.cpp
View File

@ -854,8 +854,8 @@ void TeXOnePar(Buffer const & buf,
// to this font. (Matthias) // to this font. (Matthias)
// //
// We must not change the font for the last paragraph // We must not change the font for the last paragraph
// of non-multipar insets, tabular cells, greyedout notes // of non-multipar insets, tabular cells or commands,
// or commands, since this produces unwanted whitespace. // since this produces unwanted whitespace.
Font const font = par.empty() Font const font = par.empty()
? par.getLayoutFont(bparams, outerfont) ? par.getLayoutFont(bparams, outerfont)
@ -866,8 +866,7 @@ void TeXOnePar(Buffer const & buf,
if (style.resfont.size() != font.fontInfo().size() if (style.resfont.size() != font.fontInfo().size()
&& (nextpar || maintext && (nextpar || maintext
|| (text.inset().getLayout().isMultiPar() || (text.inset().getLayout().isMultiPar()
&& text.inset().lyxCode() != CELL_CODE && text.inset().lyxCode() != CELL_CODE))
&& text.inset().lyxCode() != NOTE_CODE))
&& !is_command) { && !is_command) {
os << '{'; os << '{';
os << "\\" << from_ascii(font.latexSize()) << " \\par}"; os << "\\" << from_ascii(font.latexSize()) << " \\par}";