anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 15:46:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't switch encodings to/from CJK if the document encoding is using the CJK package.

Browse Source 
Also, since we return earlier if the document encoding is an utf8-variant
since fc0ab1283, the wrapper around "setEncoding" is no longer required.
This commit is contained in:
Günter Milde 2019-02-07 22:07:59 +01:00
parent f3aabbd4d7
commit 7bbf333fa1
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/output_latex.cpp
View File

@ -1260,7 +1260,8 @@ void TeXOnePar(Buffer const & buf,
// if this is a CJK-paragraph and the next isn't, close CJK // if this is a CJK-paragraph and the next isn't, close CJK
// also if the next paragraph is a multilingual environment (because of nesting) // also if the next paragraph is a multilingual environment (because of nesting)
if (nextpar if (nextpar
&& (state->open_encoding_ == CJK && bparams.encoding().iconvName() != "UTF-8") && (state->open_encoding_ == CJK && bparams.encoding().iconvName() != "UTF-8"
&& bparams.encoding().package() != Encoding::CJK )
&& (nextpar_language->encoding()->package() != Encoding::CJK && (nextpar_language->encoding()->package() != Encoding::CJK
|| (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams))) || (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams)))
// inbetween environments, CJK has to be closed later (nesting!) // inbetween environments, CJK has to be closed later (nesting!)
@ -1610,8 +1611,8 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
bool const from_to_cjk = bool const from_to_cjk =
((oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK) ((oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK)
|| (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK)) || (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK))
&& (bparams.encoding().name() != "utf8-cjk" && bparams.encoding().name() != "utf8") && bparams.encoding().iconvName() != "UTF8"
&& bparams.encoding().package() != Encoding::CJK; && bparams.encoding().package() != Encoding::CJK;
if (!force && !from_to_cjk if (!force && !from_to_cjk
&& ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg)) && ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg))
return make_pair(false, 0); return make_pair(false, 0);
@ -1631,14 +1632,12 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
if (oldEnc.package() == Encoding::none || newEnc.package() == Encoding::none) if (oldEnc.package() == Encoding::none || newEnc.package() == Encoding::none)
return make_pair(false, 0); return make_pair(false, 0);
// change encoding (not required with UTF8) // change encoding
if (bparams.encoding().iconvName() != "UTF-8") { LYXERR(Debug::LATEX, "Changing LaTeX encoding from "
LYXERR(Debug::LATEX, "Changing LaTeX encoding from " << oldEnc.name() << " to " << newEnc.name());
<< oldEnc.name() << " to " << newEnc.name()); os << setEncoding(newEnc.iconvName());
os << setEncoding(newEnc.iconvName()); if (bparams.inputenc == "default")
if (bparams.inputenc == "default") return make_pair(true, 0);
return make_pair(true, 0);
}
docstring const inputenc_arg(from_ascii(newEnc.latexName())); docstring const inputenc_arg(from_ascii(newEnc.latexName()));
OutputState * state = getOutputState(); OutputState * state = getOutputState();