Fix output encoding information for non-TeX fonts XeTeX/LuaTeX on preview pane

Fixes: #8919

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index d629debf08ba527996efe879fcb4a2fa6fbc71e1..80560dd772ae02c4c2aebd826fc16ccee0732396 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1624,6 +1624,11 @@ void Buffer::writeLaTeXSource(otexstream & os,
 
        OutputParams runparams = runparams_in;
 
+       // This is necessary for LuaTeX/XeTeX with tex fonts.
+       // See FIXME in BufferParams::encoding()
+       if (runparams.isFullUnicode())
+               runparams.encoding = encodings.fromLyXName("utf8-plain");
+
        // If we are compiling a file standalone, even if this is the
        // child of some other buffer, let's cut the link here, so the
        // file is really independent and no concurring settings from

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 0ca1364a89b2908652417ecfe7bd09bb58608b81..fc425f90de0d5295d1d0c8525848bfe19fd4e37b 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2989,7 +2989,8 @@ Encoding const & BufferParams::encoding() const
        // FIXME: actually, we should check for the flavor
        // or runparams.isFullyUnicode() here:
        // This check will not work with XeTeX/LuaTeX and tex fonts.
-       // Thus we have to reset the encoding in Buffer::makeLaTeXFile.
+       // Thus we have to reset the encoding in Buffer::makeLaTeXFile
+       // (for export) and Buffer::writeLaTeXSource (for preview).
        if (useNonTeXFonts)
                return *(encodings.fromLyXName("utf8-plain"));
        if (inputenc == "auto" || inputenc == "default")

diff --git a/status.21x b/status.21x
index e708d76e17dce9105de426c1082922c012e76243..845a5438feb7b3e272bec2c28e2cb6cc42ff3d91 100644 (file)
--- a/status.21x
+++ b/status.21x
@@ -64,6 +64,9 @@ What's new
 
 - Fix name and hint of figure captions in documents using the class aastex.
 
+- Fix output encoding information for non-TeX fonts XeTeX/LuaTeX on preview
+  pane (bug 8919).
+
 
 
 * INTERNALS