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

Fixes: #8919
This commit is contained in:
Juergen Spitzmueller 2015-01-24 15:53:28 +01:00
parent 16c33b5f6e
commit 5563dc924a
2 changed files with 7 additions and 1 deletions

View File

@ -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

View File

@ -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")