X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=d44d0473e11f7ad8384429d5e82ace4b794040db;hb=0fd75fefc4aa1816f8d5a72ed0e30f8accdd0bfc;hp=19caf375469bbe1ead73ff99c67802b633558248;hpb=7cbeed2e40691570b5572c58ce51222d487400e6;p=lyx.git

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 19caf37546..d44d0473e1 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2516,7 +2516,7 @@ void Paragraph::latex(BufferParams const & bparams,
 	if (allowcust && d->endTeXParParams(bparams, os, texrow, runparams)
 	    && runparams.encoding != prev_encoding) {
 		runparams.encoding = prev_encoding;
-		if (!bparams.useXetex)
+		if (!runparams.isFullUnicode())
 			os << setEncoding(prev_encoding->iconvName());
 	}
 
@@ -2759,7 +2759,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 				// We don't want to escape the entities. Note that
 				// it is safe to do this, since str can otherwise
 				// only be "-". E.g., it can't be "<".
-				xs << XHTMLStream::NextRaw() << str;
+				xs << XHTMLStream::ESCAPE_NONE << str;
 			} else
 				xs << c;
 		}