Fix empty width support for Box inset

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

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 4285e4ac44f12f68623e3887766c0de275d659aa..5571de0cf3a923242dcccacdcd24e7822057a4dc 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -64,10 +64,10 @@
 
 #include <boost/scoped_ptr.hpp>
 
-#include <sstream>
+#include <cstring>
 #include <iostream>
 #include <limits>
-#include <cstring>
+#include <sstream>
 
 using namespace std;
 using namespace lyx::support;
@@ -1527,14 +1527,13 @@ void Tabular::read(Lexer & lex)
 
        l_getline(is, line);
        if (!prefixIs(line, "<lyxtabular ") && !prefixIs(line, "<Tabular ")) {
-               LASSERT(false, /**/);
-               return;
+               LASSERT(false, return);
        }
 
        int version;
        if (!getTokenValue(line, "version", version))
                return;
-       LASSERT(version >= 2, /**/);
+       LATTEST(version >= 2);
 
        int rows_arg;
        if (!getTokenValue(line, "rows", rows_arg))
@@ -1867,8 +1866,8 @@ Tabular::idx_type Tabular::cellBelow(idx_type cell) const
 
 Tabular::idx_type Tabular::cellIndex(row_type row, col_type column) const
 {
-       LASSERT(column != npos && column < ncols()
-               && row != npos && row < nrows(), /**/);
+       LASSERT(column != npos && column < ncols(), column = 0);
+       LASSERT(row != npos && row < nrows(), row = 0);
        return cell_info[row][column].cellno;
 }
 
@@ -2099,14 +2098,14 @@ void Tabular::setRowDescent(row_type row, int height)
 
 int Tabular::rowAscent(row_type row) const
 {
-       LASSERT(row < nrows(), /**/);
+       LASSERT(row < nrows(), row = 0);
        return row_info[row].ascent;
 }
 
 
 int Tabular::rowDescent(row_type row) const
 {
-       LASSERT(row < nrows(), /**/);
+       LASSERT(row < nrows(), row = 0);
        return row_info[row].descent;
 }
 
@@ -2123,16 +2122,16 @@ int Tabular::height() const
 
 bool Tabular::isPartOfMultiColumn(row_type row, col_type column) const
 {
-       LASSERT(row < nrows(), /**/);
-       LASSERT(column < ncols(), /**/);
+       LASSERT(row < nrows(), return false);
+       LASSERT(column < ncols(), return false);
        return cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN;
 }
 
 
 bool Tabular::isPartOfMultiRow(row_type row, col_type column) const
 {
-       LASSERT(row < nrows(), /**/);
-       LASSERT(column < ncols(), /**/);
+       LASSERT(row < nrows(), return false);
+       LASSERT(column < ncols(), return false);
        return cell_info[row][column].multirow == CELL_PART_OF_MULTIROW;
 }
 
@@ -3086,7 +3085,7 @@ docstring Tabular::xhtml(XHTMLStream & xs, OutputParams const & runparams) const
 }
 
 
