From 5563dc924a528856cd067b4e848327af34c04efa Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sat, 24 Jan 2015 15:53:28 +0100 Subject: [PATCH] Fix output encoding information for non-TeX fonts XeTeX/LuaTeX on preview pane Fixes: #8919 --- src/Buffer.cpp | 5 +++++ src/BufferParams.cpp | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index e8b63da5f5..a695a71d68 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -1635,6 +1635,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 7a527a7592..47c65cea26 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -2992,7 +2992,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") -- 2.39.2