Do nothing if converting to the same type of Note

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index ed46c051753f97a90f28e29dd0a51ddba0c82887..3595a089fa60e03224e83c7a749ae4046ca9dab2 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -554,7 +554,7 @@ void TeXOnePar(Buffer const & buf,
        Paragraph const & par = paragraphs.at(pit);
        // FIXME This check should not really be needed.
        // Perhaps we should issue an error if it is.
-       Layout const style = text.inset().forcePlainLayout() ?
+       Layout const & style = text.inset().forcePlainLayout() ?
                bparams.documentClass().plainLayout() : par.layout();
 
        if (style.inpreamble)
@@ -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}";