From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Sat, 22 Nov 2008 16:40:39 +0000 (+0000)
Subject: * output_latex:cpp:
X-Git-Tag: 2.0.0~7648
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=17e11a930db5715eaa74f7fd1d009f1040b16054;p=features.git

* output_latex:cpp:
	- fix some CJK nesting issues.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27665 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 2a896ab751..6fe78d0b8e 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -180,8 +180,9 @@ TeXEnvironment(Buffer const & buf,
 	bool cjk_nested = false;
 	if (par_language->encoding()->package() == Encoding::CJK &&
 	    open_encoding_ != CJK && pit->isMultiLingual(bparams)) {
-		os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
-		   << "}{" << from_ascii(bparams.fontsCJK) << "}%\n";
+		if (prev_par_language->encoding()->package() == Encoding::CJK)
+			os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
+			   << "}{" << from_ascii(bparams.fontsCJK) << "}%\n";
 		open_encoding_ = CJK;
 		cjk_nested = true;
 		texrow.newline();
@@ -658,8 +659,8 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
 	if (nextpit != paragraphs.end() && open_encoding_ == CJK &&
 	    (nextpit->getParLanguage(bparams)->encoding()->package() != Encoding::CJK ||
 	     nextpit->layout().isEnvironment() && nextpit->isMultiLingual(bparams))
-	     // in environments, CJK has to be closed later (nesting!)
-	     && !style.isEnvironment()) {
+	     // inbetween environments, CJK has to be closed later (nesting!)
+	     && (!style.isEnvironment() || !nextpit->layout().isEnvironment())) {
 		os << "\\end{CJK}\n";
 		open_encoding_ = none;
 	}