X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=3595a089fa60e03224e83c7a749ae4046ca9dab2;hb=11e679f73ecca718c61307973c3d67739354e1c7;hp=c7bac75e7ae345bebc0f9a9de70719dbd81f488e;hpb=b9fe1dd10b99386561872688e9a7affd4043b8c5;p=lyx.git

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index c7bac75e7a..3595a089fa 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -849,10 +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.
-	// Spitz: We need for the last par, actually. See #9231.
+	// 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)
@@ -861,6 +860,9 @@ void TeXOnePar(Buffer const & buf,
 	bool const is_command = style.isCommand();
 
 	if (style.resfont.size() != font.fontInfo().size()
+	    && (nextpar || maintext
+	        || (text.inset().getLayout().isMultiPar()
+	            && text.inset().lyxCode() != CELL_CODE))
 	    && !is_command) {
 		os << '{';
 		os << "\\" << from_ascii(font.latexSize()) << " \\par}";