fix reading the author field.

[lyx.git] / src / tabular.C

diff --git a/src/tabular.C b/src/tabular.C
index 82fb4afb8ba5c4abde9b09204eff028a90aba816..b8957c2ba2a6723a7c369b3bb4d9120c75b78144 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -23,8 +23,8 @@
 #include "bufferparams.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
-#include "latexrunparams.h"
 #include "lyxlex.h"
+#include "outputparams.h"
 #include "paragraph.h"
 
 #include "insets/insettabular.h"
@@ -32,7 +32,7 @@
 #include "support/lstrings.h"
 #include "support/tostr.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using lyx::support::ltrim;
 using lyx::support::prefixIs;
@@ -241,9 +241,7 @@ bool getTokenValue(string const & str, const char * token, int & num)
 bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
 {
        string tmp;
-       if (!getTokenValue(str, token, tmp))
-               return false;
-       return string2type(tmp, num);
+       return getTokenValue(str, token, tmp) && string2type(tmp, num);
 }
 
 
@@ -251,9 +249,7 @@ bool getTokenValue(string const & str, const char * token,
                                   LyXTabular::VAlignment & num)
 {
        string tmp;
-       if (!getTokenValue(str, token, tmp))
-               return false;
-       return string2type(tmp, num);
+       return getTokenValue(str, token, tmp) && string2type(tmp, num);
 }
 
 
@@ -261,9 +257,7 @@ bool getTokenValue(string const & str, const char * token,
                                   LyXTabular::BoxType & num)
 {
        string tmp;
-       if (!getTokenValue(str, token, tmp))
-               return false;
-       return string2type(tmp, num);
+       return getTokenValue(str, token, tmp) && string2type(tmp, num);
 }
 
 
@@ -273,9 +267,7 @@ bool getTokenValue(string const & str, const char * token, bool & flag)
        // not in the file-format.
        flag = false;
        string tmp;
-       if (!getTokenValue(str, token, tmp))
-               return false;
-       return string2type(tmp, flag);
+       return getTokenValue(str, token, tmp) && string2type(tmp, flag);
 }
 
 
@@ -285,9 +277,7 @@ bool getTokenValue(string const & str, const char * token, LyXLength & len)
        // in the file format.
        len = LyXLength();
        string tmp;
-       if (!getTokenValue(str, token, tmp))
-               return false;
-       return isValidLength(tmp, &len);
+       return getTokenValue(str, token, tmp) && isValidLength(tmp, &len);
 }
 
 
@@ -387,7 +377,9 @@ void LyXTabular::fixCellNums()
        int cellno = 0;
        for (int i = 0; i < rows_; ++i) {
                for (int j = 0; j < columns_; ++j) {
-                       cell_info[i][j].inset.setDrawFrame(InsetText::LOCKED);
+                       // When debugging it can be nice to set
+                       // this to true.
+                       cell_info[i][j].inset.setDrawFrame(false);
                        cell_info[i][j].cellno = cellno++;
                }
                cell_info[i].back().right_line = true;
@@ -397,17 +389,6 @@ void LyXTabular::fixCellNums()
 }
 
 
-void LyXTabular::setOwner(InsetTabular * inset)
-{
-       for (int i = 0; i < rows_; ++i) {
-               for (int j = 0; j < columns_; ++j) {
-                       cell_info[i][j].inset.setOwner(inset);
-                       cell_info[i][j].inset.setDrawFrame(InsetText::LOCKED);
-               }
-       }
-}
-
-
 void LyXTabular::appendRow(BufferParams const & bp, int cell)
 {
        ++rows_;
@@ -1145,7 +1126,7 @@ void LyXTabular::write(Buffer const & buf, ostream & os) const
                           << ">\n";
                        os << "\\begin_inset ";
                        cell_info[i][j].inset.write(buf, os);
-                       os << "\n\\end_inset \n"
+                       os << "\n\\end_inset\n"
                           << "</cell>\n";
                }
                os << "</row>\n";
@@ -1397,7 +1378,7 @@ void LyXTabular::setMultiColumn(Buffer * buffer, int cell, int number)
        for (int i = 1; i < number; ++i) {
                cellstruct & cs1 = cellinfo_of_cell(cell + i);
                cs1.multicolumn = CELL_PART_OF_MULTICOLUMN;
-               cs.inset.appendParagraphs(buffer, cs1.inset.paragraphs);
+               cs.inset.appendParagraphs(buffer, cs1.inset.paragraphs());
                cs1.inset.clear(false);
        }
        set_row_column_number_info();
