Another warning.

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

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index d47c1a9c57786d0af753df1cc771b24e2d4f8b5f..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);