The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 47f7d44747002726307e615ddf0ad35dc8b59dbf
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sun Jun 24 14:42:23 2012 +0200

    fix 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 9e8375c..387393d 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -540,7 +540,8 @@ int Font::latexWriteEndChanges(otexstream & os, 
BufferParams const & bparams,
        }
 
        if (closeLanguage &&
-                       language() != base.language() && language() != 
next.language()) {
+                       language() != base.language() && language() != 
next.language()
+                       && language()->encoding()->package() != Encoding::CJK) {
                os << '}';
                ++count;
        }

-----------------------------------------------------------------------

Summary of changes:
 src/Font.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to