anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* InsetInclude.cpp:

Browse Source 
- if a master is compiled with XeteX or LuaTeX, all children must have plain utf8 encoding
	  (bug #6774).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36554 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2010-11-28 14:20:45 +00:00
parent e14b6a280d
commit 72f24353fa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/insets/InsetInclude.cpp
View File

@ -20,6 +20,7 @@
#include "BufferView.h" #include "BufferView.h"
#include "Cursor.h" #include "Cursor.h"
#include "DispatchResult.h" #include "DispatchResult.h"
#include "Encoding.h"
#include "ErrorList.h" #include "ErrorList.h"
#include "Exporter.h" #include "Exporter.h"
#include "Format.h" #include "Format.h"
@ -579,7 +580,11 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
// and language. // and language.
Encoding const * const oldEnc = runparams.encoding; Encoding const * const oldEnc = runparams.encoding;
Language const * const oldLang = runparams.master_language; Language const * const oldLang = runparams.master_language;
runparams.encoding = &tmp->params().encoding(); // If the master has full unicode flavor (XeTeX, LuaTeX),
// the children must be encoded in plain utf8!
runparams.encoding = runparams.isFullUnicode() ?
encodings.fromLyXName("utf8-plain")
: &tmp->params().encoding();
runparams.master_language = buffer().params().language; runparams.master_language = buffer().params().language;
tmp->makeLaTeXFile(writefile, tmp->makeLaTeXFile(writefile,
masterFileName(buffer()).onlyPath().absFileName(), masterFileName(buffer()).onlyPath().absFileName(),