From b9976f59291e431a6dc9c5291172d9bb61d8c552 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Fri, 11 Oct 2013 12:19:41 +0200
Subject: [PATCH] Fix unbalanced bracket problem with CJK

The bug was introduced with commit [2af09e2e/lyxgit], where the unnecessary trailing bracket in CJK environments was suppresed, but not the preceding bracket (which is only output if CJK is a secondary language).
---
 src/Font.cpp | 4 ++--
 status.20x   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Font.cpp b/src/Font.cpp
index 3602e31020..8a3d3af404 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -284,7 +284,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 			tmp += "{";
 			os << from_ascii(tmp);
 			count += tmp.length();
-		} else {
+		} else if (language()->encoding()->package() != Encoding::CJK) {
 			os << '{';
 			count += 1;
 		}
@@ -319,7 +319,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 				      "$$lang", language()->babel());
 			os << from_ascii(tmp);
 			count += tmp.length();
-		} else {
+		} else if (language()->encoding()->package() != Encoding::CJK) {
 			os << '{';
 			count += 1;
 		}
diff --git a/status.20x b/status.20x
index f75788a883..6a36c68f98 100644
--- a/status.20x
+++ b/status.20x
@@ -59,6 +59,9 @@ What's new
 
 - Fix problem with unbalanced braces in XeTeX output (bug 8765).
 
+- Fix problems with unbalanced braces with a secondary CJK language
+  (bug 8215).
+
 - Fix state of certain language packages (polyglossia, japanese) in
   child documents (bug 8770).