architectural changes to tex2lyx

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

diff --git a/src/mathed/math_inset.h b/src/mathed/math_inset.h
index 19ebb970c82b156e75be5d27d0e54c3e07a069de..b5e5d20f6ae6ca7025f80bfbd1ba45028aa21b7a 100644 (file)
--- a/src/mathed/math_inset.h
+++ b/src/mathed/math_inset.h
@@ -16,19 +16,13 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
-//  Note: These math insets are internal to Math and are not derived
-//        from lyx inset.
-
 #ifndef MATH_INSET_H
 #define MATH_INSET_H
 
-
 #include <config.h>
 
 #include "LString.h"
-#include "frontends/mouse_state.h"
 #include "insets/insetbase.h"
-#include "math_data.h"
 
 /**
 
@@ -38,8 +32,8 @@ the math objects.
 
 Math insets do not know there parents, a cursor position or things
 like that. The are dumb object that are contained in other math insets
-(mathNestInsets, in fact) thus forming a tree. The root of this tree is
-always a mathHullInset, which provides an interface to the Outer World by
+(MathNestInsets, in fact) thus forming a tree. The root of this tree is
+always a MathHullInset, which provides an interface to the Outer World by
 inclusion in the "real LyX insets" FormulaInset and FormulaMacroInset.
 
 */
@@ -49,9 +43,9 @@ class MathArrayInset;
 class MathAMSArrayInset;
 class MathCharInset;
 class MathDelimInset;
-class MathGridInset;
 class MathFracInset;
 class MathFontInset;
+class MathGridInset;
 class MathHullInset;
 class MathMatrixInset;
 class MathNestInset;
@@ -64,6 +58,9 @@ class MathUnknownInset;
 
 class RefInset;
 
+class MathArray;
+class MathAtom;
+
 class NormalStream;
 class OctaveStream;
 class MapleStream;
@@ -72,62 +69,34 @@ class MathematicaStream;
 class MathMLStream;
 class WriteStream;
 class InfoStream;
-class MathArray;
 
-class LaTeXFeatures;
 class BufferView;
 class UpdatableInset;
 class MathMacroTemplate;
+class MathMacro;
 class MathPosFinder;
 class Dimension;
 class FuncRequest;
+class TextPainter;
+class TextMetricsInfo;
+class ReplaceData;
 
 
 class MathInset : public InsetBase {
 public:
-       /// short of anything else reasonable
-       typedef MathArray::size_type        size_type;
-       /// type for cursor positions differences within a cell
-       typedef MathArray::difference_type  difference_type;
-       /// type for cursor positions within a cell
-       typedef MathArray::size_type        pos_type;
-       /// type for cell indices
-       typedef size_type                   idx_type;
-       /// type for row numbers
-       typedef size_type                   row_type;
-       /// type for column numbers
-       typedef size_type                   col_type;
-
        /// our members behave nicely...
        MathInset() {}
 
-       /// reproduce itself
-       virtual MathInset * clone() const = 0;
        /// substitutes macro arguments if necessary
        virtual void substitute(MathMacro const & macro);
-       /// compute the size of the object, sets ascend_, descend_ and width_
-       // updates the (xo,yo)-caches of all contained cells
-       virtual void metrics(MetricsInfo & mi) const;
-       /// draw the object
-       virtual void draw(PainterInfo & pi, int x, int y) const;
        /// draw selection between two positions
        virtual void drawSelection(PainterInfo & pi,
                idx_type idx1, pos_type pos1, idx_type idx2, pos_type pos2) const;
        /// the ascent of the inset above the baseline
        /// compute the size of the object for text based drawing
-       virtual void metricsT(TextMetricsInfo const & st) const;
+       virtual void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        /// draw the object as text
        virtual void drawT(TextPainter &, int x, int y) const;
-       /// the ascent of the inset above the baseline
-       virtual int ascent() const { return 1; }
-       /// the descent of the inset below the baseline
-       virtual int descent() const { return 1; }
-       /// total width
-       virtual int width() const { return 2; }
-       /// all in one batch
-       virtual Dimension dimensions() const;
-       /// total height (== ascent + descent)
-       virtual int height() const;
 
        /// Where should we go when we press the up or down cursor key?
        virtual bool idxUpDown(idx_type & idx, pos_type & pos, bool up,
@@ -241,11 +210,6 @@ public:
        /// identifies things that can get \limits or \nolimits
        virtual bool takesLimits() const { return false; }
 
-       ///
-       virtual void edit(BufferView *, int, int, mouse_button::state) {}
-
-       /// request "external features"
-       virtual void validate(LaTeXFeatures &) const {}
        /// char char code if possible
        virtual void handleFont(string const &) {}
        /// is this inset equal to a given other inset?
@@ -289,9 +253,6 @@ public:
        /// dump content to stderr for debugging
        virtual void dump() const;
 
-       /// LyXInset stuff
-       /// write labels into a list
-       virtual void getLabelList(std::vector<string> &) const {}
        /// LyXInset stuff
        virtual bool numberedType() const { return false; }
        /// hull type
@@ -310,11 +271,6 @@ protected:
 
 std::ostream & operator<<(std::ostream &, MathAtom const &);
 
-// converts single cell to string
-string asString(MathArray const & ar);
-// converts string to single cell
-MathArray asArray(string const & str);
-
 // initialize math
 void initMath();