Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index d6c2331cb338975b2bb04435c137150afb285cfb..290815d88bb7e80ea3ddd8863a96cc206b62231c 100644 (file)
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -17,28 +17,23 @@
 
 #include "debug.h"
 #include "dimension.h"
+#include "support/lstrings.h"
 #include "textpainter.h"
 
 using std::auto_ptr;
 
-#ifndef CXX_GLOBAL_CSTD
-using std::strchr;
-#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');
        }
 
@@ -51,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));
 }
@@ -84,7 +79,7 @@ void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
                width_ += 2 * font_metrics::width(' ', font_);
        lyxerr << "MathCharInset::metrics: " << dim << endl;
 #endif
-       dim_ = dim;
+       width_ = dim.wid;
 }
 
 
@@ -138,7 +133,7 @@ void MathCharInset::write(WriteStream & os) const
 
 void MathCharInset::normalize(NormalStream & os) const
 {
-       os << "[char " << char_ << ' ' << "mathalpha]";
+       os << "[char " << char_ << " mathalpha]";
 }
 
 
@@ -148,6 +143,17 @@ void MathCharInset::octave(OctaveStream & os) const
 }
 
 
+void MathCharInset::mathmlize(MathMLStream & ms) const
+{
+       switch (char_) {
+               case '<': ms << "&lt;"; break;
+               case '>': ms << "&gt;"; break;
+               case '&': ms << "&amp;"; break;
+               default: ms << char_; break;
+       }
+}
+
+
 bool MathCharInset::isRelOp() const
 {
        return char_ == '=' || char_ == '<' || char_ == '>';