@@ -1702,8 +1683,7 @@ int LyXTabular::getAscentOfRow(int row) const
 
 int LyXTabular::getDescentOfRow(int row) const
 {
-       if (row >= rows_)
-               return 0;
+       BOOST_ASSERT(row < rows_);
        return row_info[row].descent_of_row;
 }
 
@@ -1720,16 +1700,16 @@ int LyXTabular::getHeightOfTabular() const
 
 bool LyXTabular::isPartOfMultiColumn(int row, int column) const
 {
-       if (row >= rows_ || column >= columns_)
-               return false;
+       BOOST_ASSERT(row < rows_);
+       BOOST_ASSERT(column < columns_);
        return cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN;
 }
 
 
 int LyXTabular::TeXTopHLine(ostream & os, int row) const
 {
-       if (row < 0 || row >= rows_)
-               return 0;
+       BOOST_ASSERT(row >= 0);
+       BOOST_ASSERT(row < rows_);
 
        int const fcell = getFirstCellInRow(row);
        int const n = numberOfCellsInRow(fcell) + fcell;
@@ -1905,7 +1885,7 @@ int LyXTabular::TeXCellPostamble(ostream & os, int cell) const
 
 
 int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const & buf,
-                                        LatexRunParams const & runparams) const
+                                        OutputParams const & runparams) const
 {
        if (!is_long_tabular)
                return 0;
@@ -2005,11 +1985,10 @@ bool LyXTabular::isValidRow(int row) const
 
 
 int LyXTabular::TeXRow(ostream & os, int i, Buffer const & buf,
-                      LatexRunParams const & runparams) const
+                      OutputParams const & runparams) const
 {
        int ret = 0;
        int cell = getCellNumber(i, 0);
-       BufferParams const & bufferparams = buf.params();
 
        ret += TeXTopHLine(os, i);
        for (int j = 0; j < columns_; ++j) {
@@ -2018,8 +1997,10 @@ int LyXTabular::TeXRow(ostream & os, int i, Buffer const & buf,
                ret += TeXCellPreamble(os, cell);
                InsetText & inset = getCellInset(cell);
 
-               bool rtl = inset.paragraphs.begin()->isRightToLeftPar(bufferparams) &&
-                       !inset.paragraphs.begin()->empty() && getPWidth(cell).zero();
+               Paragraph & par = inset.paragraphs().front();
+               bool rtl = par.isRightToLeftPar(buf.params())
+                       && !par.empty()
+                       && getPWidth(cell).zero();
 
                if (rtl)
                        os << "\\R{";
@@ -2042,7 +2023,7 @@ int LyXTabular::TeXRow(ostream & os, int i, Buffer const & buf,
 
 
 int LyXTabular::latex(Buffer const & buf, ostream & os,
-                     LatexRunParams const & runparams) const
+                     OutputParams const & runparams) const
 {
        int ret = 0;
 
@@ -2150,7 +2131,7 @@ int LyXTabular::latex(Buffer const & buf, ostream & os,
 
 
 int LyXTabular::linuxdoc(Buffer const & buf, ostream & os,
-                        const LatexRunParams & runparams) const
+                        const OutputParams & runparams) const
 {
        os << "<tabular ca=\"";
        for (int i = 0; i < columns_; ++i) {
@@ -2192,7 +2173,7 @@ int LyXTabular::linuxdoc(Buffer const & buf, ostream & os,
 
 
 int LyXTabular::docbookRow(Buffer const & buf, ostream & os, int row,
-                          LatexRunParams const & runparams) const
+                          OutputParams const & runparams) const
 {
        int ret = 0;
        int cell = getFirstCellInRow(row);
@@ -2234,7 +2215,7 @@ int LyXTabular::docbookRow(Buffer const & buf, ostream & os, int row,
                }
 
                os << '>';
-               LatexRunParams runp = runparams;
+               OutputParams runp = runparams;
                runp.mixed_content = true;
                ret += getCellInset(cell).docbook(buf, os, runp);
                os << "</entry>\n";
@@ -2246,7 +2227,7 @@ int LyXTabular::docbookRow(Buffer const & buf, ostream & os, int row,
 
 
 int LyXTabular::docbook(Buffer const & buf, ostream & os,
-                       LatexRunParams const & runparams) const
+                       OutputParams const & runparams) const
 {
        int ret = 0;
 
@@ -2270,7 +2251,10 @@ int LyXTabular::docbook(Buffer const & buf, ostream & os,
                        os << "center";
                        break;
                }
-               os << "\">\n";
+               os << '"';
+               if (runparams.flavor == OutputParams::XML)
+                       os << '/';
+               os << ">\n";
                ++ret;
        }
 
@@ -2357,7 +2341,8 @@ int LyXTabular::asciiTopHLine(ostream & os, int row,
                }
                int column = column_of_cell(i);
                int len = clen[column];
-               while (isPartOfMultiColumn(row, ++column))
+               while (column < columns_ - 1  
+                      && isPartOfMultiColumn(row, ++column))
                        len += clen[column] + 4;
                os << string(len, ch);
                if (topLine(i)) {
@@ -2404,7 +2389,8 @@ int LyXTabular::asciiBottomHLine(ostream & os, int row,
                }
                int column = column_of_cell(i);
                int len = clen[column];
-               while (isPartOfMultiColumn(row, ++column))
+               while (column < columns_ -1
+                      && isPartOfMultiColumn(row, ++column))
                        len += clen[column] + 4;
                os << string(len, ch);
                if (bottomLine(i)) {
@@ -2422,13 +2408,13 @@ int LyXTabular::asciiBottomHLine(ostream & os, int row,
 
 
 int LyXTabular::asciiPrintCell(Buffer const & buf, ostream & os,
-                              LatexRunParams const & runparams,
+                              OutputParams const & runparams,
                               int cell, int row, int column,
                               vector<unsigned int> const & clen,
                               bool onlydata) const
 {
        ostringstream sstr;
-       int ret = getCellInset(cell).ascii(buf, sstr, runparams);
+       int ret = getCellInset(cell).plaintext(buf, sstr, runparams);
 
        if (onlydata) {
                os << sstr.str();
@@ -2442,7 +2428,8 @@ int LyXTabular::asciiPrintCell(Buffer const & buf, ostream & os,
 
        unsigned int len1 = sstr.str().length();
        unsigned int len2 = clen[column];
-       while (isPartOfMultiColumn(row, ++column))
+       while (column < columns_ -1
+              && isPartOfMultiColumn(row, ++column))
                len2 += clen[column] + 4;
        len2 -= len1;
 
@@ -2472,8 +2459,8 @@ int LyXTabular::asciiPrintCell(Buffer const & buf, ostream & os,
 }
 
 
-int LyXTabular::ascii(Buffer const & buf, ostream & os,
-                     LatexRunParams const & runparams,
+int LyXTabular::plaintext(Buffer const & buf, ostream & os,
+                     OutputParams const & runparams,
                      int const depth,
                      bool onlydata, unsigned char delim) const
 {
@@ -2491,7 +2478,7 @@ int LyXTabular::ascii(Buffer const & buf, ostream & os,
                                if (isMultiColumnReal(cell))
                                        continue;
                                ostringstream sstr;
-                               getCellInset(cell).ascii(buf, sstr, runparams);
+                               getCellInset(cell).plaintext(buf, sstr, runparams);
                                if (clen[j] < sstr.str().length())
                                        clen[j] = sstr.str().length();
                        }
@@ -2503,7 +2490,7 @@ int LyXTabular::ascii(Buffer const & buf, ostream & os,
                                if (!isMultiColumnReal(cell) || isPartOfMultiColumn(i, j))
                                        continue;
                                ostringstream sstr;
-                               getCellInset(cell).ascii(buf, sstr, runparams);
+                               getCellInset(cell).plaintext(buf, sstr, runparams);
                                int len = int(sstr.str().length());
                                int const n = cells_in_multicolumn(cell);
                                for (int k = j; len > 0 && k < j + n - 1; ++k)
@@ -2552,12 +2539,12 @@ InsetText & LyXTabular::getCellInset(int row, int column) const
 }
 
 
-int LyXTabular::getCellFromInset(InsetOld const * inset) const
+int LyXTabular::getCellFromInset(InsetBase const * inset) const
 {
        // is this inset part of the tabular?
        if (!inset) {
                lyxerr << "Error: this is not a cell of the tabular!" << endl;
-               return -1;
+               BOOST_ASSERT(false);
        }
 
        for (int cell = 0, n = getNumberOfCells(); cell < n; ++cell)
@@ -2570,7 +2557,9 @@ int LyXTabular::getCellFromInset(InsetOld const * inset) const
        // We should have found a cell at this point
        lyxerr << "LyXTabular::getCellFromInset: Cell of inset "
                << inset << " not found!" << endl;
-       return -1;
+       BOOST_ASSERT(false);
+       // shut up compiler
+       return 0;
 }
 
 
@@ -2601,7 +2590,7 @@ void LyXTabular::getLabelList(Buffer const & buffer,
 
 LyXTabular::BoxType LyXTabular::useParbox(int cell) const
 {
-       ParagraphList const & parlist = getCellInset(cell).paragraphs;
+       ParagraphList const & parlist = getCellInset(cell).paragraphs();
        ParagraphList::const_iterator cit = parlist.begin();
        ParagraphList::const_iterator end = parlist.end();