backport fix for bug #8215

Font.cpp: CJK parts must not have a closing brace because they are within an environment

diff --git a/src/Font.cpp b/src/Font.cpp
index 46cba97231dfea6949b0cb8875f2e54b1894cd5f..9377db7dd70135463da4c881bbe04d046a44517f 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -539,8 +539,9 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
                open_encoding_ = false;
        }
 
-       if (closeLanguage &&
-                       language() != base.language() && language() != next.language()) {
+       if (closeLanguage
+           && language() != base.language() && language() != next.language()
+           && language()->encoding()->package() != Encoding::CJK) {
                os << '}';
                ++count;
        }

diff --git a/status.20x b/status.20x
index 0742baa56f261baf2920c0b9ae90ae907a284f0d..ad851409767df4a9949f2942c1c72e741760eb99 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -63,6 +63,9 @@ What's new
 
 - Do not ignore polyglossia commands in partial source preview (bug 8209).
 
+- Export correct language change commands if document coontains different
+  CJK languages (bug 8215).
+
 
 * USER INTERFACE