Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_hullinset.h b/src/mathed/math_hullinset.h
index fc2aa5ec754cf64b32e7c986381efcac6d1da49b..63e580f1052c497820f1464104e4b4e3cfd43478 100644 (file)
--- a/src/mathed/math_hullinset.h
+++ b/src/mathed/math_hullinset.h
@@ -4,12 +4,11 @@
 
 #include "math_gridinset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** This provides an interface between "LyX insets" and "LyX math insets"
  *  \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 class LaTeXFeatures;
@@ -21,12 +20,10 @@ public:
        ///
        explicit MathHullInset(string const & type);
        ///
-       MathHullInset(string const & type, MathGridInset const & grid);
-       ///
-       MathHullInset(string const & type, col_type cols);
-       ///
        MathInset * clone() const;
        ///
+       mode_type currentMode() const;
+       ///
        void metrics(MathMetricsInfo & mi) const;
        ///
        void draw(MathPainterInfo &, int x, int y) const;
@@ -48,8 +45,10 @@ public:
        bool display() const;
        ///
        bool ams() const;
+       /// local dispatcher
+       dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
        ///
-       std::vector<string> const getLabelList() const;
+       void getLabelList(std::vector<string> &) const;
        ///
        void validate(LaTeXFeatures & features) const;
        /// identifies MatrixInsets
@@ -57,14 +56,14 @@ public:
        /// identifies HullInset
        MathHullInset * asHullInset() { return this; }
 
-       ///
-       void addRow(row_type);
-       ///
-       void delRow(row_type);
-       ///
-       void addFancyCol(col_type);
-       ///
-       void delFancyCol(col_type);
+       /// add a row
+       void addRow(row_type row);
+       /// delete a row
+       void delRow(row_type row);
+       /// add a column
+       void addCol(col_type col);
+       /// delete a column
+       void delCol(col_type col);
 
        /// get type
        string const & getType() const;
@@ -89,6 +88,10 @@ public:
        ///
        void infoize(std::ostream & os) const;
 
+protected:
+       ///
+       string eolString(row_type row, bool fragile) const;
+
 private:
        ///
        void setType(string const & type);
@@ -101,13 +104,17 @@ private:
        ///
        string nicelabel(row_type row) const;
        ///
+       void doExtern(FuncRequest const & func, idx_type & idx, pos_type & pos);
+       ///
        void glueall();
        ///
        char const * standardFont() const;
        /// consistency check
        void check() const;
+       /// can this change its number of cols?
+       bool colChangeOK() const;
 
-       /// "simple", "display", "eqnarray",...
+       /// "none", "simple", "display", "eqnarray",...
        string type_;
        ///
        std::vector<int> nonum_;
@@ -115,25 +122,4 @@ private:
        std::vector<string> label_;
 };
 
-
-class MathParInset : public MathHullInset {
-public:
-       ///
-       MathParInset();
-       ///
-       MathParInset * asParInset() { return this; }
-       ///
-       void metrics(MathMetricsInfo & mi) const;
-       ///
-       void draw(MathPainterInfo &, int x, int y) const;
-       ///
-       void infoize(std::ostream & os) const;
-       ///
-       void write(WriteStream & os) const;
-private:
-       ///
-       void rebreak();
-};
-
-
 #endif