rename LyXFont to Font except in tex2lyx

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

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index 91a1d1d86b1a537458db663e70e4c0b53b2b1fec..87cf74ef950639b8dfcb5500eaa3b6f823bbfba1 100644 (file)
--- a/src/mathed/InsetMath.h
+++ b/src/mathed/InsetMath.h
@@ -15,9 +15,10 @@
 
 #include "MathData.h"
 
-#include "insets/insetbase.h"
+#include "insets/Inset.h"
 
-#include <string>
+
+namespace lyx {
 
 enum HullType {
        hullNone,
@@ -33,8 +34,8 @@ enum HullType {
        hullGather
 };
 
-HullType hullType(std::string const & name);
-std::string hullName(HullType type);
+HullType hullType(docstring const & name);
+docstring hullName(HullType type);
 
 /**
 
@@ -69,28 +70,27 @@ class InsetMathSpace;
 class InsetMathSymbol;
 class InsetMathUnknown;
 
-class RefInset;
+class InsetMathRef;
 
 class NormalStream;
 class OctaveStream;
 class MapleStream;
 class MaximaStream;
 class MathematicaStream;
-class MathMLStream;
+class MathStream;
 class WriteStream;
 class InfoStream;
 
 class MathMacroTemplate;
 class MathMacro;
 class MathPosFinder;
-class Dimension;
-class LCursor;
+class Cursor;
 class TextPainter;
 class TextMetricsInfo;
 class ReplaceData;
 
 
-class InsetMath : public InsetBase {
+class InsetMath : public Inset {
 public:
        /// identification as math inset
        InsetMath * asInsetMath() { return this; }
@@ -104,9 +104,9 @@ public:
        virtual void drawT(TextPainter &, int x, int y) const;
 
        /// return cell given its number
-       virtual MathArray & cell(idx_type);
+       virtual MathData & cell(idx_type);
        /// return cell given its number
-       virtual MathArray const & cell(idx_type) const;
+       virtual MathData const & cell(idx_type) const;
 
        /// identifies certain types of insets
        virtual InsetMathAMSArray       * asAMSArrayInset()       { return 0; }
@@ -142,7 +142,7 @@ public:
        virtual InsetMathSymbol const   * asSymbolInset() const   { return 0; }
        virtual InsetMathUnknown        * asUnknownInset()        { return 0; }
        virtual InsetMathUnknown const  * asUnknownInset() const  { return 0; }
-       virtual RefInset                * asRefInset()            { return 0; }
+       virtual InsetMathRef            * asRefInset()            { return 0; }
 
        /// identifies things that can get scripts
        virtual bool isScriptable() const { return false; }
@@ -152,16 +152,16 @@ public:
        virtual bool extraBraces() const { return false; }
 
        /// return the content as char if the inset is able to do so
-       virtual char getChar() const { return 0; }
+       virtual char_type getChar() const { return 0; }
        /// identifies things that can get \limits or \nolimits
        virtual bool takesLimits() const { return false; }
 
        /// char char code if possible
-       virtual void handleFont(std::string const &) {}
+       virtual void handleFont(docstring const &) {}
        /// replace things by other things
        virtual void replace(ReplaceData &) {}
        /// do we contain a given subsequence?
-       virtual bool contains(MathArray const &) const { return false; }
+       virtual bool contains(MathData const &) const { return false; }
        /// access to the lock (only nest array have one)
        virtual bool lock() const { return false; }
        /// access to the lock (only nest array have one)
@@ -178,10 +178,14 @@ public:
        /// write content as something readable by Mathematica
        virtual void mathematica(MathematicaStream &) const;
        /// write content as something resembling MathML
-       virtual void mathmlize(MathMLStream &) const;
+       virtual void mathmlize(MathStream &) const;
        /// write content as something readable by Octave
        virtual void octave(OctaveStream &) const;
 
+       /// plain text output in ucs4 encoding
+       int plaintext(Buffer const &, odocstream &,
+                     OutputParams const &) const;
+
        /// dump content to stderr for debugging
        virtual void dump() const;
 
@@ -192,15 +196,24 @@ public:
        /// change type
        virtual void mutate(HullType /*newtype*/) {}
        /// usually the latex name
-       virtual std::string name() const;
+       virtual docstring name() const;
 
        /// math stuff usually isn't allowed in text mode
        virtual bool allowedIn(mode_type mode) const { return mode == MATH_MODE; }
+
+       /// superscript kerning
+       virtual int kerning() const { return 0; }
 };
 
+///
 std::ostream & operator<<(std::ostream &, MathAtom const &);
+///
+odocstream & operator<<(odocstream &, MathAtom const &);
 
 // initialize math
 void initMath();
 
+
+} // namespace lyx
+
 #endif