From 2af09e2e0e9246f702c9845815113dfc5ef9b704 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sat, 30 Jun 2012 03:48:34 +0200 Subject: [PATCH] backport fix for bug #8215 Font.cpp: CJK parts must not have a closing brace because they are within an environment --- src/Font.cpp | 5 +++-- status.20x | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Font.cpp b/src/Font.cpp index 46cba97231..9377db7dd7 100644 --- 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 0742baa56f..ad85140976 100644 --- 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 -- 2.39.5