Andreas' patch to prevent crash on click on previewd inset

[lyx.git] / src / mathed / math_charinset.C

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index ab2fb14e72529f3c2a8702b27d8bfe8a621a27ac..290815d88bb7e80ea3ddd8863a96cc206b62231c 100644 (file)
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -12,36 +12,28 @@
 #include <config.h>
 
 #include "math_charinset.h"
-#include "dimension.h"
-#include "support/LOstream.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
-#include "textpainter.h"
-
 
+#include "debug.h"
+#include "dimension.h"
+#include "support/lstrings.h"
+#include "textpainter.h"
 
-using std::ostream;
-using std::endl;
 using std::auto_ptr;
 
-#ifndef CXX_GLOBAL_CSTD
-using std::strchr;
-using std::isalpha;
-#endif
-
 extern bool has_math_fonts;
 
 namespace {
 
        bool isBinaryOp(char c)
        {
-               return strchr("+-<>=/*", c);
+               return lyx::support::contains("+-<>=/*", c);
        }
 
 
        bool slanted(char c)
        {
-               //if (strchr("0123456789;:!|[]().,?+/-*<>=", c)
                return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z');
        }
 
@@ -54,7 +46,7 @@ MathCharInset::MathCharInset(char c)
 
 
 
-auto_ptr<InsetBase> MathCharInset::clone() const
+auto_ptr<InsetBase> MathCharInset::doClone() const
 {
        return auto_ptr<InsetBase>(new MathCharInset(*this));
 }
@@ -69,8 +61,8 @@ void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
        } else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
                FontSetChanger dummy(mi.base, "cmm");
                mathed_char_dim(mi.base.font, char_, dim);
-       } else if (slanted(char_) && mi.base.fontname == "mathnormal") {
-               ShapeChanger dummy(mi.base.font, LyXFont::ITALIC_SHAPE);
+       } else if (!slanted(char_) && mi.base.fontname == "mathnormal") {
+               ShapeChanger dummy(mi.base.font, LyXFont::UP_SHAPE);
                mathed_char_dim(mi.base.font, char_, dim);
        } else {
                mathed_char_dim(mi.base.font, char_, dim);
@@ -87,6 +79,7 @@ void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
                width_ += 2 * font_metrics::width(' ', font_);
        lyxerr << "MathCharInset::metrics: " << dim << endl;
 #endif
+       width_ = dim.wid;
 }
 
 
@@ -105,8 +98,8 @@ void MathCharInset::draw(PainterInfo & pi, int x, int y) const
        } else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
                FontSetChanger dummy(pi.base, "cmm");
                pi.draw(x, y, char_);
-       } else if (slanted(char_) && pi.base.fontname == "mathnormal") {
-               ShapeChanger dummy(pi.base.font, LyXFont::ITALIC_SHAPE);
+       } else if (!slanted(char_) && pi.base.fontname == "mathnormal") {
+               ShapeChanger dummy(pi.base.font, LyXFont::UP_SHAPE);
                pi.draw(x, y, char_);
        } else {
                pi.draw(x, y, char_);
@@ -140,7 +133,7 @@ void MathCharInset::write(WriteStream & os) const
 
 void MathCharInset::normalize(NormalStream & os) const
 {
-       os << "[char " << char_ << ' ' << "mathalpha]";
+       os << "[char " << char_ << " mathalpha]";
 }
 
 
@@ -150,14 +143,18 @@ void MathCharInset::octave(OctaveStream & os) const
 }
 
 
-bool MathCharInset::isRelOp() const
+void MathCharInset::mathmlize(MathMLStream & ms) const
 {
-       return char_ == '=' || char_ == '<' || char_ == '>';
+       switch (char_) {
+               case '<': ms << "&lt;"; break;
+               case '>': ms << "&gt;"; break;
+               case '&': ms << "&amp;"; break;
+               default: ms << char_; break;
+       }
 }
 
 
-bool MathCharInset::match(MathInset const * p) const
+bool MathCharInset::isRelOp() const
 {
-       MathCharInset const * q = p->asCharInset();
-       return q && char_ == q->char_;
+       return char_ == '=' || char_ == '<' || char_ == '>';
 }