Fix bug 5802 (http://bugzilla.lyx.org/show_bug.cgi?id=5802)

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

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 9db642bf94af2a6260771466ca5a5761e74808db..8166b53d5286d9867f3343530365b161034a95ca 100644 (file)
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,36 +12,37 @@
 #include <config.h>
 
 #include "InsetMathChar.h"
+
 #include "MathSupport.h"
 #include "MathStream.h"
+#include "MetricsInfo.h"
 
-#include "debug.h"
 #include "Dimension.h"
-#include "support/lstrings.h"
+#include "Encoding.h"
+#include "LaTeXFeatures.h"
 #include "TextPainter.h"
 
 #include "frontends/FontMetrics.h"
 
+#include "support/debug.h"
+#include "support/lstrings.h"
+#include "support/textutils.h"
 
-namespace lyx {
 
-using std::auto_ptr;
+namespace lyx {
 
 extern bool has_math_fonts;
 
-namespace {
 
-       bool isBinaryOp(char_type c)
-       {
-               return support::contains("+-<>=/*", static_cast<char>(c));
-       }
+static bool isBinaryOp(char_type c)
+{
+       return support::contains("+-<>=/*", static_cast<char>(c));
+}
 
 
-       bool slanted(char_type c)
-       {
-               return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z');
-       }
-
+static bool slanted(char_type c)
+{
+       return isAlphaASCII(c) || Encodings::isMathAlpha(c);
 }
 
 
@@ -51,20 +52,14 @@ InsetMathChar::InsetMathChar(char_type c)
 
 
 
-auto_ptr<Inset> InsetMathChar::doClone() const
+Inset * InsetMathChar::clone() const
 {
-       return auto_ptr<Inset>(new InsetMathChar(*this));
+       return new InsetMathChar(*this);
 }
 
 
-bool InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       if (mi.base.font == font_cache_) {
-               dim = dim_;
-               return false;
-       }
-       font_cache_ = mi.base.font;
-
 #if 1
        if (char_ == '=' && has_math_fonts) {
                FontSetChanger dummy(mi.base, "cmr");
@@ -73,7 +68,7 @@ bool InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const
                FontSetChanger dummy(mi.base, "cmm");
                dim = theFontMetrics(mi.base.font).dimension(char_);
        } else if (!slanted(char_) && mi.base.fontname == "mathnormal") {
-               ShapeChanger dummy(mi.base.font, Font::UP_SHAPE);
+               ShapeChanger dummy(mi.base.font, UP_SHAPE);
                dim = theFontMetrics(mi.base.font).dimension(char_);
        } else {
                frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
@@ -92,8 +87,6 @@ bool InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.wid += 2 * theFontMetrics(font_).width(' ');
        lyxerr << "InsetMathChar::metrics: " << dim << endl;
 #endif
-       dim_ = dim;
-       return true;
 }
 
 
@@ -113,7 +106,7 @@ void InsetMathChar::draw(PainterInfo & pi, int x, int y) const
                FontSetChanger dummy(pi.base, "cmm");
                pi.draw(x, y, char_);
        } else if (!slanted(char_) && pi.base.fontname == "mathnormal") {
-               ShapeChanger dummy(pi.base.font, Font::UP_SHAPE);
+               ShapeChanger dummy(pi.base.font, UP_SHAPE);
                pi.draw(x, y, char_);
        } else {
                pi.draw(x, y, char_);
@@ -145,6 +138,13 @@ void InsetMathChar::write(WriteStream & os) const
 }
 
 
+void InsetMathChar::validate(LaTeXFeatures & features) const
+{
+       if (char_ >= 0x80)
+               encodings.validate(char_, features, true);
+}
+
+
 void InsetMathChar::normalize(NormalStream & os) const
 {
        os << "[char ";