Fix bug with wrong baseline calculation in last paragraph

Fixes: #9231

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 4474d2ebe2939b0f92549a2b0319c58cdbcb7670..3a8b0c240035de1eee7fceb8b6ee81bd72c9a170 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -866,6 +866,7 @@ void TeXOnePar(Buffer const & buf,
        // 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.
 
        Font const font = par.empty()
                 ? par.getLayoutFont(bparams, outerfont)
@@ -874,7 +875,6 @@ void TeXOnePar(Buffer const & buf,
        bool const is_command = style.isCommand();
 
        if (style.resfont.size() != font.fontInfo().size()
-           && nextpar
            && !is_command) {
                os << '{';
                os << "\\" << from_ascii(font.latexSize()) << " \\par}";

diff --git a/status.21x b/status.21x
index f7f450fa53f471bf79b00b4f4979ecafc783a8ed..d58771c1bfc33fb8138acc3acf5f16825685e25d 100644 (file)
--- a/status.21x
+++ b/status.21x
@@ -54,6 +54,9 @@ What's new
 - Do not sort advanced listings settings, since their insertion order is
   relevant (bug 5203).
 
+- Fix wrong line spacing in last paragraph of a document if the font size
+  is non-normal (bug 9231).
+
 
 
 * LYX2LYX