fix #1073

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

diff --git a/src/mathed/math_charinset.h b/src/mathed/math_charinset.h
index 718faab5b5c030a97f640015f6329e33aa3e08c0..1f9fa26ccfde18ba3ed1f63daa447932e60e411d 100644 (file)
--- a/src/mathed/math_charinset.h
+++ b/src/mathed/math_charinset.h
@@ -2,38 +2,43 @@
 #ifndef MATH_CHARINSET_H
 #define MATH_CHARINSET_H
 
-#include "math_inset.h"
+#include "math_diminset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** The base character inset.
-    \author André Pönitz
+ *  \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS
  */
 
-class MathCharInset : public MathInset {
+class MathCharInset : public MathDimInset {
 public:
        ///
-       MathCharInset(char c, MathTextCodes t);
+       explicit MathCharInset(char c);
        ///
        MathInset * clone() const;
        ///
-       void draw(Painter &, int x, int baseline);
+       void metrics(MetricsInfo & st) const;
+       ///
+       void draw(PainterInfo &, int x, int y) const;
+       ///
+       void metricsT(TextMetricsInfo const & st) const;
        ///
-       void write(std::ostream &, bool fragile) const;
+       void drawT(TextPainter &, int x, int y) const;
        ///
-       void writeNormal(std::ostream &) const;
-       /// 
-       int ascent() const;
+       void write(WriteStream & os) const;
        ///
-       int descent() const;
+       void normalize(NormalStream & ns) const;
        ///
-       int width() const;
+       void octave(OctaveStream & os) const;
        /// identifies Charinsets
-       bool isCharInset() const { return true; }
+       MathCharInset const * asCharInset() const { return this; }
        ///
        char getChar() const { return char_; }
+       ///
+       bool isRelOp() const;
+       ///
+       bool match(MathInset const *) const;
 
 private:
        /// the character