use FileName::isDirectory()

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

diff --git a/src/mathed/InsetMath.h b/src/mathed/InsetMath.h
index 0a4bfbc03f93ebe85525f636617405743565c7c6..3226d131114487c99ff80eeb346ca020b9854a24 100644 (file)
--- 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 {
@@ -63,14 +63,13 @@ class InsetMathGrid;
 class InsetMathHull;
 class InsetMathMatrix;
 class InsetMathNest;
-class InsetMathParbox;
 class InsetMathScript;
 class InsetMathString;
 class InsetMathSpace;
 class InsetMathSymbol;
 class InsetMathUnknown;
 
-class RefInset;
+class InsetMathRef;
 
 class NormalStream;
 class OctaveStream;
@@ -84,13 +83,13 @@ class InfoStream;
 class MathMacroTemplate;
 class MathMacro;
 class MathPosFinder;
-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 +103,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; }
@@ -132,7 +131,6 @@ public:
        virtual InsetMathMatrix const   * asMatrixInset() const   { return 0; }
        virtual InsetMathNest           * asNestInset()           { return 0; }
        virtual InsetMathNest const     * asNestInset() const     { return 0; }
-       virtual InsetMathParbox         * asParboxInset()         { return 0; }
        virtual InsetMathScript         * asScriptInset()         { return 0; }
        virtual InsetMathScript const   * asScriptInset() const   { return 0; }
        virtual InsetMathSpace          * asSpaceInset()          { return 0; }
@@ -142,7 +140,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; }
@@ -161,7 +159,7 @@ public:
        /// 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)
@@ -184,7 +182,7 @@ public:
 
        /// plain text output in ucs4 encoding
        int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const { return 0; };
+                     OutputParams const &) const;
 
        /// dump content to stderr for debugging
        virtual void dump() const;
@@ -195,11 +193,12 @@ public:
        virtual HullType getType() const;
        /// change type
        virtual void mutate(HullType /*newtype*/) {}
-       /// usually the latex name
-       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; }
 };
 
 ///