Cmake build: Creating a define for a header file found

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index cd67e1729fff468ac6042a24ec22bb4b87307df7..2af9831d780f175aa61c26ea24e42601658d8050 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -33,6 +33,7 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 #include <algorithm>
 #include <boost/next_prior.hpp>
@@ -584,7 +585,7 @@ void TeXOnePar(Buffer const & buf,
                        os << '\n';
                if (!style.parbreak_is_newline) {
                        os << '\n';
-               } else if (nextpar) {
+               } else if (nextpar && !style.isEnvironment()) {
                        Layout const nextstyle = text.inset().forcePlainLayout()
                                ? bparams.documentClass().plainLayout()
                                : nextpar->layout();
@@ -744,7 +745,7 @@ void TeXOnePar(Buffer const & buf,
                                par.getFontSettings(bparams, i).language()->encoding();
                        if (encoding->package() != Encoding::CJK
                                && runparams.encoding->package() == Encoding::inputenc
-                               && c < 0x80)
+                               && isASCII(c))
                                continue;
                        if (par.isInset(i))
                                break;