enable direct input of #1...#9; some whitespace changes

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

diff --git a/src/mathed/math_charinset.h b/src/mathed/math_charinset.h
index 629e93e46332243e114421e1bbf37b75f3c46c57..20d5e472f1f3fc6a95653fd4af2b31082e7d2138 100644 (file)
--- a/src/mathed/math_charinset.h
+++ b/src/mathed/math_charinset.h
@@ -21,15 +21,21 @@ public:
        ///
        MathInset * clone() const;
        ///
-       MathTextCodes nativeCode(char c) const;
+       static MathTextCodes nativeCode(char c);
        ///
-       void metrics(MathStyles st) const;
+       void metrics(MathMetricsInfo const & st) const;
        ///
        void draw(Painter &, int x, int y) const;
        ///
-       void write(std::ostream &, bool fragile) const;
+       void write(WriteStream & os) const;
        ///
-       void writeNormal(std::ostream &) const;
+       void writeHeader(std::ostream &) const;
+       ///
+       void writeTrailer(std::ostream &) const;
+       ///
+       void writeRaw(std::ostream &) const;
+       ///
+       void normalize(NormalStream &) const;
        /// 
        int ascent() const;
        ///
@@ -37,7 +43,7 @@ public:
        ///
        int width() const;
        /// identifies Charinsets
-       bool isCharInset() const { return true; }
+       MathCharInset const * asCharInset() const { return this; }
        ///
        char getChar() const { return char_; }
        ///
@@ -46,11 +52,15 @@ public:
        bool isRelOp() const;
        ///
        void handleFont(MathTextCodes t);
+       ///
+       bool match(MathInset *) const;
 
 private:
        /// the character
        char char_;
-       /// 
+       /// the font to be used on screen
        MathTextCodes code_;
+       ///
+       mutable MathMetricsInfo mi_;
 };
 #endif