Fix #10778 (issue with CJK and language nesting)

[lyx.git] / src / MetricsInfo.cpp

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index b75ec811086a70ebdaa777191ed27cdf2dc66033..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;
 }
@@ -244,7 +244,8 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name,
                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"
@@ -264,7 +265,8 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name,
                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"