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

Force encoding switch when switching from/to CJK, even if we use a customized encoding (#8558)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2013-05-20 13:40:40 +02:00
parent a78bed06eb
commit a8a2bd463c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output_latex.cpp
View File

@ -1196,8 +1196,12 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
{ {
Encoding const & oldEnc = *runparams.encoding; Encoding const & oldEnc = *runparams.encoding;
bool moving_arg = runparams.moving_arg; bool moving_arg = runparams.moving_arg;
if (!force && ((bparams.inputenc != "auto" && bparams.inputenc != "default") // If we switch from/to CJK, we need to switch anyway, despite custom inputenc
|| moving_arg)) bool const from_to_cjk =
(oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK)
|| (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK);
if (!force && !from_to_cjk
&& ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg))
return make_pair(false, 0); return make_pair(false, 0);
// Do nothing if the encoding is unchanged. // Do nothing if the encoding is unchanged.