X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMath.h;h=87cf74ef950639b8dfcb5500eaa3b6f823bbfba1;hb=fc6ce7cd08562fd7bab4427880b46390bb7d2f07;hp=a08734589d984e8acdb0da31993ba58018a933dc;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index a08734589d..87cf74ef95 100644
--- a/src/mathed/InsetMath.h
+++ b/src/mathed/InsetMath.h
@@ -15,7 +15,7 @@
 
 #include "MathData.h"
 
-#include "insets/insetbase.h"
+#include "insets/Inset.h"
 
 
 namespace lyx {
@@ -34,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);
 
 /**
 
@@ -70,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; }
@@ -105,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; }
@@ -143,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; }
@@ -153,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)
@@ -179,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;
 
@@ -193,10 +196,13 @@ 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; }
 };
 
 ///