Allow row-breaking after some insets

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

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 73deb7fe2ded813523c7602f5b3a73069c5eb8be..2ee061445fb991103189e8ad129b53cd78fd1f55 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -44,7 +44,7 @@ class FuncStatus;
 class Lexer;
 class OutputParams;
 class Paragraph;
-class XHTMLStream;
+class XMLStream;
 
 
 ///
@@ -72,7 +72,7 @@ public:
        /// descending into insets
        docstring asString(bool intoInsets = true);
        ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        void addToToc(DocIterator const & di, bool output_active,
                                  UpdateType utype, TocBackend & backend) const;
@@ -573,7 +573,7 @@ public:
        ///
        int docbook(odocstream & os, OutputParams const &) const;
        ///
-       docstring xhtml(XHTMLStream & os, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        void plaintext(odocstringstream &,
                       OutputParams const & runparams, int const depth,
@@ -873,21 +873,24 @@ public:
        ///
        // helper function for Latex
        ///
-       void TeXTopHLine(otexstream &, row_type row, std::list<col_type>) const;
+       void TeXTopHLine(otexstream &, row_type row, std::list<col_type>,
+                        std::list<col_type>) const;
        ///
-       void TeXBottomHLine(otexstream &, row_type row, std::list<col_type>) const;
+       void TeXBottomHLine(otexstream &, row_type row, std::list<col_type>,
+                           std::list<col_type>) const;
        ///
        void TeXCellPreamble(otexstream &, idx_type cell, bool & ismulticol, bool & ismultirow,
                             bool const bidi) const;
        ///
        void TeXCellPostamble(otexstream &, idx_type cell, bool ismulticol, bool ismultirow) const;
        ///
-       void TeXLongtableHeaderFooter(otexstream &, OutputParams const &, std::list<col_type>) const;
+       void TeXLongtableHeaderFooter(otexstream &, OutputParams const &, std::list<col_type>,
+                                     std::list<col_type>) const;
        ///
        bool isValidRow(row_type const row) const;
        ///
        void TeXRow(otexstream &, row_type const row,
-                   OutputParams const &, std::list<col_type>) const;
+                   OutputParams const &, std::list<col_type>, std::list<col_type>) const;
        ///
        // helper functions for plain text
        ///
@@ -905,7 +908,7 @@ public:
        /// auxiliary function for docbook
        int docbookRow(odocstream & os, row_type, OutputParams const &) const;
        ///
-       docstring xhtmlRow(XHTMLStream & xs, row_type, OutputParams const &,
+       docstring xhtmlRow(XMLStream & xs, row_type, OutputParams const &,
                           bool header = false) const;
 
        /// change associated Buffer
@@ -969,7 +972,7 @@ public:
        //
        bool isTable() const { return true; }
        ///
-       DisplayType display() const;
+       RowFlags rowFlags() const;
        ///
        void latex(otexstream &, OutputParams const &) const;
        ///
@@ -978,7 +981,7 @@ public:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
@@ -1034,7 +1037,7 @@ public:
        /// can we go further down on mouse click?
        bool descendable(BufferView const &) const { return true; }
        /// Update the counters of this inset and of its contents
-       void updateBuffer(ParIterator const &, UpdateType);
+       void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false);
        ///
        void addToToc(DocIterator const & di, bool output_active,
                                  UpdateType utype, TocBackend & backend) const;