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

Load the CJK package if requested

Browse Source 
The package was not loaded if a the main language was not CJK, the main encoding was non-default and the document had a secondary CJK language.
This commit is contained in:
Juergen Spitzmueller 2013-12-01 10:57:13 +01:00
parent 7033b15793
commit b3a8abffc7
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/BufferParams.cpp
View File

@ -2847,6 +2847,15 @@ void BufferParams::writeEncodingPreamble(otexstream & os,
os << "\\usepackage{CJK}\n"; os << "\\usepackage{CJK}\n";
break; break;
} }
// Load the CJK package if needed by a secondary language.
// If the main encoding is some variant of UTF8, use CJKutf8.
if (encoding().package() != Encoding::CJK && features.mustProvide("CJK")) {
if (encoding().iconvName() == "UTF-8"
&& LaTeXFeatures::isAvailable("CJKutf8"))
os << "\\usepackage{CJKutf8}\n";
else
os << "\\usepackage{CJK}\n";
}
} }
} }