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 2b8b049a925fa23c6a3d3be007291ec1d550dbb7..96db31a934a7be437137145ef5374f3cf9f191e9 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -28,7 +28,7 @@
 #include "Layout.h"
 #include "Length.h"
 
-#include <boost/shared_ptr.hpp>
+#include "support/shared_ptr.h"
 
 #include <iosfwd>
 #include <vector>
@@ -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;
@@ -451,13 +451,13 @@ public:
        ///
        // end longtable support
        ///
-       boost::shared_ptr<InsetTableCell> cellInset(idx_type cell) const;
+       shared_ptr<InsetTableCell> cellInset(idx_type cell) const;
        ///
-       boost::shared_ptr<InsetTableCell> cellInset(row_type row,
+       shared_ptr<InsetTableCell> cellInset(row_type row,
                                                  col_type column) const;
        ///
        void setCellInset(row_type row, col_type column,
-                         boost::shared_ptr<InsetTableCell>) const;
+                         shared_ptr<InsetTableCell>) const;
        /// Search for \param inset in the tabular, with the
        ///
        void validate(LaTeXFeatures &) const;
@@ -483,12 +483,6 @@ public:
                ///
                int width;
                ///
-               int height;
-               ///
-               int ascent;
-               ///
-               int descent;
-               ///
                int multicolumn;
                ///
                int multirow;
@@ -496,6 +490,12 @@ 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;
                ///
                bool top_line;
                ///
@@ -513,7 +513,7 @@ public:
                ///
                Length p_width; // this is only set for multicolumn!!!
                ///
-               boost::shared_ptr<InsetTableCell> inset;
+               shared_ptr<InsetTableCell> inset;
        };
        CellData & cellInfo(idx_type cell) const;
        ///
@@ -555,10 +555,6 @@ public:
                bool newpage;
                /// caption
                bool caption;
-               ///
-               VAlignment valignment;
-               ///
-               int maxheight;
        };
        ///
        typedef std::vector<RowData> row_vector;
@@ -578,6 +574,8 @@ public:
                Length p_width;
                ///
                docstring align_special;
+               ///
+               docstring decimal_point;
        };
        ///
        typedef std::vector<ColumnData> column_vector;
@@ -622,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();
        ///
@@ -815,9 +811,9 @@ public:
        /// number of cells
        size_t nargs() const { return tabular.numberofcells; }
        ///
-       boost::shared_ptr<InsetTableCell const> cell(idx_type) const;
+       shared_ptr<InsetTableCell const> cell(idx_type) const;
        ///
-       boost::shared_ptr<InsetTableCell> cell(idx_type);
+       shared_ptr<InsetTableCell> cell(idx_type);
        ///
        Text * getText(int) const;
 
@@ -875,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
@@ -952,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