From 71ea6e7a8b8cc380db31dce6a295b8dbbb7f6958 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Tue, 9 Oct 2007 00:59:16 +0000 Subject: [PATCH] BufferParams.cpp: next step for proper traditional Japanese support git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20861 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferParams.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 40aba23a00..e415553e32 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -1142,6 +1142,12 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, lyxpreamble += from_utf8(features.getBabelOptions()); } + // When the language "japanese-plain" is used, the package "japanese" must + // be loaded behind babel (it provides babel support for Japanese) + // see http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129680.html + if (language->lang() == "japanese-plain") + lyxpreamble += "\\usepackage{japanese}\n"; + // PDF support. // * Hyperref manual: "Make sure it comes last of your loaded // packages, to give it a fighting chance of not being over-written, @@ -1578,7 +1584,11 @@ void BufferParams::writeEncodingPreamble(odocstream & os, std::set encodings = features.getEncodingSet(doc_encoding); - if (!encodings.empty() || package == Encoding::inputenc) { + // When the language japanese-plain is used, the package inputenc must + // be omitted. + // see http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129680.html + if ((!encodings.empty() || package == Encoding::inputenc) && + language->lang() != "japanese-plain") { os << "\\usepackage["; std::set::const_iterator it = encodings.begin(); std::set::const_iterator const end = encodings.end(); -- 2.39.5