Another warning.

[lyx.git] / src / mathed / InsetMathDecoration.cpp

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index be28d0765e36075d0562ac56d4051ef8bf8cfe3d..37fae799112bffe82725038f3537b89e85dd4c60 100644 (file)
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -22,6 +22,7 @@
 #include "LaTeXFeatures.h"
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/lassert.h"
 
 #include <ostream>
@@ -104,8 +105,9 @@ InsetMath::mode_type InsetMathDecoration::currentMode() const
 
 void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       FontSetChanger dummy(mi.base, currentMode() == TEXT_MODE ?
-                               "textnormal" : "mathnormal");
+       bool really_change_font = currentMode() == TEXT_MODE
+                               && isMathFont(from_ascii(mi.base.fontname));
+       FontSetChanger dummy(mi.base, "textnormal", really_change_font);
 
        cell(0).metrics(mi, dim);
 
@@ -126,8 +128,9 @@ void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
 {
-       FontSetChanger dummy(pi.base, currentMode() == TEXT_MODE ?
-                               "textnormal" : "mathnormal");
+       bool really_change_font = currentMode() == TEXT_MODE
+                               && isMathFont(from_ascii(pi.base.fontname));
+       FontSetChanger dummy(pi.base, "textnormal", really_change_font);
 
        cell(0).draw(pi, x + 1, y);
        Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
@@ -173,9 +176,9 @@ namespace {
                string tag;
        };
 
-       typedef map<string, Attributes> Translator;
+       typedef map<string, Attributes> TranslationMap;
 
-       void buildTranslator(Translator & t) {
+       void buildTranslationMap(TranslationMap & t) {
                // the decorations we need to support are listed in lib/symbols
                t["acute"] = Attributes(true, "&acute;");
                t["bar"]   = Attributes(true, "&OverBar;");
@@ -206,18 +209,18 @@ namespace {
                t["widetilde"] = Attributes(true, "&Tilde;");
        }
 
-       Translator const & translator() {
-               static Translator t;
+       TranslationMap const & translationMap() {
+               static TranslationMap t;
                if (t.empty())
-                       buildTranslator(t);
+                       buildTranslationMap(t);
                return t;
        }
 }
 
 void InsetMathDecoration::mathmlize(MathStream & os) const
 {
-       Translator const & t = translator();
-       Translator::const_iterator cur = t.find(to_utf8(key_->name));
+       TranslationMap const & t = translationMap();
+       TranslationMap::const_iterator cur = t.find(to_utf8(key_->name));
        LASSERT(cur != t.end(), return);
        char const * const outag = cur->second.over ? "mover" : "munder";
        os << MTag(outag)
@@ -240,8 +243,8 @@ void InsetMathDecoration::htmlize(HtmlStream & os) const
                return;
        }
 
-       Translator const & t = translator();
-       Translator::const_iterator cur = t.find(name);
+       TranslationMap const & t = translationMap();
+       TranslationMap::const_iterator cur = t.find(name);
        LASSERT(cur != t.end(), return);
        
        bool symontop = cur->second.over;