-bool Tabular::plaintextTopHLine(odocstream & os, row_type row,
+bool Tabular::plaintextTopHLine(odocstringstream & os, row_type row,
                                   vector<unsigned int> const & clen) const
 {
        idx_type const fcell = getFirstCellInRow(row);
@@ -3134,7 +3133,7 @@ bool Tabular::plaintextTopHLine(odocstream & os, row_type row,
 }
 
 
-bool Tabular::plaintextBottomHLine(odocstream & os, row_type row,
+bool Tabular::plaintextBottomHLine(odocstringstream & os, row_type row,
                                      vector<unsigned int> const & clen) const
 {
        idx_type const fcell = getFirstCellInRow(row);
@@ -3181,14 +3180,14 @@ bool Tabular::plaintextBottomHLine(odocstream & os, row_type row,
 }
 
 
-void Tabular::plaintextPrintCell(odocstream & os,
+void Tabular::plaintextPrintCell(odocstringstream & os,
                               OutputParams const & runparams,
                               idx_type cell, row_type row, col_type column,
                               vector<unsigned int> const & clen,
-                              bool onlydata) const
+                              bool onlydata, size_t max_length) const
 {
        odocstringstream sstr;
-       cellInset(cell)->plaintext(sstr, runparams);
+       cellInset(cell)->plaintext(sstr, runparams, max_length);
 
        if (onlydata) {
                os << sstr.str();
@@ -3231,9 +3230,9 @@ void Tabular::plaintextPrintCell(odocstream & os,
 }
 
 
-void Tabular::plaintext(odocstream & os,
+void Tabular::plaintext(odocstringstream & os,
                           OutputParams const & runparams, int const depth,
-                          bool onlydata, char_type delim) const
+                          bool onlydata, char_type delim, size_t max_length) const
 {
        // first calculate the width of the single columns
        vector<unsigned int> clen(ncols());
@@ -3247,7 +3246,7 @@ void Tabular::plaintext(odocstream & os,
                                if (isMultiColumn(cell))
                                        continue;
                                odocstringstream sstr;
-                               cellInset(cell)->plaintext(sstr, runparams);
+                               cellInset(cell)->plaintext(sstr, runparams, max_length);
                                if (clen[c] < sstr.str().length())
                                        clen[c] = sstr.str().length();
                        }
@@ -3259,7 +3258,7 @@ void Tabular::plaintext(odocstream & os,
                                if (cell_info[r][c].multicolumn != CELL_BEGIN_OF_MULTICOLUMN)
                                        continue;
                                odocstringstream sstr;
-                               cellInset(cell)->plaintext(sstr, runparams);
+                               cellInset(cell)->plaintext(sstr, runparams, max_length);
                                int len = int(sstr.str().length());
                                idx_type const n = columnSpan(cell);
                                for (col_type k = c; len > 0 && k < c + n - 1; ++k)
@@ -3280,8 +3279,10 @@ void Tabular::plaintext(odocstream & os,
                                // we don't use operator<< for single UCS4 character.
                                // see explanation in docstream.h
                                os.put(delim);
-                       plaintextPrintCell(os, runparams, cell, r, c, clen, onlydata);
+                       plaintextPrintCell(os, runparams, cell, r, c, clen, onlydata, max_length);
                        ++cell;
+                       if (os.str().size() > max_length)
+                               break;
                }
                os << endl;
                if (!onlydata) {
@@ -3289,6 +3290,8 @@ void Tabular::plaintext(odocstream & os,
                        if (plaintextBottomHLine(os, r, clen))
                                os << docstring(depth * 2, ' ');
                }
+               if (os.str().size() > max_length)
+                       break;
        }
 }
 
@@ -3476,6 +3479,13 @@ bool InsetTabular::insetAllowed(InsetCode code) const
 }
 
 
+bool InsetTabular::allowsCaptionVariation(std::string const & newtype) const
+{
+       return tabular.is_long_tabular &&
+               (newtype == "Standard" || newtype == "LongTableNoNumber");
+}
+
+
 void InsetTabular::write(ostream & os) const
 {
        os << "Tabular" << endl;
@@ -3545,10 +3555,7 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        //lyxerr << "InsetTabular::metrics: " << mi.base.bv << " width: " <<
        //      mi.base.textwidth << "\n";
-       if (!mi.base.bv) {
-               LYXERR0("need bv");
-               LASSERT(false, /**/);
-       }
+       LBUFERR(mi.base.bv);
 
        for (row_type r = 0; r < tabular.nrows(); ++r) {
                int maxasc = 0;
@@ -3888,13 +3895,13 @@ void InsetTabular::updateBuffer(ParIterator const & it, UpdateType utype)
 }
 
 
-void InsetTabular::addToToc(DocIterator const & cpit) const
+void InsetTabular::addToToc(DocIterator const & cpit, bool output_active) const
 {
        DocIterator dit = cpit;
        dit.forwardPos();
        size_t const end = dit.nargs();
        for ( ; dit.idx() < end; dit.top().forwardIdx())
-               cell(dit.idx())->addToToc(dit);
+               cell(dit.idx())->addToToc(dit, output_active);
 }
 
 
@@ -4318,7 +4325,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_CLIPBOARD_PASTE:
        case LFUN_PRIMARY_SELECTION_PASTE: {
                docstring const clip = (act == LFUN_CLIPBOARD_PASTE) ?
-                       theClipboard().getAsText() :
+                       theClipboard().getAsText(Clipboard::PlainTextType) :
                        theSelection().get();
                if (clip.empty())
                        break;
@@ -4954,11 +4961,12 @@ void InsetTabular::latex(otexstream & os, OutputParams const & runparams) const
 }
 
 
-int InsetTabular::plaintext(odocstream & os, OutputParams const & runparams) const
+int InsetTabular::plaintext(odocstringstream & os,
+        OutputParams const & runparams, size_t max_length) const
 {
        os << '\n'; // output table on a new line
        int const dp = runparams.linelen > 0 ? runparams.depth : 0;
-       tabular.plaintext(os, runparams, dp, false, 0);
+       tabular.plaintext(os, runparams, dp, false, 0, max_length);
        return PLAINTEXT_NEWLINE;
 }
 
@@ -5999,7 +6007,7 @@ bool InsetTabular::copySelection(Cursor & cur)
 
        odocstringstream os;
        OutputParams const runparams(0);
-       paste_tabular->plaintext(os, runparams, 0, true, '\t');
+       paste_tabular->plaintext(os, runparams, 0, true, '\t', INT_MAX);
        // Needed for the "Edit->Paste recent" menu and the system clipboard.
        cap::copySelection(cur, os.str());
 
@@ -6090,7 +6098,8 @@ void InsetTabular::cutSelection(Cursor & cur)
 
 bool InsetTabular::isRightToLeft(Cursor & cur) const
 {
-       LASSERT(cur.depth() > 1, /**/);
+       // LASSERT: It might be better to abandon this Buffer.
+       LASSERT(cur.depth() > 1, return false);
        Paragraph const & parentpar = cur[cur.depth() - 2].paragraph();
        pos_type const parentpos = cur[cur.depth() - 2].pos();
        return parentpar.getFontSettings(buffer().params(),