Fix #10778 (issue with CJK and language nesting)

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index 6d701c75ac1354c15cb0eafaac86d5aced3d1f00..71d7a39de1a75c4e356d1967a9fc3093d284bc11 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -66,7 +66,7 @@ MetricsInfo::MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth,
 
 PainterInfo::PainterInfo(BufferView * bv, lyx::frontend::Painter & painter)
        : pain(painter), ltr_pos(false), change_(), selected(false),
-       full_repaint(true), background_color(Color_background)
+       do_spellcheck(true), full_repaint(true), background_color(Color_background)
 {
        base.bv = bv;
 }
@@ -107,6 +107,16 @@ ColorCode PainterInfo::backgroundColor(Inset const * inset, bool sel) const
 }
 
 
+Color PainterInfo::textColor(Color const & color) const
+{
+       if (change_.changed()) 
+               return change_.color();
+       if (selected)
+               return Color_selectiontext;
+       return color;
+}
+
+
 /////////////////////////////////////////////////////////////////////////
 //
 // ScriptChanger
@@ -176,9 +186,8 @@ ArrayChanger::ArrayChanger(MetricsBase & mb)
 /////////////////////////////////////////////////////////////////////////
 
 ShapeChanger::ShapeChanger(FontInfo & font, FontShape shape)
-       : Changer<FontInfo, FontShape>(font)
+       : Changer<FontInfo, FontShape>(font, font.shape())
 {
-       save_ = orig_.shape();
        orig_.setShape(shape);
 }
 
@@ -203,7 +212,6 @@ StyleChanger::StyleChanger(MetricsBase & mb, Styles style)
                  { 0, 0, -3, -5 },
                  { 3, 3,  0, -2 },
                  { 5, 5,  2,  0 } };
-       save_ = mb;
        int t = diff[mb.style][style];
        if (t > 0)
                while (t--)
@@ -232,12 +240,12 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name,
        : Changer<MetricsBase>(mb), change_(really_change_font)
 {
        if (change_) {
-               save_ = mb;
                FontSize oldsize = save_.font.size();
                ColorCode oldcolor = save_.font.color();
                docstring const oldname = from_ascii(save_.fontname);
                mb.fontname = name;
-               mb.font = sane_font;
+               if (isMathFont(from_ascii(name)) || isMathFont(oldname))
+                       mb.font = sane_font;
                augmentFont(mb.font, from_ascii(name));
                mb.font.setSize(oldsize);
                if (string(name) != "lyxtex"
@@ -253,12 +261,12 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name,
        : Changer<MetricsBase>(mb), change_(really_change_font)
 {
        if (change_) {
-               save_ = mb;
                FontSize oldsize = save_.font.size();
                ColorCode oldcolor = save_.font.color();
                docstring const oldname = from_ascii(save_.fontname);
                mb.fontname = to_utf8(name);
-               mb.font = sane_font;
+               if (isMathFont(name) || isMathFont(oldname))
+                       mb.font = sane_font;
                augmentFont(mb.font, name);
                mb.font.setSize(oldsize);
                if (name != "lyxtex"
@@ -285,7 +293,6 @@ FontSetChanger::~FontSetChanger()
 WidthChanger::WidthChanger(MetricsBase & mb, int w)
        : Changer<MetricsBase>(mb)
 {
-       save_ = mb;
        mb.textwidth = w;
 }
 
@@ -302,13 +309,12 @@ WidthChanger::~WidthChanger()
 //
 /////////////////////////////////////////////////////////////////////////
 
-ColorChanger::ColorChanger(FontInfo & font, docstring const & color,
+ColorChanger::ColorChanger(FontInfo & font, ColorCode color,
                           bool really_change_color)
-       : Changer<FontInfo, ColorCode>(font), change_(really_change_color)
+       : Changer<FontInfo, ColorCode>(font, font.color()), change_(really_change_color)
 {
        if (change_) {
-               save_ = font.color();
-               font.setColor(lcolor.getFromLyXName(to_utf8(color)));
+               font.setColor(color);
        }
 }