Try again to fix Kornel's slowness problem. The previous attempt was

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

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index fb6edfb98965e9d43953d25ad51b451a9de64489..7ff533be998e4f978b16d500c3e9cb95c3a39434 100644 (file)
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -73,8 +73,6 @@ public:
                ColInfo();
                /// currently possible: 'l', 'c', 'r'
                char align_;
-               /// cache for drawing
-               int h_offset;
                /// cached width
                mutable int width_;
                /// cached offset
@@ -92,11 +90,12 @@ public:
 
 public:
        /// sets nrows and ncols to 1, vertical alingment to 'c'
-       InsetMathGrid();
+       InsetMathGrid(Buffer * buf);
        /// Note: columns first!
-       InsetMathGrid(col_type m, row_type n);
+       InsetMathGrid(Buffer * buf, col_type m, row_type n);
        ///
-       InsetMathGrid(col_type m, row_type n, char valign, docstring const & halign);
+       InsetMathGrid(Buffer * buf, col_type m, row_type n, char valign,
+               docstring const & halign);
        ///
        void metrics(MetricsInfo & mi, Dimension &) const;
        ///
@@ -111,6 +110,8 @@ public:
        void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter & pi, int x, int y) const;
+       ///
+       void updateBuffer(ParIterator const &, UpdateType);
        /// extract number of columns from alignment string
        static col_type guessColumns(docstring const & halign);
        /// accepts some LaTeX column codes: p,m,!,@,M,<,>
@@ -184,8 +185,6 @@ public:
        /// swap two columns
        virtual void swapCol(col_type c);
        ///
-       virtual void appendRow();
-       ///
        idx_type index(row_type r, col_type c) const;
        ///
        bool idxBetween(idx_type idx, idx_type from, idx_type to) const;
@@ -195,6 +194,8 @@ public:
        virtual char defaultColAlign(col_type) { return 'c'; }
        ///
        void setDefaults();
+       ///
+       virtual bool interpretString(Cursor & cur, docstring const & str);
 
        ///
        virtual int colsep() const;
@@ -219,6 +220,10 @@ public:
        //void maple(MapleStream &) const;
        ///
        void mathmlize(MathStream &) const;
+       /// 
+       void htmlize(HtmlStream &) const;
+       ///
+       void htmlize(HtmlStream &, std::string attrib) const;
        ///
        //void octave(OctaveStream &) const;
 
@@ -233,12 +238,16 @@ protected:
        /// returns y offset of cell compared to inset
        int cellYOffset(idx_type idx) const;
        /// returns proper 'end of line' code for LaTeX
-       virtual docstring eolString(row_type row, bool emptyline,
-                                     bool fragile) const;
+       virtual docstring eolString(row_type row, bool fragile, bool latex,
+                       bool last_eoln) const;
        /// returns proper 'end of column' code for LaTeX
        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 aligmment for display of cell at (\p row, \p col).
+       /// Must not be written to file!
+       virtual char displayColAlign(col_type col, row_type) const { return colinfo_[col].align_; }
+
 
        /// row info.
        /// rowinfo_[nrows()] is a dummy row used only for hlines.