Various fixes from Dekel Tsur.

[features.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 45dc9b9da791744d7dbff96622a4376857e82233..0be8d2e473121e5bccd2d0e1c0de5ac680a6d00e 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -663,7 +663,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
        int count = 0;
        bool env = false;
 
-       if (language() != prev.language()) {
+       if (language() != base.language() && language() != prev.language()) {
                if (isRightToLeft() != prev.isRightToLeft()) {
                        if (isRightToLeft()) {
                                os << "\\R{";
@@ -755,7 +755,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
        int count = 0;
        bool env = false;
 
-       if (language() != next.language()) {
+       if (language() != base.language() && language() != next.language()) {
                os << "}";
                ++count;
                env = true; // Size change need not bother about closing env.