Fix some bugs in the bibinfo caching mechanism. Comments to follow.

[lyx.git] / src / insets / InsetTabular.h

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 7e0bc205a3bd0569b0e2df19e9da7ad45b44a6cb..96db31a934a7be437137145ef5374f3cf9f191e9 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -96,6 +96,8 @@ public:
                ///
                ALIGN_BLOCK,
                ///
+               ALIGN_DECIMAL,
+               ///
                VALIGN_TOP,
                ///
                VALIGN_BOTTOM,
@@ -190,6 +192,8 @@ public:
                ///
                LONGTABULAR_ALIGN_RIGHT,
                ///
+               SET_DECIMAL_POINT,
+               ///
                LAST_ACTION
        };
        ///
@@ -280,7 +284,7 @@ public:
 
        /* returns the maximum over all rows */
        ///
-       int columnWidth(idx_type cell) const;
+       int cellWidth(idx_type cell) const;
        ///
        int cellHeight(idx_type cell) const;
        ///
@@ -300,8 +304,6 @@ public:
        ///
        void setRowDescent(row_type row, int height);
        ///
-       void setCellWidth(idx_type cell, int new_width);
-       ///
        void setTopLine(idx_type cell, bool line);
        ///
        void setBottomLine(idx_type cell, bool line);
@@ -339,8 +341,6 @@ public:
        ///
        Length const getPWidth(idx_type cell) const;
        ///
-       int cellWidth(idx_type cell) const;
-       ///
        int textHOffset(idx_type cell) const;
        ///
        int textVOffset(idx_type cell) const;
@@ -490,6 +490,10 @@ public:
                LyXAlignment alignment;
                ///
                VAlignment valignment;
+               /// width of the part before the decimal
+               int decimal_hoffset;
+               /// width of the decimal part
+               int decimal_width;
                ///
                int voffset;
                ///
@@ -570,6 +574,8 @@ public:
                Length p_width;
                ///
                docstring align_special;
+               ///
+               docstring decimal_point;
        };
        ///
        typedef std::vector<ColumnData> column_vector;
@@ -614,8 +620,6 @@ public:
        void updateIndexes();
        ///
        bool setFixedWidth(row_type r, col_type c);
-       ///
-       void updateContentAlignment(row_type r, col_type c);
        /// return true of update is needed
        bool updateColumnWidths();
        ///
@@ -867,9 +871,9 @@ public:
        virtual bool usePlainLayout() const { return true; }
 
        ///
-       virtual InsetTabular * asInsetTabular() { return this; }
+       InsetTabular * asInsetTabular() { return this; }
        ///
-       virtual InsetTabular const * asInsetTabular() const { return this; }
+       InsetTabular const * asInsetTabular() const { return this; }
        ///
        bool isRightToLeft(Cursor & cur) const;
        /// writes the cells between stidx and enidx as a string, optionally
@@ -944,6 +948,9 @@ private:
 
 std::string const featureAsString(Tabular::Feature feature);
 
+/// Split cell on decimal symbol
+InsetTableCell splitCell(InsetTableCell & head, docstring const decimal_sym, bool & hassep);
+
 } // namespace lyx
 
 #endif // INSET_TABULAR_H