Fix display and export of some latex macros

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

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 6199b7dafc8fef516acaa7934f8e8298dab0ce79..de5b64507c9c8fe34195c1e79eaad618911d4a19 100644 (file)
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -44,13 +44,6 @@ public:
                Multicolumn multi_;
                /// special multi colums alignment
                docstring align_;
-               /// these should be a per-cell property, but ok to have it here
-               /// for single-column grids like paragraphs
-               mutable int glue_;
-               ///
-               mutable pos_type begin_;
-               ///
-               mutable pos_type end_;
        };
 
        /// additional per-row information
@@ -154,6 +147,8 @@ public:
        InsetMathGrid * asGridInset() { return this; }
        /// identifies GridInset
        InsetMathGrid const * asGridInset() const { return this; }
+       //
+       bool isTable() const { return true; }
        ///
        col_type ncols() const;
        ///
@@ -237,6 +232,8 @@ public:
        ///
        void htmlize(HtmlStream &, std::string attrib) const;
        ///
+       void validate(LaTeXFeatures & features) const;
+       ///
        //void octave(OctaveStream &) const;
 
 protected:
@@ -258,11 +255,19 @@ protected:
        virtual docstring eocString(col_type col, col_type lastcol) const;
        /// splits cells and shifts right part to the next cell
        void splitCell(Cursor & cur);
-       /// Column alignment for display of cell \p idx.\r
+       /// Column alignment for display of cell \p idx.
        /// Must not be written to file!
        virtual char displayColAlign(idx_type idx) const;
-       /// The value of a fixed col align for a certain hull type \r
-       static char colAlign(HullType type, col_type col);\r
+       /// Column spacing for display of column \p col.
+       /// Must not be written to file!
+       virtual int displayColSpace(col_type col) const;
+
+       // The following two functions are used in InsetMathHull and
+       // InsetMathSplit.
+       /// The value of a fixed col align for a certain hull type 
+       static char colAlign(HullType type, col_type col);
+       /// The value of a fixed col spacing for a certain hull type
+       static int colSpace(HullType type, col_type col);
 
        /// row info.
        /// rowinfo_[nrows()] is a dummy row used only for hlines.