make naming a bit saner...

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

diff --git a/src/mathed/math_stringinset.h b/src/mathed/math_stringinset.h
index edcaafe5c6ac41078982ecef658d2dd527ab1890..d38a7cddf9d3ac04b2fe9a38098058c2b24e119e 100644 (file)
--- a/src/mathed/math_stringinset.h
+++ b/src/mathed/math_stringinset.h
@@ -2,49 +2,46 @@
 #ifndef MATH_STRINGINSET_H
 #define MATH_STRINGINSET_H
 
-#include "math_inset.h"
+#include "math_diminset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-/** Some cllection of chars with similar properties
-    \author André Pönitz
+/** Some collection of chars with similar properties
+ *  maily for math-extern
+ *  \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS
  */
 
-class MathStringInset : public MathInset {
+class MathStringInset : public MathDimInset {
 public:
        ///
-       MathStringInset(string const & s, MathTextCodes t);
+       explicit MathStringInset(string const & s);
        ///
        MathInset * clone() const;
        ///
-       void metrics(MathMetricsInfo const & st) const;
+       void metrics(MathMetricsInfo & mi) const;
        ///
-       void draw(Painter &, int x, int y) const;
+       void draw(MathPainterInfo & pi, int x, int y) const;
        ///
-       void write(MathWriteInfo & os) const;
+       string str() const { return str_; }
        ///
-       void writeNormal(std::ostream &) const;
-       /// 
-       int ascent() const;
+       MathStringInset * asStringInset() { return this; }
+
        ///
-       int descent() const;
+       void normalize(NormalStream &) const;
        ///
-       int width() const;
+       void octave(OctaveStream &) const;
        ///
-       void octavize(OctaveStream &) const;
+       void maple(MapleStream &) const;
        ///
-       void maplize(MapleStream &) const;
+       void mathematica(MathematicaStream &) const;
        ///
        void mathmlize(MathMLStream &) const;
+       ///
+       void write(WriteStream & os) const;
 
 private:
        /// the string
        string str_;
-       /// the font to be used on screen
-       MathTextCodes code_;
-       ///
-       mutable MathMetricsInfo mi_;
 };
 #endif