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

* LaTeXFeatures.cpp (useLanguage):

Browse Source 
- require the CJK package for CJK languages.
* BufferParams.cpp (writeEncodingPreamble):
	- load CJK package if required.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@21651 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2007-11-17 12:35:50 +00:00
parent 3370670758
commit 689e0ba8e1
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BufferParams.cpp
View File

@ -1406,7 +1406,7 @@ void BufferParams::writeEncodingPreamble(odocstream & os,
os << "]{inputenc}\n"; os << "]{inputenc}\n";
texrow.newline(); texrow.newline();
} }
if (package == Encoding::CJK) { if (package == Encoding::CJK || features.mustProvide("CJK")) {
os << "\\usepackage{CJK}\n"; os << "\\usepackage{CJK}\n";
texrow.newline(); texrow.newline();
} }

4
src/LaTeXFeatures.cpp
View File

@ -354,6 +354,10 @@ void LaTeXFeatures::useLanguage(Language const * lang)
{ {
if (!lang->babel().empty()) if (!lang->babel().empty())
UsedLanguages_.insert(lang); UsedLanguages_.insert(lang);
// CJK languages do not have a babel name.
// They use the CJK package
if (lang->encoding()->package() == Encoding::CJK)
require("CJK");
} }

2
status.15x
View File

@ -120,6 +120,8 @@ What's new
- Fix updating of externally modified files on Windows both in the workarea and - Fix updating of externally modified files on Windows both in the workarea and
in the output (bug 3172). in the output (bug 3172).
- Fix loading of the CJK package in multilingual documents (part of bug 4337).
- Fix a problem on Windows where invalid names were given to backup files - Fix a problem on Windows where invalid names were given to backup files
(bug 4287). (bug 4287).