commit 15957d003a28a935ab9cff8a8e16970aa305d2e3
Author: Juergen Spitzmueller <[email protected]>
Date: Thu Aug 28 08:22:47 2014 +0200
Revert fix for #9231
This is more complicated than I thought.
diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index c71fc32..d7119c3 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -866,7 +866,6 @@ 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)
@@ -875,6 +874,7 @@ 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 f8bd25d..a5c368e 100644
--- a/status.21x
+++ b/status.21x
@@ -64,12 +64,10 @@ 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).
-
- Fix import of latex documents with scaled fonts.
+
* LYX2LYX
- Fix warning "Missing \use_indices" when converting from 1.6.x format
