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

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

View File

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