* src/frontends/controllers/Dialog.{cpp,h}:

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

diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index 87aff39550bcef472f9278bc5a8f0c92c5ddd061..16f26169dd3c340bb4c0f5d6b5644bb546c225c1 100644 (file)
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.cpp
@@ -11,13 +11,14 @@
 #include <config.h>
 
 #include "InsetMathSymbol.h"
-#include "dimension.h"
+#include "Dimension.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "MathParser.h"
 #include "MathAtom.h"
 #include "LaTeXFeatures.h"
+
 #include "debug.h"
 
 #include "support/textutils.h"
@@ -29,24 +30,23 @@ using std::auto_ptr;
 
 
 InsetMathSymbol::InsetMathSymbol(latexkeys const * l)
-       : sym_(l), h_(0), scriptable_(false), font_cache_(LyXFont::ALL_IGNORE)
+       : sym_(l), h_(0), scriptable_(false)
 {}
 
 
 InsetMathSymbol::InsetMathSymbol(char const * name)
-       : sym_(in_word_set(from_ascii(name))), h_(0), scriptable_(false),
-       font_cache_(LyXFont::ALL_IGNORE)
+       : sym_(in_word_set(from_ascii(name))), h_(0), scriptable_(false)
 {}
 
 
 InsetMathSymbol::InsetMathSymbol(docstring const & name)
-       : sym_(in_word_set(name)), h_(0), scriptable_(false), font_cache_(LyXFont::ALL_IGNORE)
+       : sym_(in_word_set(name)), h_(0), scriptable_(false)
 {}
 
 
-auto_ptr<InsetBase> InsetMathSymbol::doClone() const
+auto_ptr<Inset> InsetMathSymbol::doClone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathSymbol(*this));
+       return auto_ptr<Inset>(new InsetMathSymbol(*this));
 }
 
 
@@ -63,30 +63,22 @@ bool InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
        //      << "' drawn as: '" << sym_->draw
        //      << "'" << std::endl;
 
-       bool dim_unchanged = (mi.base.font == font_cache_);
-       if (dim_unchanged)
-               dim = dim_;
-       else {
-               font_cache_ = mi.base.font;
-               int const em = mathed_char_width(mi.base.font, 'M');
-               FontSetChanger dummy(mi.base, sym_->inset);
-               mathed_string_dim(mi.base.font, sym_->draw, dim);
-               docstring::const_reverse_iterator rit = sym_->draw.rbegin();
-               kerning_ = mathed_char_kerning(mi.base.font, *rit);
-               // correct height for broken cmex and wasy font
-               if (sym_->inset == "cmex" || sym_->inset == "wasy") {
-                       h_ = 4 * dim.des / 5;
-                       dim.asc += h_;
-                       dim.des -= h_;
-               }
-               // seperate things a bit
-               if (isRelOp())
-                       dim.wid += static_cast<int>(0.5 * em + 0.5);
-               else
-                       dim.wid += static_cast<int>(0.1667 * em + 0.5);
-
-               dim_ = dim;
+       int const em = mathed_char_width(mi.base.font, 'M');
+       FontSetChanger dummy(mi.base, sym_->inset);
+       mathed_string_dim(mi.base.font, sym_->draw, dim);
+       docstring::const_reverse_iterator rit = sym_->draw.rbegin();
+       kerning_ = mathed_char_kerning(mi.base.font, *rit);
+       // correct height for broken cmex and wasy font
+       if (sym_->inset == "cmex" || sym_->inset == "wasy") {
+               h_ = 4 * dim.des / 5;
+               dim.asc += h_;
+               dim.des -= h_;
        }
+       // seperate things a bit
+       if (isRelOp())
+               dim.wid += static_cast<int>(0.5 * em + 0.5);
+       else
+               dim.wid += static_cast<int>(0.1667 * em + 0.5);
 
        scriptable_ = false;
        if (mi.base.style == LM_ST_DISPLAY)
@@ -94,7 +86,11 @@ bool InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
                    sym_->extra == "funclim")
                        scriptable_ = true;
 
-       return dim_unchanged;
+       if (dim_ == dim)
+               return false;
+
+       dim_ = dim;
+       return true;
 }