Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_charinset.h b/src/mathed/math_charinset.h
index 1cad4cf94fa515c653a22ceb946cdc38e17eccee..a40f577d472f180a88377d511f93dc53e426bcc3 100644 (file)
--- a/src/mathed/math_charinset.h
+++ b/src/mathed/math_charinset.h
@@ -12,18 +12,15 @@
 #ifndef MATH_CHARINSET_H
 #define MATH_CHARINSET_H
 
-#include "math_diminset.h"
+#include "math_inset.h"
 
-#warning this should not derive from the fat MathDimInset
 
 /// The base character inset.
-class MathCharInset : public MathDimInset {
+class MathCharInset : public MathInset {
 public:
        ///
        explicit MathCharInset(char c);
        ///
-       virtual std::auto_ptr<InsetBase> clone() const;
-       ///
        void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
@@ -31,6 +28,8 @@ public:
        void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter &, int x, int y) const;
+       ///
+       int width() const { return width_; }
 
        ///
        void write(WriteStream & os) const;
@@ -38,6 +37,8 @@ public:
        void normalize(NormalStream & ns) const;
        ///
        void octave(OctaveStream & os) const;
+       ///
+       void mathmlize(MathMLStream & ms) const;
        /// identifies Charinsets
        MathCharInset const * asCharInset() const { return this; }
        ///
@@ -46,7 +47,10 @@ public:
        bool isRelOp() const;
 
 private:
+       virtual std::auto_ptr<InsetBase> doClone() const;
        /// the character
        char char_;
+       /// cached width
+       mutable int width_;
 };
 #endif