X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=71d7a39de1a75c4e356d1967a9fc3093d284bc11;hb=5a8e91d1c5381d8c152b12269707b547d5241624;hp=b75ec811086a70ebdaa777191ed27cdf2dc66033;hpb=f07ffaee84cef2b28c9d49e388d30f1f8e22cfc5;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index b75ec81108..71d7a39de1 100644
--- 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"