anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove special code for CJK that is no longer required (amends e665715fc4).

Browse Source
This commit is contained in:
Günter Milde 2019-03-13 11:13:44 +01:00
parent ddf947b8fd
commit 0f265a5ab6
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/DocIterator.cpp
View File

@ -743,13 +743,10 @@ Encoding const * DocIterator::getEncoding() const
Language const * lang =
text.getPar(sl.pit()).getFont(bp, sl.pos(),
text.outerFont(sl.pit())).language();
// If we have a custom encoding for the buffer, we only switch
// encoding for CJK (see output_latex::switchEncoding())
bool const customenc =
bp.inputenc != "auto" && bp.inputenc != "default";
Encoding const * enc =
(customenc && lang->encoding()->package() != Encoding::CJK)
? &bp.encoding() : lang->encoding();
// If we have a custom encoding for the buffer, we don't switch
// encodings (see output_latex::switchEncoding())
bool const customenc = bp.inputenc != "auto" && bp.inputenc != "default";
Encoding const * enc = customenc ? &bp.encoding() : lang->encoding();
// Some insets force specific encodings sometimes (e.g., listings in
// multibyte context forces singlebyte).
@ -780,9 +777,8 @@ Encoding const * DocIterator::getEncoding() const
otext.outerFont(slices_[i].pit())).language();
// Again, if we have a custom encoding, this is used
// instead of the language's.
Encoding const * oenc =
(customenc && olang->encoding()->package() != Encoding::CJK)
? &bp.encoding() : olang->encoding();
Encoding const * oenc = customenc
? &bp.encoding() : olang->encoding();
if (olang->encoding()->name() != "inherit")
return oenc;
}