-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 2000-2001 The LyX Team.
+/**
+ * \file tabular.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * @author: Jürgen Vigna
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ * \author José Matos
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
*
- * ======================================================
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <algorithm>
-#include <cstdlib>
-
#include "tabular.h"
-#include "debug.h"
-#include "vspace.h"
-#include "layout.h"
-#include "lyx_gui_misc.h"
+
#include "buffer.h"
-#include "BufferView.h"
-#include "Painter.h"
+#include "bufferparams.h"
+#include "debug.h"
#include "LaTeXFeatures.h"
-#include "support/lstrings.h"
-#include "support/lyxmanip.h"
+#include "lyxlex.h"
+#include "outputparams.h"
+#include "paragraph.h"
+
#include "insets/insettabular.h"
-#include "insets/insettext.h"
-#include "gettext.h"
-using std::ostream;
-using std::istream;
+#include "support/lstrings.h"
+#include "support/convert.h"
+
+#include <sstream>
+
+using lyx::support::ltrim;
+using lyx::support::prefixIs;
+using lyx::support::rtrim;
+using lyx::support::suffixIs;
+
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
+
+using std::abs;
+using std::endl;
using std::getline;
using std::max;
-using std::endl;
+
+using std::istream;
+using std::ostream;
+using std::ostringstream;
using std::vector;
+using std::string;
+
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
+
namespace {
- int const WIDTH_OF_LINE = 5;
+int const WIDTH_OF_LINE = 5;
-} // namespace
+template <class T>
+string const write_attribute(string const & name, T const & t)
+{
+ string const s = tostr(t);
+ return s.empty() ? s : " " + name + "=\"" + s + "\"";
+}
-/// Define a few methods for the inner structs
+template <>
+string const write_attribute(string const & name, string const & t)
+{
+ return t.empty() ? t : " " + name + "=\"" + t + "\"";
+}
-LyXTabular::cellstruct::cellstruct()
-{
- cellno = 0;
- width_of_cell = 0;
- multicolumn = LyXTabular::CELL_NORMAL;
- alignment = LYX_ALIGN_CENTER;
- valignment = LYX_VALIGN_TOP;
- top_line = true;
- bottom_line = false;
- left_line = true;
- right_line = false;
- usebox = BOX_NONE;
- rotate = false;
+
+template <>
+string const write_attribute(string const & name, bool const & b)
+{
+ // we write only true attribute values so we remove a bit of the
+ // file format bloat for tabulars.
+ return b ? write_attribute(name, convert<string>(b)) : string();
}
-LyXTabular::rowstruct::rowstruct()
+template <>
+string const write_attribute(string const & name, int const & i)
{
- top_line = true;
- bottom_line = false;
- ascent_of_row = 0;
- descent_of_row = 0;
- newpage = false;
+ // we write only true attribute values so we remove a bit of the
+ // file format bloat for tabulars.
+ return i ? write_attribute(name, convert<string>(i)) : string();
}
-LyXTabular::columnstruct::columnstruct()
+template <>
+string const write_attribute(string const & name, LyXTabular::idx_type const & i)
{
- left_line = true;
- right_line = false;
- alignment = LYX_ALIGN_CENTER;
- valignment = LYX_VALIGN_TOP;
- width_of_column = 0;
+ // we write only true attribute values so we remove a bit of the
+ // file format bloat for tabulars.
+ return i ? write_attribute(name, convert<string>(i)) : string();
}
-/* konstruktor */
-LyXTabular::LyXTabular(InsetTabular * inset, int rows_arg, int columns_arg)
+template <>
+string const write_attribute(string const & name, LyXLength const & value)
{
- owner_ = inset;
- Init(rows_arg, columns_arg);
+ // we write only the value if we really have one same reson as above.
+ return value.zero() ? string() : write_attribute(name, value.asString());
}
-LyXTabular::LyXTabular(InsetTabular * inset, LyXTabular const & lt)
+string const tostr(LyXAlignment const & num)
{
- owner_ = inset;
- Init(lt.rows_, lt.columns_, <);
-#if 0
-#ifdef WITH_WARNINGS
-#warning Jürgen, can you make it the other way round. So that copy assignment depends on the copy constructor and not the other way. (Lgb)
-#endif
- operator=(lt);
-#endif
+ switch (num) {
+ case LYX_ALIGN_NONE:
+ return "none";
+ case LYX_ALIGN_BLOCK:
+ return "block";
+ case LYX_ALIGN_LEFT:
+ return "left";
+ case LYX_ALIGN_CENTER:
+ return "center";
+ case LYX_ALIGN_RIGHT:
+ return "right";
+ case LYX_ALIGN_LAYOUT:
+ return "layout";
+ case LYX_ALIGN_SPECIAL:
+ return "special";
+ }
+ return string();
}
-LyXTabular::LyXTabular(Buffer const * buf, InsetTabular * inset, LyXLex & lex)
+string const tostr(LyXTabular::VAlignment const & num)
{
- owner_ = inset;
- Read(buf, lex);
+ switch (num) {
+ case LyXTabular::LYX_VALIGN_TOP:
+ return "top";
+ case LyXTabular::LYX_VALIGN_MIDDLE:
+ return "middle";
+ case LyXTabular::LYX_VALIGN_BOTTOM:
+ return "bottom";
+ }
+ return string();
}
-LyXTabular & LyXTabular::operator=(LyXTabular const & lt)
+string const tostr(LyXTabular::BoxType const & num)
{
-#if 0
-#warning This while method should look like this: (Lgb)
+ switch (num) {
+ case LyXTabular::BOX_NONE:
+ return "none";
+ case LyXTabular::BOX_PARBOX:
+ return "parbox";
+ case LyXTabular::BOX_MINIPAGE:
+ return "minipage";
+ }
+ return string();
+}
- LyXTabular tmp(lt);
- tmp.swap(*this);
-#else
- // If this and lt is not of the same size we have a serious bug
- // So then it is ok to throw an exception, or for now
- // call abort()
- lyx::Assert(rows_ == lt.rows_ && columns_ == lt.columns_);
- cell_info = lt.cell_info;
- row_info = lt.row_info;
- column_info = lt.column_info;
+// I would have liked a fromstr template a lot better. (Lgb)
+bool string2type(string const str, LyXAlignment & num)
+{
+ if (str == "none")
+ num = LYX_ALIGN_NONE;
+ else if (str == "block")
+ num = LYX_ALIGN_BLOCK;
+ else if (str == "left")
+ num = LYX_ALIGN_LEFT;
+ else if (str == "center")
+ num = LYX_ALIGN_CENTER;
+ else if (str == "right")
+ num = LYX_ALIGN_RIGHT;
+ else
+ return false;
+ return true;
+}
- // long tabular stuff
- SetLongTabular(lt.is_long_tabular);
- endhead = lt.endhead;
- endfoot = lt.endfoot;
- endfirsthead = lt.endfirsthead;
- endlastfoot = lt.endlastfoot;
- rotate = lt.rotate;
+bool string2type(string const str, LyXTabular::VAlignment & num)
+{
+ if (str == "top")
+ num = LyXTabular::LYX_VALIGN_TOP;
+ else if (str == "middle" )
+ num = LyXTabular::LYX_VALIGN_MIDDLE;
+ else if (str == "bottom")
+ num = LyXTabular::LYX_VALIGN_BOTTOM;
+ else
+ return false;
+ return true;
+}
- Reinit();
-#endif
- return *this;
+
+bool string2type(string const str, LyXTabular::BoxType & num)
+{
+ if (str == "none")
+ num = LyXTabular::BOX_NONE;
+ else if (str == "parbox")
+ num = LyXTabular::BOX_PARBOX;
+ else if (str == "minipage")
+ num = LyXTabular::BOX_MINIPAGE;
+ else
+ return false;
+ return true;
}
-LyXTabular * LyXTabular::Clone(InsetTabular * inset)
+bool string2type(string const str, bool & num)
{
- LyXTabular * result = new LyXTabular(inset, *this);
-#if 0
- // don't know if this is good but I need to Clone also
- // the text-insets here, this is for the Undo-facility!
- for (int i = 0; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
- result->cell_info[i][j].inset = cell_info[i][j].inset;
- result->cell_info[i][j].inset.setOwner(inset);
- }
+ if (str == "true")
+ num = true;
+ else if (str == "false")
+ num = false;
+ else
+ return false;
+ return true;
+}
+
+
+bool getTokenValue(string const & str, char const * token, string & ret)
+{
+ ret.erase();
+ size_t token_length = strlen(token);
+ string::size_type pos = str.find(token);
+
+ if (pos == string::npos || pos + token_length + 1 >= str.length()
+ || str[pos + token_length] != '=')
+ return false;
+ pos += token_length + 1;
+ char ch = str[pos];
+ if (ch != '"' && ch != '\'') { // only read till next space
+ ret += ch;
+ ch = ' ';
}
-#endif
- return result;
+ while (pos < str.length() - 1 && str[++pos] != ch)
+ ret += str[pos];
+
+ return true;
}
-/* activates all lines and sets all widths to 0 */
-void LyXTabular::Init(int rows_arg, int columns_arg, LyXTabular const * lt)
+bool getTokenValue(string const & str, char const * token, int & num)
{
- rows_ = rows_arg;
- columns_ = columns_arg;
- row_info = row_vector(rows_, rowstruct());
- column_info = column_vector(columns_, columnstruct());
- cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct()));
+ string tmp;
+ num = 0;
+ if (!getTokenValue(str, token, tmp))
+ return false;
+ num = convert<int>(tmp);
+ return true;
+}
- if (lt) {
- operator=(*lt);
- return;
+
+bool getTokenValue(string const & str, char const * token, LyXAlignment & num)
+{
+ string tmp;
+ return getTokenValue(str, token, tmp) && string2type(tmp, num);
+}
+
+
+bool getTokenValue(string const & str, char const * token,
+ LyXTabular::VAlignment & num)
+{
+ string tmp;
+ return getTokenValue(str, token, tmp) && string2type(tmp, num);
+}
+
+
+bool getTokenValue(string const & str, char const * token,
+ LyXTabular::BoxType & num)
+{
+ string tmp;
+ return getTokenValue(str, token, tmp) && string2type(tmp, num);
+}
+
+
+bool getTokenValue(string const & str, char const * token, bool & flag)
+{
+ // set the flag always to false as this should be the default for bools
+ // not in the file-format.
+ flag = false;
+ string tmp;
+ return getTokenValue(str, token, tmp) && string2type(tmp, flag);
+}
+
+
+bool getTokenValue(string const & str, char const * token, LyXLength & len)
+{
+ // set the lenght to be zero() as default as this it should be if not
+ // in the file format.
+ len = LyXLength();
+ string tmp;
+ return getTokenValue(str, token, tmp) && isValidLength(tmp, &len);
+}
+
+
+void l_getline(istream & is, string & str)
+{
+ str.erase();
+ while (str.empty()) {
+ getline(is, str);
+ if (!str.empty() && str[str.length() - 1] == '\r')
+ str.erase(str.length() - 1);
}
+}
- int cellno = 0;
- for (int i = 0; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
- cell_info[i][j].inset.setOwner(owner_);
- cell_info[i][j].inset.SetDrawFrame(0, InsetText::LOCKED);
- cell_info[i][j].cellno = cellno++;
- }
+} // namespace
+
+/// Define a few methods for the inner structs
+
+LyXTabular::cellstruct::cellstruct(BufferParams const & bp)
+ : cellno(0),
+ width_of_cell(0),
+ multicolumn(LyXTabular::CELL_NORMAL),
+ alignment(LYX_ALIGN_CENTER),
+ valignment(LYX_VALIGN_TOP),
+ top_line(true),
+ bottom_line(false),
+ left_line(true),
+ right_line(false),
+ usebox(BOX_NONE),
+ rotate(false),
+ inset(new InsetText(bp))
+{}
+
+
+LyXTabular::cellstruct::cellstruct(cellstruct const & cs)
+ : cellno(cs.cellno),
+ width_of_cell(cs.width_of_cell),
+ multicolumn(cs.multicolumn),
+ alignment(cs.alignment),
+ valignment(cs.valignment),
+ top_line(cs.top_line),
+ bottom_line(cs.bottom_line),
+ left_line(cs.left_line),
+ right_line(cs.right_line),
+ usebox(cs.usebox),
+ rotate(cs.rotate),
+ align_special(cs.align_special),
+ p_width(cs.p_width),
+ inset(dynamic_cast<InsetText*>(cs.inset->clone().release()))
+{}
+
+
+LyXTabular::cellstruct &
+LyXTabular::cellstruct::operator=(cellstruct cs)
+{
+ swap(cs);
+ return *this;
+}
+
+
+void
+LyXTabular::cellstruct::swap(cellstruct & rhs)
+{
+ std::swap(cellno, rhs.cellno);
+ std::swap(width_of_cell, rhs.width_of_cell);
+ std::swap(multicolumn, rhs.multicolumn);
+ std::swap(alignment, rhs.alignment);
+ std::swap(valignment, rhs.valignment);
+ std::swap(top_line, rhs.top_line);
+ std::swap(bottom_line, rhs.bottom_line);
+ std::swap(left_line, rhs.left_line);
+ std::swap(right_line, rhs.right_line);
+ std::swap(usebox, rhs.usebox);
+ std::swap(rotate, rhs.rotate);
+ std::swap(align_special, rhs.align_special);
+ p_width.swap(rhs.p_width);
+ inset.swap(rhs.inset);
+}
+
+
+LyXTabular::rowstruct::rowstruct()
+ : ascent_of_row(0),
+ descent_of_row(0),
+ top_line(true),
+ bottom_line(false),
+ endhead(false),
+ endfirsthead(false),
+ endfoot(false),
+ endlastfoot(false),
+ newpage(false)
+{}
+
+
+LyXTabular::columnstruct::columnstruct()
+ : alignment(LYX_ALIGN_CENTER),
+ valignment(LYX_VALIGN_TOP),
+ left_line(true),
+ right_line(false),
+ width_of_column(0)
+{
+}
+
+
+LyXTabular::ltType::ltType()
+ : topDL(false),
+ bottomDL(false),
+ empty(false)
+{}
+
+
+LyXTabular::LyXTabular(BufferParams const & bp, row_type rows_arg,
+ col_type columns_arg)
+{
+ init(bp, rows_arg, columns_arg);
+}
+
+
+// activates all lines and sets all widths to 0
+void LyXTabular::init(BufferParams const & bp, row_type rows_arg,
+ col_type columns_arg)
+{
+ rows_ = rows_arg;
+ columns_ = columns_arg;
+ row_info = row_vector(rows_);
+ column_info = column_vector(columns_);
+ cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct(bp)));
+ row_info.reserve(10);
+ column_info.reserve(10);
+ cell_info.reserve(100);
+ fixCellNums();
+ for (row_type i = 0; i < rows_; ++i)
cell_info[i].back().right_line = true;
- }
row_info.back().bottom_line = true;
row_info.front().bottom_line = true;
+ column_info.back().right_line = true;
+ is_long_tabular = false;
+ rotate = false;
+}
- for (int i = 0; i < columns_; ++i) {
- calculate_width_of_column(i);
+
+void LyXTabular::fixCellNums()
+{
+ idx_type cellno = 0;
+ for (row_type i = 0; i < rows_; ++i) {
+ for (col_type j = 0; j < columns_; ++j) {
+ // 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;
}
- column_info.back().right_line = true;
-
- calculate_width_of_tabular();
- rowofcell = vector<int>();
- columnofcell = vector<int>();
set_row_column_number_info();
- is_long_tabular = false;
- rotate = false;
- endhead = 0;
- endfirsthead = 0;
- endfoot = 0;
- endlastfoot = 0;
}
-void LyXTabular::AppendRow(int cell)
+void LyXTabular::appendRow(BufferParams const & bp, idx_type const cell)
{
++rows_;
-
- int row = row_of_cell(cell);
+
+ row_type const row = row_of_cell(cell);
row_vector::iterator rit = row_info.begin() + row;
row_info.insert(rit, rowstruct());
// now set the values of the row before
- row_info[row] = row_info[row+1];
-
-#if 0
- cell_vvector::iterator cit = cell_info.begin() + row;
- cell_info.insert(cit, vector<cellstruct>(columns_, cellstruct()));
-#else
- cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
- cellstruct()));
-
- for (int i = 0; i <= row; ++i) {
- for (int j = 0; j < columns_; ++j) {
- c_info[i][j] = cell_info[i][j];
- }
- }
- for (int i = row + 1; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
- c_info[i][j] = cell_info[i-1][j];
- }
- }
- cell_info = c_info;
- ++row;
- for (int j = 0; j < columns_; ++j) {
- cell_info[row][j].inset.clear();
- }
-#endif
- Reinit();
+ row_info[row] = row_info[row + 1];
+
+ cell_vvector old(rows_ - 1);
+ for (row_type i = 0; i < rows_ - 1; ++i)
+ swap(cell_info[i], old[i]);
+
+ cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct(bp)));
+
+ for (row_type i = 0; i <= row; ++i)
+ swap(cell_info[i], old[i]);
+ for (row_type i = row + 2; i < rows_; ++i)
+ swap(cell_info[i], old[i - 1]);
+
+ if (bp.tracking_changes)
+ for (col_type j = 0; j < columns_; ++j)
+ cell_info[row + 1][j].inset->markNew(true);
+
+ set_row_column_number_info();
}
-void LyXTabular::DeleteRow(int row)
+void LyXTabular::deleteRow(row_type const row)
{
- // Why make it so hard? (Lgb)
- //if (!(rows_ - 1))
- //return;
- if (rows_ == 1) return; // Not allowed to delete last row
-
- row_info.erase(row_info.begin() + row); //&row_info[row]);
- cell_info.erase(cell_info.begin() + row); //&cell_info[row]);
+ // Not allowed to delete last row
+ if (rows_ == 1)
+ return;
+
+ row_info.erase(row_info.begin() + row);
+ cell_info.erase(cell_info.begin() + row);
--rows_;
- Reinit();
+ fixCellNums();
}
-void LyXTabular::AppendColumn(int cell)
+void LyXTabular::appendColumn(BufferParams const & bp, idx_type const cell)
{
++columns_;
-
- cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
- cellstruct()));
- int const column = column_of_cell(cell);
+
+ col_type const column = column_of_cell(cell);
column_vector::iterator cit = column_info.begin() + column + 1;
column_info.insert(cit, columnstruct());
// set the column values of the column before
- column_info[column+1] = column_info[column];
+ column_info[column + 1] = column_info[column];
+
+ for (row_type i = 0; i < rows_; ++i) {
+ cell_info[i].insert(cell_info[i].begin() + column + 1, cellstruct(bp));
- for (int i = 0; i < rows_; ++i) {
- for (int j = 0; j <= column; ++j) {
- c_info[i][j] = cell_info[i][j];
- }
- for (int j = column + 1; j < columns_; ++j) {
- c_info[i][j] = cell_info[i][j - 1];
- }
// care about multicolumns
- if (cell_info[i][column + 1].multicolumn==CELL_BEGIN_OF_MULTICOLUMN) {
+ if (cell_info[i][column + 1].multicolumn == CELL_BEGIN_OF_MULTICOLUMN)
cell_info[i][column + 1].multicolumn = CELL_PART_OF_MULTICOLUMN;
- }
- if ((column + 1) == columns_ ||
- cell_info[i][column + 2].multicolumn != CELL_PART_OF_MULTICOLUMN) {
+
+ if (column + 2 >= columns_
+ || cell_info[i][column + 2].multicolumn != CELL_PART_OF_MULTICOLUMN)
cell_info[i][column + 1].multicolumn = LyXTabular::CELL_NORMAL;
- }
}
- cell_info = c_info;
//++column;
- for (int i = 0; i < rows_; ++i) {
- //cell_info[i][column].inset.clear();
- cell_info[i][column + 1].inset.clear();
+ for (row_type i = 0; i < rows_; ++i) {
+ cell_info[i][column + 1].inset->clear(false);
+ if (bp.tracking_changes)
+ cell_info[i][column + 1].inset->markNew(true);
}
- Reinit();
+ fixCellNums();
}
-void LyXTabular::DeleteColumn(int column)
+void LyXTabular::deleteColumn(col_type const column)
{
- // Similar to DeleteRow
- //if (!(columns_ - 1))
- //return;
- if (columns_ == 1) return; // Not allowed to delete last column
-
+ // Not allowed to delete last column
+ if (columns_ == 1)
+ return;
+
column_info.erase(column_info.begin() + column);
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i)
cell_info[i].erase(cell_info[i].begin() + column);
- }
--columns_;
- Reinit();
-}
-
-
-void LyXTabular::Reinit()
-{
- for (int i = 0; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
- cell_info[i][j].width_of_cell = 0;
- cell_info[i][j].inset.setOwner(owner_);
- }
- }
-
- for (int i = 0; i < columns_; ++i) {
- calculate_width_of_column(i);
- }
- calculate_width_of_tabular();
-
- set_row_column_number_info();
+ fixCellNums();
}
-void LyXTabular::set_row_column_number_info(bool oldformat)
+void LyXTabular::set_row_column_number_info()
{
- numberofcells = -1;
- for (int row = 0; row < rows_; ++row) {
- for (int column = 0; column<columns_; ++column) {
+ numberofcells = 0;
+ for (row_type row = 0; row < rows_; ++row) {
+ for (col_type column = 0; column < columns_; ++column) {
if (cell_info[row][column].multicolumn
!= LyXTabular::CELL_PART_OF_MULTICOLUMN)
++numberofcells;
- cell_info[row][column].cellno = numberofcells;
+ if (numberofcells == 0)
+ // FIXME: Is this intended?
+ cell_info[row][column].cellno = npos;
+ else
+ cell_info[row][column].cellno =
+ numberofcells - 1;
}
}
- ++numberofcells; // because this is one more than as we start from 0
rowofcell.resize(numberofcells);
columnofcell.resize(numberofcells);
- for (int row = 0, column = 0, c = 0;
+ row_type row = 0;
+ col_type column = 0;
+ for (idx_type c = 0;
c < numberofcells && row < rows_ && column < columns_;) {
rowofcell[c] = row;
columnofcell[c] = column;
} while (column < columns_ &&
cell_info[row][column].multicolumn
== LyXTabular::CELL_PART_OF_MULTICOLUMN);
+
if (column == columns_) {
column = 0;
++row;
}
}
- for (int row = 0; row < rows_; ++row) {
- for (int column = 0; column < columns_; ++column) {
- if (IsPartOfMultiColumn(row,column))
+ for (row_type row = 0; row < rows_; ++row) {
+ for (col_type column = 0; column < columns_; ++column) {
+ if (isPartOfMultiColumn(row,column))
continue;
- // now set the right line of multicolumns right for oldformat read
- if (oldformat &&
- cell_info[row][column].multicolumn==CELL_BEGIN_OF_MULTICOLUMN)
- {
- int cn=cells_in_multicolumn(cell_info[row][column].cellno);
- cell_info[row][column].right_line =
- cell_info[row][column+cn-1].right_line;
- }
- cell_info[row][column].inset.SetAutoBreakRows(
- !GetPWidth(GetCellNumber(row, column)).empty());
+ cell_info[row][column].inset->setAutoBreakRows(
+ !getPWidth(getCellNumber(row, column)).zero());
}
}
}
-int LyXTabular::GetNumberOfCells() const
+LyXTabular::idx_type LyXTabular::getNumberOfCells() const
{
return numberofcells;
}
-int LyXTabular::NumberOfCellsInRow(int cell) const
+LyXTabular::idx_type LyXTabular::numberOfCellsInRow(idx_type const cell) const
{
- int const row = row_of_cell(cell);
- int result = 0;
- for (int i = 0; i < columns_; ++i) {
+ row_type const row = row_of_cell(cell);
+ idx_type result = 0;
+ for (col_type i = 0; i < columns_; ++i)
if (cell_info[row][i].multicolumn != LyXTabular::CELL_PART_OF_MULTICOLUMN)
++result;
- }
return result;
}
-/* returns 1 if there is a topline, returns 0 if not */
-bool LyXTabular::TopLine(int cell, bool onlycolumn) const
+// returns 1 if there is a topline, returns 0 if not
+bool LyXTabular::topLine(idx_type const cell, bool const onlycolumn) const
{
- int const row = row_of_cell(cell);
-
- if (!onlycolumn && IsMultiColumn(cell))
- return cellinfo_of_cell(cell)->top_line;
- return row_info[row].top_line;
+ if (!onlycolumn && isMultiColumn(cell))
+ return cellinfo_of_cell(cell).top_line;
+ return row_info[row_of_cell(cell)].top_line;
}
-bool LyXTabular::BottomLine(int cell, bool onlycolumn) const
+bool LyXTabular::bottomLine(idx_type const cell, bool onlycolumn) const
{
- // no bottom line underneath non-existent cells if you please
- // Isn't that a programming error? Is so this should
- // be an Assert instead. (Lgb)
- if (cell >= numberofcells)
- return false;
-
- if (!onlycolumn && IsMultiColumn(cell))
- return cellinfo_of_cell(cell)->bottom_line;
+ if (!onlycolumn && isMultiColumn(cell))
+ return cellinfo_of_cell(cell).bottom_line;
return row_info[row_of_cell(cell)].bottom_line;
}
-bool LyXTabular::LeftLine(int cell, bool onlycolumn) const
+bool LyXTabular::leftLine(idx_type cell, bool onlycolumn) const
{
- if (!onlycolumn && IsMultiColumn(cell))
- return cellinfo_of_cell(cell)->left_line;
- return column_info[column_of_cell(cell)].left_line;
+ if (!onlycolumn && isMultiColumn(cell) &&
+ (isFirstCellInRow(cell) || isMultiColumn(cell-1)))
+ {
+ if (cellinfo_of_cell(cell).align_special.empty())
+ return cellinfo_of_cell(cell).left_line;
+ return prefixIs(ltrim(cellinfo_of_cell(cell).align_special), "|");
+ }
+ if (column_info[column_of_cell(cell)].align_special.empty())
+ return column_info[column_of_cell(cell)].left_line;
+ return prefixIs(ltrim(column_info[column_of_cell(cell)].align_special), "|");
}
-bool LyXTabular::RightLine(int cell, bool onlycolumn) const
+bool LyXTabular::rightLine(idx_type cell, bool onlycolumn) const
{
- if (!onlycolumn && IsMultiColumn(cell))
- return cellinfo_of_cell(cell)->right_line;
- return column_info[right_column_of_cell(cell)].right_line;
+ if (!onlycolumn && isMultiColumn(cell) &&
+ (isLastCellInRow(cell) || isMultiColumn(cell + 1)))
+ {
+ if (cellinfo_of_cell(cell).align_special.empty())
+ return cellinfo_of_cell(cell).right_line;
+ return suffixIs(rtrim(cellinfo_of_cell(cell).align_special), "|");
+ }
+ if (column_info[column_of_cell(cell)].align_special.empty())
+ return column_info[right_column_of_cell(cell)].right_line;
+ return suffixIs(rtrim(column_info[column_of_cell(cell)].align_special), "|");
}
-bool LyXTabular::TopAlreadyDrawed(int cell) const
+bool LyXTabular::topAlreadyDrawn(idx_type cell) const
{
- int row = row_of_cell(cell);
- if ((row > 0) && !GetAdditionalHeight(row)) {
- int column = column_of_cell(cell);
+ row_type row = row_of_cell(cell);
+ if (row > 0 && !getAdditionalHeight(row)) {
+ col_type column = column_of_cell(cell);
--row;
while (column
&& cell_info[row][column].multicolumn
}
-bool LyXTabular::LeftAlreadyDrawed(int cell) const
+bool LyXTabular::leftAlreadyDrawn(idx_type cell) const
{
- int column = column_of_cell(cell);
+ col_type column = column_of_cell(cell);
if (column > 0) {
- int row = row_of_cell(cell);
+ row_type row = row_of_cell(cell);
while (--column &&
(cell_info[row][column].multicolumn ==
LyXTabular::CELL_PART_OF_MULTICOLUMN));
- if (GetAdditionalWidth(cell_info[row][column].cellno))
+ if (getAdditionalWidth(cell_info[row][column].cellno))
return false;
- return column_info[column].right_line;
+ return rightLine(cell_info[row][column].cellno);
}
return false;
}
-bool LyXTabular::IsLastRow(int cell) const
+bool LyXTabular::isLastRow(idx_type cell) const
{
- return (row_of_cell(cell) == rows_ - 1);
+ return row_of_cell(cell) == rows_ - 1;
}
-int LyXTabular::GetAdditionalHeight(int row) const
+int LyXTabular::getAdditionalHeight(row_type row) const
{
if (!row || row >= rows_)
return 0;
bool top = true;
bool bottom = true;
- for (int column = 0; column < columns_ - 1 && bottom; ++column) {
+ for (col_type column = 0; column < columns_ && bottom; ++column) {
switch (cell_info[row - 1][column].multicolumn) {
case LyXTabular::CELL_BEGIN_OF_MULTICOLUMN:
bottom = cell_info[row - 1][column].bottom_line;
bottom = row_info[row - 1].bottom_line;
}
}
- for (int column = 0; column < columns_ - 1 && top; ++column) {
- switch (cell_info[row][column].multicolumn){
+ for (col_type column = 0; column < columns_ && top; ++column) {
+ switch (cell_info[row][column].multicolumn) {
case LyXTabular::CELL_BEGIN_OF_MULTICOLUMN:
top = cell_info[row][column].top_line;
break;
}
-int LyXTabular::GetAdditionalWidth(int cell) const
+int LyXTabular::getAdditionalWidth(idx_type cell) const
{
- // internally already set in SetWidthOfCell
+ // internally already set in setWidthOfCell
// used to get it back in text.C
- int const col = right_column_of_cell(cell);
- if (col < columns_ - 1 && column_info[col].right_line &&
- column_info[col+1].left_line)
+ col_type const col = right_column_of_cell(cell);
+ row_type const row = row_of_cell(cell);
+ if (col < columns_ - 1 && rightLine(cell) &&
+ leftLine(cell_info[row][col+1].cellno)) // column_info[col+1].left_line)
+ {
return WIDTH_OF_LINE;
- else
- return 0;
+ }
+ return 0;
}
-// returns the maximum over all rows
-int LyXTabular::GetWidthOfColumn(int cell) const
+// returns the maximum over all rows
+int LyXTabular::getWidthOfColumn(idx_type cell) const
{
- int const column1 = column_of_cell(cell);
- int const column2 = right_column_of_cell(cell);
+ col_type const column1 = column_of_cell(cell);
+ col_type const column2 = right_column_of_cell(cell);
int result = 0;
- for (int i = column1; i <= column2; ++i) {
+ for (col_type i = column1; i <= column2; ++i)
result += column_info[i].width_of_column;
- }
return result;
}
-int LyXTabular::GetWidthOfTabular() const
+int LyXTabular::getWidthOfTabular() const
{
return width_of_tabular;
}
-/* returns 1 if a complete update is necessary, otherwise 0 */
-bool LyXTabular::SetWidthOfMulticolCell(int cell, int new_width)
+// returns true if a complete update is necessary, otherwise false
+bool LyXTabular::setWidthOfMulticolCell(idx_type cell, int new_width)
{
- if (!IsMultiColumn(cell))
+ if (!isMultiColumn(cell))
return false;
-
- int const row = row_of_cell(cell);
- int const column1 = column_of_cell(cell);
- int const column2 = right_column_of_cell(cell);
+
+ row_type const row = row_of_cell(cell);
+ col_type const column1 = column_of_cell(cell);
+ col_type const column2 = right_column_of_cell(cell);
+ int const old_val = cell_info[row][column2].width_of_cell;
// first set columns to 0 so we can calculate the right width
- for (int i = column1; i <= column2; ++i) {
+ for (col_type i = column1; i <= column2; ++i) {
cell_info[row][i].width_of_cell = 0;
}
// set the width to MAX_WIDTH until width > 0
- int width = (new_width + 2 * WIDTH_OF_LINE);
-
- int i = column1;
+ int width = new_width + 2 * WIDTH_OF_LINE;
+ col_type i = column1;
for (; i < column2 && width > column_info[i].width_of_column; ++i) {
cell_info[row][i].width_of_cell = column_info[i].width_of_column;
width -= column_info[i].width_of_column;
if (width > 0) {
cell_info[row][i].width_of_cell = width;
}
+ if (old_val != cell_info[row][column2].width_of_cell) {
+ // in this case we have to recalculate all multicolumn cells which
+ // have this column as one of theirs but not as last one
+ calculate_width_of_column_NMC(i);
+ recalculateMulticolumnsOfColumn(i);
+ calculate_width_of_column(i);
+ }
return true;
}
-void LyXTabular::recalculateMulticolCells(int cell, int new_width)
+void LyXTabular::recalculateMulticolumnsOfColumn(col_type column)
{
- int const row = row_of_cell(cell);
- int const column1 = column_of_cell(cell);
- int const column2 = right_column_of_cell(cell);
-
- // first set columns to 0 so we can calculate the right width
- int i = column1;
- for (; i <= column2; ++i)
- cell_info[row][i].width_of_cell = 0;
- for (i = cell + 1; (i < numberofcells) && (!IsMultiColumn(i)); ++i)
- ;
- if (i < numberofcells)
- recalculateMulticolCells(i, GetWidthOfCell(i) - (2 * WIDTH_OF_LINE));
- SetWidthOfMulticolCell(cell, new_width);
+ // the last column does not have to be recalculated because all
+ // multicolumns will have here there last multicolumn cell which
+ // always will have the whole rest of the width of the cell.
+ if (column > (columns_ - 2))
+ return;
+ for(row_type row = 0; row < rows_; ++row) {
+ int mc = cell_info[row][column].multicolumn;
+ int nmc = cell_info[row][column+1].multicolumn;
+ // we only have to update multicolumns which do not have this
+ // column as their last column!
+ if (mc == CELL_BEGIN_OF_MULTICOLUMN ||
+ (mc == CELL_PART_OF_MULTICOLUMN &&
+ nmc == CELL_PART_OF_MULTICOLUMN))
+ {
+ idx_type const cellno = cell_info[row][column].cellno;
+ setWidthOfMulticolCell(cellno,
+ getWidthOfCell(cellno) - 2 * WIDTH_OF_LINE);
+ }
+ }
}
-/* returns 1 if a complete update is necessary, otherwise 0 */
-bool LyXTabular::SetWidthOfCell(int cell, int new_width)
+// returns 1 if a complete update is necessary, otherwise 0
+void LyXTabular::setWidthOfCell(idx_type cell, int new_width)
{
- int const row = row_of_cell(cell);
- int const column1 = column_of_cell(cell);
+ row_type const row = row_of_cell(cell);
+ col_type const column1 = column_of_cell(cell);
bool tmp = false;
int width = 0;
+ int add_width = 0;
- if (GetWidthOfCell(cell) == (new_width+2*WIDTH_OF_LINE))
- return false;
- if (IsMultiColumn(cell, true)) {
- tmp = SetWidthOfMulticolCell(cell, new_width);
+ if (rightLine(cell_info[row][column1].cellno, true) &&
+ column1 < columns_ - 1 &&
+ leftLine(cell_info[row][column1+1].cellno, true))
+ {
+ add_width = WIDTH_OF_LINE;
+ }
+
+ if (getWidthOfCell(cell) == new_width + 2 * WIDTH_OF_LINE + add_width)
+ return;
+
+ if (isMultiColumnReal(cell)) {
+ tmp = setWidthOfMulticolCell(cell, new_width);
} else {
- width = (new_width + 2*WIDTH_OF_LINE);
+ width = new_width + 2 * WIDTH_OF_LINE + add_width;
cell_info[row][column1].width_of_cell = width;
- if (column_info[column1].right_line && (column1 < columns_-1) &&
- column_info[column1+1].left_line) // additional width
- cell_info[row][column1].width_of_cell += WIDTH_OF_LINE;
tmp = calculate_width_of_column_NMC(column1);
+ if (tmp)
+ recalculateMulticolumnsOfColumn(column1);
}
if (tmp) {
- int i = 0;
- for (; i<columns_; ++i)
- calculate_width_of_column_NMC(i);
- for (i = 0; (i < numberofcells) && !IsMultiColumn(i); ++i)
- ;
- if (i < numberofcells)
- recalculateMulticolCells(i, GetWidthOfCell(i)-(2 * WIDTH_OF_LINE));
- for (i = 0; i < columns_; ++i)
+ for (col_type i = 0; i < columns_; ++i)
calculate_width_of_column(i);
calculate_width_of_tabular();
- return true;
}
- return false;
}
-bool LyXTabular::SetAlignment(int cell, LyXAlignment align, bool onlycolumn)
+void LyXTabular::setAlignment(idx_type cell, LyXAlignment align,
+ bool onlycolumn)
{
- if (!IsMultiColumn(cell) || onlycolumn)
+ if (!isMultiColumn(cell) || onlycolumn)
column_info[column_of_cell(cell)].alignment = align;
if (!onlycolumn)
- cellinfo_of_cell(cell)->alignment = align;
- return true;
+ cellinfo_of_cell(cell).alignment = align;
}
-bool LyXTabular::SetVAlignment(int cell, VAlignment align, bool onlycolumn)
+void LyXTabular::setVAlignment(idx_type cell, VAlignment align,
+ bool onlycolumn)
{
- if (!IsMultiColumn(cell) || onlycolumn)
+ if (!isMultiColumn(cell) || onlycolumn)
column_info[column_of_cell(cell)].valignment = align;
if (!onlycolumn)
- cellinfo_of_cell(cell)->valignment = align;
- return true;
+ cellinfo_of_cell(cell).valignment = align;
}
-bool LyXTabular::SetColumnPWidth(int cell, string const & width)
+void LyXTabular::setColumnPWidth(idx_type cell, LyXLength const & width)
{
- bool flag = !width.empty();
- int const j = column_of_cell(cell);
+ col_type const j = column_of_cell(cell);
column_info[j].p_width = width;
- if (flag) // do this only if there is a width
- SetAlignment(cell, LYX_ALIGN_LEFT);
- for (int i = 0; i < rows_; ++i) {
- int c = GetCellNumber(i, j);
- flag = !GetPWidth(c).empty(); // because of multicolumns!
- GetCellInset(c)->SetAutoBreakRows(flag);
+ for (row_type i = 0; i < rows_; ++i) {
+ idx_type const cell = getCellNumber(i, j);
+ // because of multicolumns
+ getCellInset(cell)->setAutoBreakRows(!getPWidth(cell).zero());
}
- return true;
}
-bool LyXTabular::SetMColumnPWidth(int cell, string const & width)
+bool LyXTabular::setMColumnPWidth(idx_type cell, LyXLength const & width)
{
- bool const flag = !width.empty();
+ if (!isMultiColumn(cell))
+ return false;
- cellinfo_of_cell(cell)->p_width = width;
- if (IsMultiColumn(cell)) {
- GetCellInset(cell)->SetAutoBreakRows(flag);
- return true;
- }
- return false;
+ cellinfo_of_cell(cell).p_width = width;
+ getCellInset(cell)->setAutoBreakRows(!width.zero());
+ return true;
}
-bool LyXTabular::SetAlignSpecial(int cell, string const & special,
- LyXTabular::Feature what)
+void LyXTabular::setAlignSpecial(idx_type cell, string const & special,
+ LyXTabular::Feature what)
{
if (what == SET_SPECIAL_MULTI)
- cellinfo_of_cell(cell)->align_special = special;
+ cellinfo_of_cell(cell).align_special = special;
else
column_info[column_of_cell(cell)].align_special = special;
- return true;
}
-bool LyXTabular::SetAllLines(int cell, bool line)
+void LyXTabular::setAllLines(idx_type cell, bool line)
{
- SetTopLine(cell, line);
- SetBottomLine(cell, line);
- SetRightLine(cell, line);
- SetLeftLine(cell, line);
- return true;
+ setTopLine(cell, line);
+ setBottomLine(cell, line);
+ setRightLine(cell, line);
+ setLeftLine(cell, line);
}
-bool LyXTabular::SetTopLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setTopLine(idx_type cell, bool line, bool onlycolumn)
{
- int const row = row_of_cell(cell);
-
- if (onlycolumn || !IsMultiColumn(cell))
+ row_type const row = row_of_cell(cell);
+ if (onlycolumn || !isMultiColumn(cell))
row_info[row].top_line = line;
else
- cellinfo_of_cell(cell)->top_line = line;
- return true;
+ cellinfo_of_cell(cell).top_line = line;
}
-bool LyXTabular::SetBottomLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setBottomLine(idx_type cell, bool line, bool onlycolumn)
{
- if (onlycolumn || !IsMultiColumn(cell))
+ if (onlycolumn || !isMultiColumn(cell))
row_info[row_of_cell(cell)].bottom_line = line;
else
- cellinfo_of_cell(cell)->bottom_line = line;
- return true;
+ cellinfo_of_cell(cell).bottom_line = line;
}
-bool LyXTabular::SetLeftLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setLeftLine(idx_type cell, bool line, bool onlycolumn)
{
- if (onlycolumn || !IsMultiColumn(cell))
+ if (onlycolumn || !isMultiColumn(cell))
column_info[column_of_cell(cell)].left_line = line;
else
- cellinfo_of_cell(cell)->left_line = line;
- return true;
+ cellinfo_of_cell(cell).left_line = line;
}
-bool LyXTabular::SetRightLine(int cell, bool line, bool onlycolumn)
+void LyXTabular::setRightLine(idx_type cell, bool line, bool onlycolumn)
{
- if (onlycolumn || !IsMultiColumn(cell))
+ if (onlycolumn || !isMultiColumn(cell))
column_info[right_column_of_cell(cell)].right_line = line;
else
- cellinfo_of_cell(cell)->right_line = line;
- return true;
+ cellinfo_of_cell(cell).right_line = line;
}
-LyXAlignment LyXTabular::GetAlignment(int cell, bool onlycolumn) const
+LyXAlignment LyXTabular::getAlignment(idx_type cell, bool onlycolumn) const
{
- if (!onlycolumn && IsMultiColumn(cell))
- return cellinfo_of_cell(cell)->alignment;
- else
- return column_info[column_of_cell(cell)].alignment;
+ if (!onlycolumn && isMultiColumn(cell))
+ return cellinfo_of_cell(cell).alignment;
+ return column_info[column_of_cell(cell)].alignment;
}
LyXTabular::VAlignment
-LyXTabular::GetVAlignment(int cell, bool onlycolumn) const
+LyXTabular::getVAlignment(idx_type cell, bool onlycolumn) const
{
- if (!onlycolumn && IsMultiColumn(cell))
- return cellinfo_of_cell(cell)->valignment;
- else
- return column_info[column_of_cell(cell)].valignment;
+ if (!onlycolumn && isMultiColumn(cell))
+ return cellinfo_of_cell(cell).valignment;
+ return column_info[column_of_cell(cell)].valignment;
}
-string const LyXTabular::GetPWidth(int cell) const
+LyXLength const LyXTabular::getPWidth(idx_type cell) const
{
- if (IsMultiColumn(cell))
- return cellinfo_of_cell(cell)->p_width;
+ if (isMultiColumn(cell))
+ return cellinfo_of_cell(cell).p_width;
return column_info[column_of_cell(cell)].p_width;
}
-string const LyXTabular::GetColumnPWidth(int cell) const
+LyXLength const LyXTabular::getColumnPWidth(idx_type cell) const
{
return column_info[column_of_cell(cell)].p_width;
}
-string const LyXTabular::GetMColumnPWidth(int cell) const
+LyXLength const LyXTabular::getMColumnPWidth(idx_type cell) const
{
- if (IsMultiColumn(cell))
- return cellinfo_of_cell(cell)->p_width;
- return string();
+ if (isMultiColumn(cell))
+ return cellinfo_of_cell(cell).p_width;
+ return LyXLength();
}
-string const LyXTabular::GetAlignSpecial(int cell, int what) const
+string const LyXTabular::getAlignSpecial(idx_type cell, int what) const
{
if (what == SET_SPECIAL_MULTI)
- return cellinfo_of_cell(cell)->align_special;
+ return cellinfo_of_cell(cell).align_special;
return column_info[column_of_cell(cell)].align_special;
}
-int LyXTabular::GetWidthOfCell(int cell) const
+int LyXTabular::getWidthOfCell(idx_type cell) const
{
- int const row = row_of_cell(cell);
- int const column1 = column_of_cell(cell);
- int const column2 = right_column_of_cell(cell);
+ row_type const row = row_of_cell(cell);
+ col_type const column1 = column_of_cell(cell);
+ col_type const column2 = right_column_of_cell(cell);
int result = 0;
- for (int i = column1; i <= column2; ++i) {
+ for (col_type i = column1; i <= column2; ++i)
result += cell_info[row][i].width_of_cell;
- }
return result;
}
-int LyXTabular::GetBeginningOfTextInCell(int cell) const
+int LyXTabular::getBeginningOfTextInCell(idx_type cell) const
{
int x = 0;
-
- switch (GetAlignment(cell)){
+
+ switch (getAlignment(cell)) {
case LYX_ALIGN_CENTER:
- x += (GetWidthOfColumn(cell) - GetWidthOfCell(cell)) / 2;
+ x += (getWidthOfColumn(cell) - getWidthOfCell(cell)) / 2;
break;
case LYX_ALIGN_RIGHT:
- x += GetWidthOfColumn(cell) - GetWidthOfCell(cell);
- // + GetAdditionalWidth(cell);
+ x += getWidthOfColumn(cell) - getWidthOfCell(cell);
+ // + getAdditionalWidth(cell);
break;
- default: /* LYX_ALIGN_LEFT: nothing :-) */
+ default:
+ // LYX_ALIGN_LEFT: nothing :-)
break;
}
-
+
// the LaTeX Way :-(
x += WIDTH_OF_LINE;
return x;
}
-bool LyXTabular::IsFirstCellInRow(int cell) const
+bool LyXTabular::isFirstCellInRow(idx_type cell) const
{
return column_of_cell(cell) == 0;
}
-int LyXTabular::GetFirstCellInRow(int row) const
-{
- if (row > (rows_-1))
- row = rows_ - 1;
- return cell_info[row][0].cellno;
-}
-
-bool LyXTabular::IsLastCellInRow(int cell) const
-{
- return (right_column_of_cell(cell) == (columns_ - 1));
-}
-
-
-int LyXTabular::GetLastCellInRow(int row) const
+LyXTabular::idx_type LyXTabular::getFirstCellInRow(row_type row) const
{
- if (row > (rows_-1))
+ if (row > rows_ - 1)
row = rows_ - 1;
- return cell_info[row][columns_-1].cellno;
-}
-
-
-bool LyXTabular::calculate_width_of_column(int column)
-{
- int const old_column_width = column_info[column].width_of_column;
- int maximum = 0;
-
- for (int i = 0; i < rows_; ++i) {
- maximum = max(cell_info[i][column].width_of_cell, maximum);
- }
- column_info[column].width_of_column = maximum;
- return (column_info[column].width_of_column != old_column_width);
-}
-
-
-//
-// calculate the with of the column without regarding REAL MultiColumn
-// cells. This means MultiColumn-cells spanning more than 1 column.
-//
-bool LyXTabular::calculate_width_of_column_NMC(int column)
-{
- int const old_column_width = column_info[column].width_of_column;
- int max = 0;
- for (int i = 0; i < rows_; ++i) {
- if (!IsMultiColumn(GetCellNumber(i, column), true) &&
- (cell_info[i][column].width_of_cell > max)) {
- max = cell_info[i][column].width_of_cell;
- }
- }
- column_info[column].width_of_column = max;
- return (column_info[column].width_of_column != old_column_width);
-}
-
-
-void LyXTabular::calculate_width_of_tabular()
-{
- width_of_tabular = 0;
- for (int i = 0; i < columns_; ++i) {
- width_of_tabular += column_info[i].width_of_column;
- }
-}
-
-
-int LyXTabular::row_of_cell(int cell) const
-{
- if (cell >= numberofcells)
- return rows_ - 1;
- else if (cell < 0)
- return 0;
- return rowofcell[cell];
-}
-
-
-int LyXTabular::column_of_cell(int cell) const
-{
- if (cell >= numberofcells)
- return columns_ - 1;
- else if (cell < 0)
- return 0;
- return columnofcell[cell];
-}
-
-
-int LyXTabular::right_column_of_cell(int cell) const
-{
- int const row = row_of_cell(cell);
- int column = column_of_cell(cell);
- while (column < (columns_ - 1) &&
- cell_info[row][column + 1].multicolumn == LyXTabular::CELL_PART_OF_MULTICOLUMN)
- ++column;
- return column;
+ return cell_info[row][0].cellno;
}
-// Perfect case for a template... (Lgb)
-#if 1
-template<class T>
-string const write_attribute(string const & name, T const & t)
+bool LyXTabular::isLastCellInRow(idx_type cell) const
{
- string str = " " + name + "=\"" + tostr(t) + "\"";
- return str;
+ return right_column_of_cell(cell) == columns_ - 1;
}
-template <>
-string const write_attribute(string const & name, bool const & b)
+
+LyXTabular::idx_type LyXTabular::getLastCellInRow(row_type row) const
{
- return write_attribute(name, int(b));
+ if (row > rows_ - 1)
+ row = rows_ - 1;
+ return cell_info[row][columns_-1].cellno;
}
-#else
-string const write_attribute(string const & name, int value)
+void LyXTabular::calculate_width_of_column(col_type column)
{
- string str = " " + name + "=\"" + tostr(value) + "\"";
- return str;
+ int maximum = 0;
+ for (row_type i = 0; i < rows_; ++i)
+ maximum = max(cell_info[i][column].width_of_cell, maximum);
+ column_info[column].width_of_column = maximum;
}
-string const write_attribute(string const & name, string const & value)
+//
+// Calculate the columns regarding ONLY the normal cells and if this
+// column is inside a multicolumn cell then use it only if its the last
+// column of this multicolumn cell as this gives an added width to the
+// column, all the rest should be adapted!
+//
+bool LyXTabular::calculate_width_of_column_NMC(col_type column)
{
- string str = " " + name + "=\"" + value + "\"";
- return str;
+ int const old_column_width = column_info[column].width_of_column;
+ int max = 0;
+ for (row_type i = 0; i < rows_; ++i) {
+ idx_type cell = getCellNumber(i, column);
+ bool ismulti = isMultiColumnReal(cell);
+ if ((!ismulti || column == right_column_of_cell(cell)) &&
+ cell_info[i][column].width_of_cell > max)
+ {
+ max = cell_info[i][column].width_of_cell;
+ }
+ }
+ column_info[column].width_of_column = max;
+ return column_info[column].width_of_column != old_column_width;
}
-string const write_attribute(string const & name, bool value)
+void LyXTabular::calculate_width_of_tabular()
{
- string str = " " + name + "=\"" + tostr(static_cast<int>(value)) + "\"";
- return str;
+ width_of_tabular = 0;
+ for (col_type i = 0; i < columns_; ++i)
+ width_of_tabular += column_info[i].width_of_column;
}
-#endif
-template<>
-inline
-string const tostr(LyXAlignment const & num)
+LyXTabular::row_type LyXTabular::row_of_cell(idx_type cell) const
{
- switch(num) {
- case LYX_ALIGN_NONE:
- return "none";
- case LYX_ALIGN_BLOCK:
- return "block";
- case LYX_ALIGN_LEFT:
- return "left";
- case LYX_ALIGN_CENTER:
- return "center";
- case LYX_ALIGN_RIGHT:
- return "right";
- case LYX_ALIGN_LAYOUT:
- return "layout";
- case LYX_ALIGN_SPECIAL:
- return "special";
- }
- return string();
+ if (cell >= numberofcells)
+ return rows_ - 1;
+ if (cell == npos)
+ return 0;
+ return rowofcell[cell];
}
-template<>
-inline
-string const tostr(LyXTabular::VAlignment const & num)
+LyXTabular::col_type LyXTabular::column_of_cell(idx_type cell) const
{
- switch(num) {
- case LyXTabular::LYX_VALIGN_TOP:
- return "top";
- case LyXTabular::LYX_VALIGN_CENTER:
- return "center";
- case LyXTabular::LYX_VALIGN_BOTTOM:
- return "bottom";
- }
- return string();
+ if (cell >= numberofcells)
+ return columns_ - 1;
+ if (cell == npos)
+ return 0;
+ return columnofcell[cell];
}
-template<>
-inline
-string const tostr(LyXTabular::BoxType const & num)
+LyXTabular::col_type LyXTabular::right_column_of_cell(idx_type cell) const
{
- switch(num) {
- case LyXTabular::BOX_NONE:
- return "none";
- case LyXTabular::BOX_PARBOX:
- return "parbox";
- case LyXTabular::BOX_MINIPAGE:
- return "minipage";
- }
- return string();
+ row_type const row = row_of_cell(cell);
+ col_type column = column_of_cell(cell);
+ while (column < columns_ - 1 &&
+ cell_info[row][column + 1].multicolumn == LyXTabular::CELL_PART_OF_MULTICOLUMN)
+ ++column;
+ return column;
}
-void LyXTabular::Write(Buffer const * buf, ostream & os) const
+void LyXTabular::write(Buffer const & buf, ostream & os) const
{
// header line
os << "<lyxtabular"
- << write_attribute("version", 2)
+ << write_attribute("version", 3)
<< write_attribute("rows", rows_)
<< write_attribute("columns", columns_)
<< ">\n";
// global longtable options
os << "<features"
- << write_attribute("rotate", tostr(rotate))
- << write_attribute("islongtable", tostr(is_long_tabular))
- << write_attribute("endhead", endhead)
- << write_attribute("endfirsthead", endfirsthead)
- << write_attribute("endfoot", endfoot)
- << write_attribute("endlastfoot", endlastfoot)
+ << write_attribute("rotate", rotate)
+ << write_attribute("islongtable", is_long_tabular)
+ << write_attribute("firstHeadTopDL", endfirsthead.topDL)
+ << write_attribute("firstHeadBottomDL", endfirsthead.bottomDL)
+ << write_attribute("firstHeadEmpty", endfirsthead.empty)
+ << write_attribute("headTopDL", endhead.topDL)
+ << write_attribute("headBottomDL", endhead.bottomDL)
+ << write_attribute("footTopDL", endfoot.topDL)
+ << write_attribute("footBottomDL", endfoot.bottomDL)
+ << write_attribute("lastFootTopDL", endlastfoot.topDL)
+ << write_attribute("lastFootBottomDL", endlastfoot.bottomDL)
+ << write_attribute("lastFootEmpty", endlastfoot.empty)
<< ">\n";
- for (int j = 0; j < columns_; ++j) {
+ for (col_type j = 0; j < columns_; ++j) {
os << "<column"
- << write_attribute("alignment", tostr(column_info[j].alignment))
- << write_attribute("valignment", tostr(column_info[j].valignment))
- << write_attribute("leftline", tostr(column_info[j].left_line))
- << write_attribute("rightline", tostr(column_info[j].right_line))
- << write_attribute("width",
- VSpace(column_info[j].p_width)
- .asLyXCommand())
+ << write_attribute("alignment", column_info[j].alignment)
+ << write_attribute("valignment", column_info[j].valignment)
+ << write_attribute("leftline", column_info[j].left_line)
+ << write_attribute("rightline", column_info[j].right_line)
+ << write_attribute("width", column_info[j].p_width.asString())
<< write_attribute("special", column_info[j].align_special)
<< ">\n";
}
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
os << "<row"
- << write_attribute("topline", tostr(row_info[i].top_line))
- << write_attribute("bottomline", tostr(row_info[i].bottom_line))
- << write_attribute("newpage", tostr(row_info[i].newpage))
+ << write_attribute("topline", row_info[i].top_line)
+ << write_attribute("bottomline", row_info[i].bottom_line)
+ << write_attribute("endhead", row_info[i].endhead)
+ << write_attribute("endfirsthead", row_info[i].endfirsthead)
+ << write_attribute("endfoot", row_info[i].endfoot)
+ << write_attribute("endlastfoot", row_info[i].endlastfoot)
+ << write_attribute("newpage", row_info[i].newpage)
<< ">\n";
- for (int j = 0; j < columns_; ++j) {
+ for (col_type j = 0; j < columns_; ++j) {
os << "<cell"
<< write_attribute("multicolumn", cell_info[i][j].multicolumn)
- << write_attribute("alignment", tostr(cell_info[i][j].alignment))
- << write_attribute("valignment", tostr(cell_info[i][j].valignment))
- << write_attribute("topline", tostr(cell_info[i][j].top_line))
- << write_attribute("bottomline", tostr(cell_info[i][j].bottom_line))
- << write_attribute("leftline", tostr(cell_info[i][j].left_line))
- << write_attribute("rightline", tostr(cell_info[i][j].right_line))
- << write_attribute("rotate", tostr(cell_info[i][j].rotate))
- << write_attribute("usebox", tostr(cell_info[i][j].usebox))
+ << write_attribute("alignment", cell_info[i][j].alignment)
+ << write_attribute("valignment", cell_info[i][j].valignment)
+ << write_attribute("topline", cell_info[i][j].top_line)
+ << write_attribute("bottomline", cell_info[i][j].bottom_line)
+ << write_attribute("leftline", cell_info[i][j].left_line)
+ << write_attribute("rightline", cell_info[i][j].right_line)
+ << write_attribute("rotate", cell_info[i][j].rotate)
+ << write_attribute("usebox", cell_info[i][j].usebox)
<< write_attribute("width", cell_info[i][j].p_width)
<< write_attribute("special", cell_info[i][j].align_special)
<< ">\n";
os << "\\begin_inset ";
- cell_info[i][j].inset.Write(buf, os);
- os << "\n\\end_inset \n"
+ cell_info[i][j].inset->write(buf, os);
+ os << "\n\\end_inset\n"
<< "</cell>\n";
}
os << "</row>\n";
}
-namespace {
-
-// I would have liked a fromstr template a lot better. (Lgb)
-
-inline
-bool string2type(string const str, LyXAlignment & num)
-{
- if (str == "none")
- num = LYX_ALIGN_NONE;
- else if (str == "block")
- num = LYX_ALIGN_BLOCK;
- else if (str == "left")
- num = LYX_ALIGN_LEFT;
- else if (str == "center")
- num = LYX_ALIGN_CENTER;
- else if (str == "right")
- num = LYX_ALIGN_RIGHT;
- else
- return false;
- return true;
-}
-
-
-inline
-bool string2type(string const str, LyXTabular::VAlignment & num)
-{
- if (str == "top")
- num = LyXTabular::LYX_VALIGN_TOP;
- else if (str == "center")
- num = LyXTabular::LYX_VALIGN_CENTER;
- else if (str == "bottom")
- num = LyXTabular::LYX_VALIGN_BOTTOM;
- else
- return false;
- return true;
-}
-
-
-inline
-bool string2type(string const str, LyXTabular::BoxType & num)
-{
- if (str == "none")
- num = LyXTabular::BOX_NONE;
- else if (str == "parbox")
- num = LyXTabular::BOX_PARBOX;
- else if (str == "minipage")
- num = LyXTabular::BOX_MINIPAGE;
- else
- return false;
- return true;
-}
-
-
-inline
-bool string2type(string const str, bool & num)
-{
- if (str == "true")
- num = true;
- else if (str == "false")
- num = false;
- else
- return false;
- return true;
-}
-
-
-bool getTokenValue(string const & str, const char * token, string & ret)
-{
- size_t token_length = std::strlen(token);
- string::size_type pos = str.find(token);
-
- if (pos == string::npos || pos + token_length + 1 >= str.length()
- || str[pos + token_length] != '=')
- return false;
- ret.erase();
- pos += token_length + 1;
- char ch = str[pos];
- if ((ch != '"') && (ch != '\'')) { // only read till next space
- ret += ch;
- ch = ' ';
- }
- while((pos < str.length() - 1) && (str[++pos] != ch))
- ret += str[pos];
-
- return true;
-}
-
-
-bool getTokenValue(string const & str, const char * token, int & num)
-{
- string tmp;
- if (!getTokenValue(str, token, tmp))
- return false;
- num = strToInt(tmp);
- return true;
-}
-
-
-bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
-{
- string tmp;
- if (!getTokenValue(str, token, tmp))
- return false;
- return string2type(tmp, num);
-}
-
-
-bool getTokenValue(string const & str, const char * token,
- LyXTabular::VAlignment & num)
-{
- string tmp;
- if (!getTokenValue(str, token, tmp))
- return false;
- return string2type(tmp, num);
-}
-
-
-bool getTokenValue(string const & str, const char * token,
- LyXTabular::BoxType & num)
-{
- string tmp;
- if (!getTokenValue(str, token, tmp))
- return false;
- return string2type(tmp, num);
-}
-
-
-bool getTokenValue(string const & str, const char * token, bool & flag)
-{
- string tmp;
- if (!getTokenValue(str, token, tmp))
- return false;
- return string2type(tmp, flag);
-}
-
-
-inline
-void l_getline(istream & is, string & str)
-{
- str.erase();
- while (str.empty()) {
- getline(is, str);
- if (!str.empty() && str[str.length() - 1] == '\r')
- str.erase(str.length() - 1);
- }
-}
-
-} // namespace anon
-
-
-void LyXTabular::Read(Buffer const * buf, LyXLex & lex)
+void LyXTabular::read(Buffer const & buf, LyXLex & lex)
{
string line;
istream & is = lex.getStream();
l_getline(is, line);
if (!prefixIs(line, "<lyxtabular ")
&& !prefixIs(line, "<LyXTabular ")) {
- OldFormatRead(lex, line);
+ BOOST_ASSERT(false);
return;
}
int version;
if (!getTokenValue(line, "version", version))
return;
- if (version == 1)
- ReadOld(buf, is, lex, line);
- else if (version == 2)
- ReadNew(buf, is, lex, line);
-}
-
+ BOOST_ASSERT(version >= 2);
-void LyXTabular::ReadNew(Buffer const * buf, istream & is,
- LyXLex & lex, string const & l)
-{
- string line(l);
int rows_arg;
if (!getTokenValue(line, "rows", rows_arg))
return;
int columns_arg;
if (!getTokenValue(line, "columns", columns_arg))
return;
- Init(rows_arg, columns_arg);
+ init(buf.params(), rows_arg, columns_arg);
l_getline(is, line);
if (!prefixIs(line, "<features")) {
- lyxerr << "Wrong tabular format (expected <features ...> got" <<
- line << ")" << endl;
+ lyxerr << "Wrong tabular format (expected <features ...> got"
+ << line << ')' << endl;
return;
}
getTokenValue(line, "rotate", rotate);
getTokenValue(line, "islongtable", is_long_tabular);
- getTokenValue(line, "endhead", endhead);
- getTokenValue(line, "endfirsthead", endfirsthead);
- getTokenValue(line, "endfoot", endfoot);
- getTokenValue(line, "endlastfoot", endlastfoot);
-
- for (int j = 0; j < columns_; ++j) {
+ getTokenValue(line, "firstHeadTopDL", endfirsthead.topDL);
+ getTokenValue(line, "firstHeadBottomDL", endfirsthead.bottomDL);
+ getTokenValue(line, "firstHeadEmpty", endfirsthead.empty);
+ getTokenValue(line, "headTopDL", endhead.topDL);
+ getTokenValue(line, "headBottomDL", endhead.bottomDL);
+ getTokenValue(line, "footTopDL", endfoot.topDL);
+ getTokenValue(line, "footBottomDL", endfoot.bottomDL);
+ getTokenValue(line, "lastFootTopDL", endlastfoot.topDL);
+ getTokenValue(line, "lastFootBottomDL", endlastfoot.bottomDL);
+ getTokenValue(line, "lastFootEmpty", endlastfoot.empty);
+
+ for (col_type j = 0; j < columns_; ++j) {
l_getline(is,line);
if (!prefixIs(line,"<column")) {
- lyxerr << "Wrong tabular format (expected <column ...> got" <<
- line << ")" << endl;
+ lyxerr << "Wrong tabular format (expected <column ...> got"
+ << line << ')' << endl;
return;
}
getTokenValue(line, "alignment", column_info[j].alignment);
getTokenValue(line, "special", column_info[j].align_special);
}
- for (int i = 0; i < rows_; ++i) {
+ for (row_type i = 0; i < rows_; ++i) {
l_getline(is, line);
if (!prefixIs(line, "<row")) {
- lyxerr << "Wrong tabular format (expected <row ...> got" <<
- line << ")" << endl;
+ lyxerr << "Wrong tabular format (expected <row ...> got"
+ << line << ')' << endl;
return;
}
getTokenValue(line, "topline", row_info[i].top_line);
getTokenValue(line, "bottomline", row_info[i].bottom_line);
+ getTokenValue(line, "endfirsthead", row_info[i].endfirsthead);
+ getTokenValue(line, "endhead", row_info[i].endhead);
+ getTokenValue(line, "endfoot", row_info[i].endfoot);
+ getTokenValue(line, "endlastfoot", row_info[i].endlastfoot);
getTokenValue(line, "newpage", row_info[i].newpage);
- for (int j = 0; j < columns_; ++j) {
+ for (col_type j = 0; j < columns_; ++j) {
l_getline(is, line);
if (!prefixIs(line, "<cell")) {
- lyxerr << "Wrong tabular format (expected <cell ...> got" <<
- line << ")" << endl;
+ lyxerr << "Wrong tabular format (expected <cell ...> got"
+ << line << ')' << endl;
return;
}
getTokenValue(line, "multicolumn", cell_info[i][j].multicolumn);
getTokenValue(line, "special", cell_info[i][j].align_special);
l_getline(is, line);
if (prefixIs(line, "\\begin_inset")) {
- cell_info[i][j].inset.Read(buf, lex);
+ cell_info[i][j].inset->read(buf, lex);
l_getline(is, line);
}
if (!prefixIs(line, "</cell>")) {
- lyxerr << "Wrong tabular format (expected </cell> got" <<
- line << ")" << endl;
+ lyxerr << "Wrong tabular format (expected </cell> got"
+ << line << ')' << endl;
return;
}
}
l_getline(is, line);
if (!prefixIs(line, "</row>")) {
- lyxerr << "Wrong tabular format (expected </row> got" <<
- line << ")" << endl;
+ lyxerr << "Wrong tabular format (expected </row> got"
+ << line << ')' << endl;
return;
}
}
}
-void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
+bool LyXTabular::isMultiColumn(idx_type cell) const
{
- int version;
- int i;
- int j;
- int rows_arg = 0;
- int columns_arg = 0;
- int is_long_tabular_arg = false;
- int rotate_arg = false;
- int a = -1;
- int b = -1;
- int c = -1;
- int d = -1;
- int e = 0;
- int f = 0;
- int g = 0;
-
- istream & is = lex.getStream();
- string s(fl);
- if (s.length() > 8)
- version = lyx::atoi(s.substr(8, string::npos));
- else
- version = 1;
-
- vector<int> cont_row_info;
-
- if (version < 5) {
- lyxerr << "Tabular format < 5 is not supported anymore\n"
- "Get an older version of LyX (< 1.1.x) for conversion!"
- << endl;
- WriteAlert(_("Warning:"),
- _("Tabular format < 5 is not supported anymore\n"),
- _("Get an older version of LyX (< 1.1.x) for conversion!"));
- if (version > 2) {
- is >> rows_arg >> columns_arg >> is_long_tabular_arg
- >> rotate_arg >> a >> b >> c >> d;
- } else
- is >> rows_arg >> columns_arg;
- Init(rows_arg, columns_arg);
- cont_row_info = vector<int>(rows_arg);
- SetLongTabular(is_long_tabular_arg);
- SetRotateTabular(rotate_arg);
- string tmp;
- for (i = 0; i < rows_; ++i) {
- getline(is, tmp);
- cont_row_info[i] = false;
- }
- for (i = 0; i < columns_; ++i) {
- getline(is, tmp);
- }
- for (i = 0; i < rows_; ++i) {
- for (j = 0; j < columns_; ++j) {
- getline(is, tmp);
- }
- }
- } else {
- is >> rows_arg >> columns_arg >> is_long_tabular_arg
- >> rotate_arg >> a >> b >> c >> d;
- Init(rows_arg, columns_arg);
- cont_row_info = vector<int>(rows_arg);
- SetLongTabular(is_long_tabular_arg);
- SetRotateTabular(rotate_arg);
- endhead = a + 1;
- endfirsthead = b + 1;
- endfoot = c + 1;
- endlastfoot = d + 1;
- for (i = 0; i < rows_; ++i) {
- a = b = c = d = e = f = g = 0;
- is >> a >> b >> c >> d;
- row_info[i].top_line = a;
- row_info[i].bottom_line = b;
- cont_row_info[i] = c;
- row_info[i].newpage = d;
- }
- for (i = 0; i < columns_; ++i) {
- string s1;
- string s2;
- is >> a >> b >> c;
-#if 1
- char ch; // skip '"'
- is >> ch;
-#else
- // ignore is buggy but we will use it later (Lgb)
- is.ignore(); // skip '"'
-#endif
- getline(is, s1, '"');
-#if 1
- is >> ch; // skip '"'
-#else
- // ignore is buggy but we will use it later (Lgb)
- is.ignore(); // skip '"'
-#endif
- getline(is, s2, '"');
- column_info[i].alignment = static_cast<LyXAlignment>(a);
- column_info[i].left_line = b;
- column_info[i].right_line = c;
- column_info[i].p_width = s1;
- column_info[i].align_special = s2;
- }
- for (i = 0; i < rows_; ++i) {
- for (j = 0; j < columns_; ++j) {
- string s1;
- string s2;
- is >> a >> b >> c >> d >> e >> f >> g;
-#if 1
- char ch;
- is >> ch; // skip '"'
-#else
- // ignore is buggy but we will use it later (Lgb)
- is.ignore(); // skip '"'
-#endif
- getline(is, s1, '"');
-#if 1
- is >> ch; // skip '"'
-#else
- // ignore is buggy but we will use it later (Lgb)
- is.ignore(); // skip '"'
-#endif
- getline(is, s2, '"');
- cell_info[i][j].multicolumn = static_cast<char>(a);
- cell_info[i][j].alignment = static_cast<LyXAlignment>(b);
- cell_info[i][j].top_line = static_cast<char>(c);
- cell_info[i][j].bottom_line = static_cast<char>(d);
- cell_info[i][j].left_line = column_info[j].left_line;
- cell_info[i][j].right_line = column_info[j].right_line;
- cell_info[i][j].rotate = static_cast<bool>(f);
- cell_info[i][j].usebox = static_cast<BoxType>(g);
- cell_info[i][j].align_special = s1;
- cell_info[i][j].p_width = s2;
- }
- }
- }
- set_row_column_number_info(true);
-
- LyXParagraph * par = new LyXParagraph;
- LyXParagraph * return_par = 0;
-
- string tmptok;
- int pos = 0;
- char depth = 0;
- LyXFont font(LyXFont::ALL_INHERIT);
- font.setLanguage(owner_->BufferOwner()->GetLanguage());
-
- while (lex.IsOK()) {
- lex.nextToken();
- string const token = lex.GetString();
- if (token.empty())
- continue;
- if (token == "\\layout"
- || token == "\\end_float"
- || token == "\\end_deeper") {
- lex.pushToken(token);
- break;
- }
- if (owner_->BufferOwner()->parseSingleLyXformat2Token(lex, par,
- return_par,
- token, pos,
- depth, font)) {
- // the_end read
- lex.pushToken(token);
- break;
- }
- if (return_par) {
- lex.printError("New Paragraph allocated! This should not happen!");
- lex.pushToken(token);
- delete par;
- par = return_par;
- break;
- }
- }
- // now we have the par we should fill the insets with this!
- int cell = 0;
- InsetText * inset = GetCellInset(cell);
- int row;
-
- for (int i = 0; i < par->size(); ++i) {
- if (par->IsNewline(i)) {
- ++cell;
- if (cell > GetNumberOfCells()) {
- lyxerr << "Some error in reading old table format occured!" <<
- endl << "Terminating when reading cell[" << cell << "]!" <<
- endl;
- delete par;
- return;
- }
- row = row_of_cell(cell);
- if (cont_row_info[row]) {
- DeleteRow(row);
- cont_row_info.erase(cont_row_info.begin() + row); //&cont_row_info[row]);
- while(!IsFirstCellInRow(--cell));
- } else {
- inset = GetCellInset(cell);
- continue;
- }
- inset = GetCellInset(cell);
- row = row_of_cell(cell);
- if (!cell_info[row_of_cell(cell)][column_of_cell(cell)].usebox)
- {
- // insert a space instead
- par->Erase(i);
- par->InsertChar(i, ' ');
- }
- }
- par->CopyIntoMinibuffer(*owner_->BufferOwner(), i);
- inset->par->InsertFromMinibuffer(inset->par->size());
- }
- delete par;
- Reinit();
+ return cellinfo_of_cell(cell).multicolumn != LyXTabular::CELL_NORMAL;
}
-bool LyXTabular::IsMultiColumn(int cell, bool real) const
+bool LyXTabular::isMultiColumnReal(idx_type cell) const
{
- return ((!real || (column_of_cell(cell) != right_column_of_cell(cell))) &&
- (cellinfo_of_cell(cell)->multicolumn != LyXTabular::CELL_NORMAL));
+ return column_of_cell(cell) != right_column_of_cell(cell) &&
+ cellinfo_of_cell(cell).multicolumn != LyXTabular::CELL_NORMAL;
}
-LyXTabular::cellstruct * LyXTabular::cellinfo_of_cell(int cell) const
+LyXTabular::cellstruct & LyXTabular::cellinfo_of_cell(idx_type cell) const
{
- int const row = row_of_cell(cell);
- int const column = column_of_cell(cell);
- return &cell_info[row][column];
+ return cell_info[row_of_cell(cell)][column_of_cell(cell)];
}
-void LyXTabular::SetMultiColumn(int cell, int number)
+void LyXTabular::setMultiColumn(Buffer * buffer, idx_type cell,
+ idx_type number)
{
- cellinfo_of_cell(cell)->multicolumn = CELL_BEGIN_OF_MULTICOLUMN;
- cellinfo_of_cell(cell)->alignment = column_info[column_of_cell(cell)].alignment;
- cellinfo_of_cell(cell)->top_line = row_info[row_of_cell(cell)].top_line;
- cellinfo_of_cell(cell)->bottom_line = row_info[row_of_cell(cell)].bottom_line;
- for (number--; number > 0; --number) {
- cellinfo_of_cell(cell+number)->multicolumn = CELL_PART_OF_MULTICOLUMN;
+ cellstruct & cs = cellinfo_of_cell(cell);
+ cs.multicolumn = CELL_BEGIN_OF_MULTICOLUMN;
+ cs.alignment = column_info[column_of_cell(cell)].alignment;
+ cs.top_line = row_info[row_of_cell(cell)].top_line;
+ cs.bottom_line = row_info[row_of_cell(cell)].bottom_line;
+ cs.right_line = column_info[column_of_cell(cell+number-1)].right_line;
+ for (idx_type 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());
+ cs1.inset->clear(false);
}
set_row_column_number_info();
}
-int LyXTabular::cells_in_multicolumn(int cell) const
+LyXTabular::idx_type LyXTabular::cells_in_multicolumn(idx_type cell) const
{
- int const row = row_of_cell(cell);
- int column = column_of_cell(cell);
- int result = 1;
+ row_type const row = row_of_cell(cell);
+ col_type column = column_of_cell(cell);
+ idx_type result = 1;
++column;
- while ((column < columns_) &&
+ while (column < columns_ &&
cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN)
{
++result;
}
-int LyXTabular::UnsetMultiColumn(int cell)
+LyXTabular::idx_type LyXTabular::unsetMultiColumn(idx_type cell)
{
- int const row = row_of_cell(cell);
- int column = column_of_cell(cell);
-
- int result = 0;
-
+ row_type const row = row_of_cell(cell);
+ col_type column = column_of_cell(cell);
+
+ idx_type result = 0;
+
if (cell_info[row][column].multicolumn == CELL_BEGIN_OF_MULTICOLUMN) {
cell_info[row][column].multicolumn = CELL_NORMAL;
++column;
- while ((column < columns_) &&
- (cell_info[row][column].multicolumn ==CELL_PART_OF_MULTICOLUMN))
+ while (column < columns_ &&
+ cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN)
{
cell_info[row][column].multicolumn = CELL_NORMAL;
++column;
}
-void LyXTabular::SetLongTabular(bool what)
+void LyXTabular::setLongTabular(bool what)
{
is_long_tabular = what;
}
-bool LyXTabular::IsLongTabular() const
+bool LyXTabular::isLongTabular() const
{
return is_long_tabular;
}
-void LyXTabular::SetRotateTabular(bool flag)
+void LyXTabular::setRotateTabular(bool flag)
{
rotate = flag;
}
-bool LyXTabular::GetRotateTabular() const
+bool LyXTabular::getRotateTabular() const
{
return rotate;
}
-void LyXTabular::SetRotateCell(int cell, bool flag)
+void LyXTabular::setRotateCell(idx_type cell, bool flag)
{
- cellinfo_of_cell(cell)->rotate = flag;
+ cellinfo_of_cell(cell).rotate = flag;
}
-bool LyXTabular::GetRotateCell(int cell) const
+bool LyXTabular::getRotateCell(idx_type cell) const
{
- return cellinfo_of_cell(cell)->rotate;
+ return cellinfo_of_cell(cell).rotate;
}
-bool LyXTabular::NeedRotating() const
+bool LyXTabular::needRotating() const
{
if (rotate)
return true;
- for (int i = 0; i < rows_; ++i) {
- for (int j = 0; j < columns_; ++j) {
+ for (row_type i = 0; i < rows_; ++i)
+ for (col_type j = 0; j < columns_; ++j)
if (cell_info[i][j].rotate)
return true;
- }
- }
return false;
}
-bool LyXTabular::IsLastCell(int cell) const
+bool LyXTabular::isLastCell(idx_type cell) const
{
- if ((cell + 1) < GetNumberOfCells())
+ if (cell + 1 < numberofcells)
return false;
return true;
}
-int LyXTabular::GetCellAbove(int cell) const
+LyXTabular::idx_type LyXTabular::getCellAbove(idx_type cell) const
{
if (row_of_cell(cell) > 0)
return cell_info[row_of_cell(cell)-1][column_of_cell(cell)].cellno;
}
-int LyXTabular::GetCellBelow(int cell) const
+LyXTabular::idx_type LyXTabular::getCellBelow(idx_type cell) const
{
if (row_of_cell(cell) + 1 < rows_)
return cell_info[row_of_cell(cell)+1][column_of_cell(cell)].cellno;
}
-int LyXTabular::GetLastCellAbove(int cell) const
+LyXTabular::idx_type LyXTabular::getLastCellAbove(idx_type cell) const
{
- if (row_of_cell(cell) <= 0)
+ if (row_of_cell(cell) == 0)
return cell;
- if (!IsMultiColumn(cell))
- return GetCellAbove(cell);
+ if (!isMultiColumn(cell))
+ return getCellAbove(cell);
return cell_info[row_of_cell(cell) - 1][right_column_of_cell(cell)].cellno;
}
-int LyXTabular::GetLastCellBelow(int cell) const
+LyXTabular::idx_type LyXTabular::getLastCellBelow(idx_type cell) const
{
if (row_of_cell(cell) + 1 >= rows_)
return cell;
- if (!IsMultiColumn(cell))
- return GetCellBelow(cell);
+ if (!isMultiColumn(cell))
+ return getCellBelow(cell);
return cell_info[row_of_cell(cell) + 1][right_column_of_cell(cell)].cellno;
}
-int LyXTabular::GetCellNumber(int row, int column) const
+LyXTabular::idx_type LyXTabular::getCellNumber(row_type row,
+ col_type column) const
+{
+ BOOST_ASSERT(column != npos && column < columns_ &&
+ row != npos && row < rows_);
+ return cell_info[row][column].cellno;
+}
+
+
+void LyXTabular::setUsebox(idx_type cell, BoxType type)
+{
+ cellinfo_of_cell(cell).usebox = type;
+}
+
+
+LyXTabular::BoxType LyXTabular::getUsebox(idx_type cell) const
+{
+ if (column_info[column_of_cell(cell)].p_width.zero() &&
+ !(isMultiColumn(cell) && !cellinfo_of_cell(cell).p_width.zero()))
+ return BOX_NONE;
+ if (cellinfo_of_cell(cell).usebox > 1)
+ return cellinfo_of_cell(cell).usebox;
+ return useParbox(cell);
+}
+
+
+///
+// This are functions used for the longtable support
+///
+void LyXTabular::setLTHead(row_type row, bool flag, ltType const & hd,
+ bool first)
{
- if (column >= columns_)
- column = columns_ - 1;
- else if (column < 0)
- column = 0;
- if (row >= rows_)
- row = rows_ - 1;
- else if (row < 0)
- row = 0;
-
- return cell_info[row][column].cellno;
+ if (first) {
+ endfirsthead = hd;
+ if (hd.set)
+ row_info[row].endfirsthead = flag;
+ } else {
+ endhead = hd;
+ if (hd.set)
+ row_info[row].endhead = flag;
+ }
}
-void LyXTabular::SetUsebox(int cell, BoxType type)
+bool LyXTabular::getRowOfLTHead(row_type row, ltType & hd) const
{
- cellinfo_of_cell(cell)->usebox = type;
+ hd = endhead;
+ hd.set = haveLTHead();
+ return row_info[row].endhead;
}
-LyXTabular::BoxType LyXTabular::GetUsebox(int cell) const
+bool LyXTabular::getRowOfLTFirstHead(row_type row, ltType & hd) const
{
- if (column_info[column_of_cell(cell)].p_width.empty() &&
- !(IsMultiColumn(cell) && !cellinfo_of_cell(cell)->p_width.empty()))
- return BOX_NONE;
- if (cellinfo_of_cell(cell)->usebox > 1)
- return cellinfo_of_cell(cell)->usebox;
- return UseParbox(cell);
+ hd = endfirsthead;
+ hd.set = haveLTFirstHead();
+ return row_info[row].endfirsthead;
}
-void LyXTabular::SetLTHead(int cell, bool first)
+void LyXTabular::setLTFoot(row_type row, bool flag, ltType const & fd,
+ bool last)
{
- int const row = row_of_cell(cell);
- int const val = (row + 1) * (column_of_cell(cell) ? 1 : -1);
-
- if (first) {
- if (endfirsthead == val)
- endfirsthead = 0;
- else
- endfirsthead = val;
+ if (last) {
+ endlastfoot = fd;
+ if (fd.set)
+ row_info[row].endlastfoot = flag;
} else {
- if (endhead == val)
- endhead = 0;
- else
- endhead = val;
+ endfoot = fd;
+ if (fd.set)
+ row_info[row].endfoot = flag;
}
}
-bool LyXTabular::GetRowOfLTHead(int cell, int & row) const
+bool LyXTabular::getRowOfLTFoot(row_type row, ltType & fd) const
{
- row = endhead;
- if (abs(endhead) > rows_)
- return false;
- return (row_of_cell(cell) == abs(endhead) - 1);
+ fd = endfoot;
+ fd.set = haveLTFoot();
+ return row_info[row].endfoot;
}
-bool LyXTabular::GetRowOfLTFirstHead(int cell, int & row) const
+bool LyXTabular::getRowOfLTLastFoot(row_type row, ltType & fd) const
{
- row = endfirsthead;
- if (abs(endfirsthead) > rows_)
- return false;
- return (row_of_cell(cell) == abs(endfirsthead) - 1);
+ fd = endlastfoot;
+ fd.set = haveLTLastFoot();
+ return row_info[row].endlastfoot;
}
-void LyXTabular::SetLTFoot(int cell, bool last)
+void LyXTabular::setLTNewPage(row_type row, bool what)
{
- int const row = row_of_cell(cell);
- int const val = (row + 1) * (column_of_cell(cell) ? 1 : -1);
+ row_info[row].newpage = what;
+}
- if (last) {
- if (endlastfoot == val)
- endlastfoot = 0;
- else
- endlastfoot = val;
- } else {
- if (endfoot == val)
- endfoot = 0;
- else
- endfoot = val;
- }
+
+bool LyXTabular::getLTNewPage(row_type row) const
+{
+ return row_info[row].newpage;
}
-bool LyXTabular::GetRowOfLTFoot(int cell, int & row) const
+bool LyXTabular::haveLTHead() const
{
- row = endfoot;
- if ((endfoot + 1) > rows_)
- return false;
- return (row_of_cell(cell) == abs(endfoot) - 1);
+ for (row_type i = 0; i < rows_; ++i)
+ if (row_info[i].endhead)
+ return true;
+ return false;
}
-bool LyXTabular::GetRowOfLTLastFoot(int cell, int & row) const
+bool LyXTabular::haveLTFirstHead() const
{
- row = endlastfoot;
- if (abs(endlastfoot) > rows_)
+ if (endfirsthead.empty)
return false;
- return (row_of_cell(cell) == (abs(endlastfoot)-1));
+ for (row_type i = 0; i < rows_; ++i)
+ if (row_info[i].endfirsthead)
+ return true;
+ return false;
}
-void LyXTabular::SetLTNewPage(int cell, bool what)
+bool LyXTabular::haveLTFoot() const
{
- row_info[row_of_cell(cell)].newpage = what;
+ for (row_type i = 0; i < rows_; ++i)
+ if (row_info[i].endfoot)
+ return true;
+ return false;
}
-bool LyXTabular::GetLTNewPage(int cell) const
+bool LyXTabular::haveLTLastFoot() const
{
- return row_info[row_of_cell(cell)].newpage;
+ if (endlastfoot.empty)
+ return false;
+ for (row_type i = 0; i < rows_; ++i)
+ if (row_info[i].endlastfoot)
+ return true;
+ return false;
}
-bool LyXTabular::SetAscentOfRow(int row, int height)
+// end longtable support functions
+
+void LyXTabular::setAscentOfRow(row_type row, int height)
{
- if ((row >= rows_) || (row_info[row].ascent_of_row == height))
- return false;
+ if (row >= rows_ || row_info[row].ascent_of_row == height)
+ return;
row_info[row].ascent_of_row = height;
- return true;
}
-bool LyXTabular::SetDescentOfRow(int row, int height)
+void LyXTabular::setDescentOfRow(row_type row, int height)
{
- if ((row >= rows_) || (row_info[row].descent_of_row == height))
- return false;
+ if (row >= rows_ || row_info[row].descent_of_row == height)
+ return;
row_info[row].descent_of_row = height;
- return true;
}
-int LyXTabular::GetAscentOfRow(int row) const
+int LyXTabular::getAscentOfRow(row_type row) const
{
if (row >= rows_)
return 0;
}
-int LyXTabular::GetDescentOfRow(int row) const
+int LyXTabular::getDescentOfRow(row_type row) const
{
- if (row >= rows_)
- return 0;
+ BOOST_ASSERT(row < rows_);
return row_info[row].descent_of_row;
}
-int LyXTabular::GetHeightOfTabular() const
+int LyXTabular::getHeightOfTabular() const
{
int height = 0;
-
- for (int row = 0; row < rows_; ++row)
- height += GetAscentOfRow(row) + GetDescentOfRow(row) +
- GetAdditionalHeight(row);
+ for (row_type row = 0; row < rows_; ++row)
+ height += getAscentOfRow(row) + getDescentOfRow(row) +
+ getAdditionalHeight(row);
return height;
}
-bool LyXTabular::IsPartOfMultiColumn(int row, int column) const
+bool LyXTabular::isPartOfMultiColumn(row_type row, col_type column) const
{
- if ((row >= rows_) || (column >= columns_))
- return false;
- return (cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN);
+ 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
+int LyXTabular::TeXTopHLine(ostream & os, row_type row) const
{
- if ((row < 0) || (row >= rows_))
- return 0;
+ // FIXME: assert or return 0 as in TeXBottomHLine()?
+ BOOST_ASSERT(row != npos);
+ BOOST_ASSERT(row < rows_);
- int const fcell = GetFirstCellInRow(row);
- int const n = NumberOfCellsInRow(fcell) + fcell;
- int tmp = 0;
+ idx_type const fcell = getFirstCellInRow(row);
+ idx_type const n = numberOfCellsInRow(fcell) + fcell;
+ idx_type tmp = 0;
- for (int i = fcell; i < n; ++i) {
- if (TopLine(i))
+ for (idx_type i = fcell; i < n; ++i) {
+ if (topLine(i))
++tmp;
}
- if (tmp == (n - fcell)){
+ if (tmp == n - fcell) {
os << "\\hline ";
} else if (tmp) {
- for (int i = fcell; i < n; ++i) {
- if (TopLine(i)) {
+ for (idx_type i = fcell; i < n; ++i) {
+ if (topLine(i)) {
os << "\\cline{"
<< column_of_cell(i) + 1
<< '-'
}
-int LyXTabular::TeXBottomHLine(ostream & os, int row) const
+int LyXTabular::TeXBottomHLine(ostream & os, row_type row) const
{
- if ((row < 0) || (row >= rows_))
+ // FIXME: return 0 or assert as in TeXTopHLine()?
+ if (row == npos || row >= rows_)
return 0;
- int const fcell = GetFirstCellInRow(row);
- int const n = NumberOfCellsInRow(fcell) + fcell;
- int tmp = 0;
+ idx_type const fcell = getFirstCellInRow(row);
+ idx_type const n = numberOfCellsInRow(fcell) + fcell;
+ idx_type tmp = 0;
- for (int i = fcell; i < n; ++i) {
- if (BottomLine(i))
+ for (idx_type i = fcell; i < n; ++i) {
+ if (bottomLine(i))
++tmp;
}
- if (tmp == (n-fcell)){
+ if (tmp == n - fcell) {
os << "\\hline";
} else if (tmp) {
- for (int i = fcell; i < n; ++i) {
- if (BottomLine(i)) {
+ for (idx_type i = fcell; i < n; ++i) {
+ if (bottomLine(i)) {
os << "\\cline{"
<< column_of_cell(i) + 1
<< '-'
}
-int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
+int LyXTabular::TeXCellPreamble(ostream & os, idx_type cell) const
{
int ret = 0;
- if (GetRotateCell(cell)) {
+ if (getRotateCell(cell)) {
os << "\\begin{sideways}\n";
++ret;
}
- if (IsMultiColumn(cell)) {
+ if (isMultiColumn(cell)) {
os << "\\multicolumn{" << cells_in_multicolumn(cell) << "}{";
- if (!cellinfo_of_cell(cell)->align_special.empty()) {
- os << cellinfo_of_cell(cell)->align_special << "}{";
+ if (!cellinfo_of_cell(cell).align_special.empty()) {
+ os << cellinfo_of_cell(cell).align_special << "}{";
} else {
- if (LeftLine(cell) &&
- (IsFirstCellInRow(cell) ||
- (!IsMultiColumn(cell-1) && !LeftLine(cell, true) &&
- !RightLine(cell-1, true))))
+ if (leftLine(cell) &&
+ (isFirstCellInRow(cell) ||
+ (!isMultiColumn(cell - 1) && !leftLine(cell, true) &&
+ !rightLine(cell - 1, true))))
{
os << '|';
}
- if (!GetPWidth(cell).empty()) {
- switch (GetVAlignment(cell)) {
+ if (!getPWidth(cell).zero()) {
+ switch (getVAlignment(cell)) {
case LYX_VALIGN_TOP:
- os << "p";
+ os << 'p';
break;
- case LYX_VALIGN_CENTER:
- os << "m";
+ case LYX_VALIGN_MIDDLE:
+ os << 'm';
break;
case LYX_VALIGN_BOTTOM:
- os << "b";
+ os << 'b';
break;
}
- os << "{" << GetPWidth(cell) << '}';
+ os << '{'
+ << getPWidth(cell).asLatexString()
+ << '}';
} else {
- switch (GetAlignment(cell)) {
+ switch (getAlignment(cell)) {
case LYX_ALIGN_LEFT:
os << 'l';
break;
break;
}
}
- if (RightLine(cell))
+ if (rightLine(cell))
os << '|';
- if (((cell + 1) < numberofcells) && !IsFirstCellInRow(cell+1) &&
- LeftLine(cell+1))
+ if (((cell + 1) < numberofcells) && !isFirstCellInRow(cell+1) &&
+ leftLine(cell+1))
os << '|';
os << "}{";
}
}
- if (GetUsebox(cell) == BOX_PARBOX) {
+ if (getUsebox(cell) == BOX_PARBOX) {
os << "\\parbox[";
- switch (GetVAlignment(cell)) {
+ switch (getVAlignment(cell)) {
case LYX_VALIGN_TOP:
- os << "t";
+ os << 't';
break;
- case LYX_VALIGN_CENTER:
- os << "c";
+ case LYX_VALIGN_MIDDLE:
+ os << 'c';
break;
case LYX_VALIGN_BOTTOM:
- os << "b";
+ os << 'b';
break;
}
- os << "]{" << GetPWidth(cell) << "}{";
- } else if (GetUsebox(cell) == BOX_MINIPAGE) {
+ os << "]{" << getPWidth(cell).asLatexString() << "}{";
+ } else if (getUsebox(cell) == BOX_MINIPAGE) {
os << "\\begin{minipage}[";
- switch (GetVAlignment(cell)) {
+ switch (getVAlignment(cell)) {
case LYX_VALIGN_TOP:
- os << "t";
+ os << 't';
break;
- case LYX_VALIGN_CENTER:
- os << "m";
+ case LYX_VALIGN_MIDDLE:
+ os << 'm';
break;
case LYX_VALIGN_BOTTOM:
- os << "b";
+ os << 'b';
break;
}
- os << "]{" << GetPWidth(cell) << "}\n";
+ os << "]{" << getPWidth(cell).asLatexString() << "}\n";
++ret;
}
return ret;
}
-int LyXTabular::TeXCellPostamble(ostream & os, int cell) const
+int LyXTabular::TeXCellPostamble(ostream & os, idx_type cell) const
{
int ret = 0;
// usual cells
- if (GetUsebox(cell) == BOX_PARBOX)
- os << "}";
- else if (GetUsebox(cell) == BOX_MINIPAGE) {
+ if (getUsebox(cell) == BOX_PARBOX)
+ os << '}';
+ else if (getUsebox(cell) == BOX_MINIPAGE) {
os << "%\n\\end{minipage}";
ret += 2;
}
- if (IsMultiColumn(cell)){
+ if (isMultiColumn(cell)) {
os << '}';
}
- if (GetRotateCell(cell)) {
+ if (getRotateCell(cell)) {
os << "%\n\\end{sideways}";
++ret;
}
}
-int LyXTabular::Latex(Buffer const * buf,
- ostream & os, bool fragile, bool fp) const
+int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const & buf,
+ OutputParams const & runparams) const
+{
+ if (!is_long_tabular)
+ return 0;
+
+ int ret = 0;
+ // output header info
+ if (haveLTHead()) {
+ if (endhead.topDL) {
+ os << "\\hline\n";
+ ++ret;
+ }
+ for (row_type i = 0; i < rows_; ++i) {
+ if (row_info[i].endhead) {
+ ret += TeXRow(os, i, buf, runparams);
+ }
+ }
+ if (endhead.bottomDL) {
+ os << "\\hline\n";
+ ++ret;
+ }
+ os << "\\endhead\n";
+ ++ret;
+ if (endfirsthead.empty) {
+ os << "\\endfirsthead\n";
+ ++ret;
+ }
+ }
+ // output firstheader info
+ if (haveLTFirstHead()) {
+ if (endfirsthead.topDL) {
+ os << "\\hline\n";
+ ++ret;
+ }
+ for (row_type i = 0; i < rows_; ++i) {
+ if (row_info[i].endfirsthead) {
+ ret += TeXRow(os, i, buf, runparams);
+ }
+ }
+ if (endfirsthead.bottomDL) {
+ os << "\\hline\n";
+ ++ret;
+ }
+ os << "\\endfirsthead\n";
+ ++ret;
+ }
+ // output footer info
+ if (haveLTFoot()) {
+ if (endfoot.topDL) {
+ os << "\\hline\n";
+ ++ret;
+ }
+ for (row_type i = 0; i < rows_; ++i) {
+ if (row_info[i].endfoot) {
+ ret += TeXRow(os, i, buf, runparams);
+ }
+ }
+ if (endfoot.bottomDL) {
+ os << "\\hline\n";
+ ++ret;
+ }
+ os << "\\endfoot\n";
+ ++ret;
+ if (endlastfoot.empty) {
+ os << "\\endlastfoot\n";
+ ++ret;
+ }
+ }
+ // output lastfooter info
+ if (haveLTLastFoot()) {
+ if (endlastfoot.topDL) {
+ os << "\\hline\n";
+ ++ret;
+ }
+ for (row_type i = 0; i < rows_; ++i) {
+ if (row_info[i].endlastfoot) {
+ ret += TeXRow(os, i, buf, runparams);
+ }
+ }
+ if (endlastfoot.bottomDL) {
+ os << "\\hline\n";
+ ++ret;
+ }
+ os << "\\endlastfoot\n";
+ ++ret;
+ }
+ return ret;
+}
+
+
+bool LyXTabular::isValidRow(row_type row) const
+{
+ if (!is_long_tabular)
+ return true;
+ return !row_info[row].endhead && !row_info[row].endfirsthead &&
+ !row_info[row].endfoot && !row_info[row].endlastfoot;
+}
+
+
+int LyXTabular::TeXRow(ostream & os, row_type i, Buffer const & buf,
+ OutputParams const & runparams) const
+{
+ idx_type cell = getCellNumber(i, 0);
+
+ int ret = TeXTopHLine(os, i);
+ for (col_type j = 0; j < columns_; ++j) {
+ if (isPartOfMultiColumn(i, j))
+ continue;
+ ret += TeXCellPreamble(os, cell);
+ shared_ptr<InsetText> inset = getCellInset(cell);
+
+ Paragraph const & par = inset->paragraphs().front();
+ bool rtl = par.isRightToLeftPar(buf.params())
+ && !par.empty()
+ && getPWidth(cell).zero();
+
+ if (rtl)
+ os << "\\R{";
+ ret += inset->latex(buf, os, runparams);
+ if (rtl)
+ os << '}';
+
+ ret += TeXCellPostamble(os, cell);
+ if (!isLastCellInRow(cell)) { // not last cell in row
+ os << "&\n";
+ ++ret;
+ }
+ ++cell;
+ }
+ os << "\\tabularnewline\n";
+ ++ret;
+ ret += TeXBottomHLine(os, i);
+ return ret;
+}
+
+
+int LyXTabular::latex(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
int ret = 0;
- int cell = 0;
//+---------------------------------------------------------------------
//+ first the opening preamble +
os << "\\begin{longtable}{";
else
os << "\\begin{tabular}{";
- for (int i = 0; i < columns_; ++i) {
- if (column_info[i].left_line)
- os << '|';
+ for (col_type i = 0; i < columns_; ++i) {
if (!column_info[i].align_special.empty()) {
os << column_info[i].align_special;
- } else if (!column_info[i].p_width.empty()) {
- switch (column_info[i].valignment) {
- case LYX_VALIGN_TOP:
- os << "p";
- break;
- case LYX_VALIGN_CENTER:
- os << "m";
- break;
- case LYX_VALIGN_BOTTOM:
- os << "b";
- break;
- }
- os << "{"
- << column_info[i].p_width
- << '}';
} else {
- switch (column_info[i].alignment) {
- case LYX_ALIGN_LEFT:
- os << 'l';
- break;
- case LYX_ALIGN_RIGHT:
- os << 'r';
- break;
- default:
- os << 'c';
- break;
+ if (column_info[i].left_line)
+ os << '|';
+ if (!column_info[i].p_width.zero()) {
+ switch (column_info[i].alignment) {
+ case LYX_ALIGN_LEFT:
+ os << ">{\\raggedright}";
+ break;
+ case LYX_ALIGN_RIGHT:
+ os << ">{\\raggedleft}";
+ break;
+ case LYX_ALIGN_CENTER:
+ os << ">{\\centering}";
+ break;
+ case LYX_ALIGN_NONE:
+ case LYX_ALIGN_BLOCK:
+ case LYX_ALIGN_LAYOUT:
+ case LYX_ALIGN_SPECIAL:
+ break;
+ }
+
+ switch (column_info[i].valignment) {
+ case LYX_VALIGN_TOP:
+ os << 'p';
+ break;
+ case LYX_VALIGN_MIDDLE:
+ os << 'm';
+ break;
+ case LYX_VALIGN_BOTTOM:
+ os << 'b';
+ break;
+ }
+ os << '{'
+ << column_info[i].p_width.asLatexString()
+ << '}';
+ } else {
+ switch (column_info[i].alignment) {
+ case LYX_ALIGN_LEFT:
+ os << 'l';
+ break;
+ case LYX_ALIGN_RIGHT:
+ os << 'r';
+ break;
+ default:
+ os << 'c';
+ break;
+ }
}
+ if (column_info[i].right_line)
+ os << '|';
}
- if (column_info[i].right_line)
- os << '|';
}
os << "}\n";
++ret;
+ ret += TeXLongtableHeaderFooter(os, buf, runparams);
+
//+---------------------------------------------------------------------
//+ the single row and columns (cells) +
//+---------------------------------------------------------------------
- for (int i = 0; i < rows_; ++i) {
- ret += TeXTopHLine(os, i);
- int bret = ret;
- if (IsLongTabular()) {
- if ((endhead < 0) && (i == (abs(endhead)-1))) {
- os << "\\endhead\n";
- ++ret;
- }
- if ((endfirsthead < 0) && (i == (abs(endfirsthead)-1))) {
- os << "\\endfirsthead\n";
- ++ret;
- }
- if ((endfoot < 0) && (i == (abs(endfoot)-1))) {
- os << "\\endfoot\n";
- ++ret;
- }
- if ((endlastfoot < 0) && (i == (abs(endlastfoot)-1))) {
- os << "\\endlastfoot\n";
- ++ret;
- }
- }
- if (ret > bret) {
- ret += TeXBottomHLine(os, i-1);
- ret += TeXTopHLine(os, i);
- }
- for (int j = 0; j < columns_; ++j) {
- if (IsPartOfMultiColumn(i,j))
- continue;
- ret += TeXCellPreamble(os, cell);
- InsetText * inset = GetCellInset(cell);
-
- bool rtl = inset->par->isRightToLeftPar(buf->params) &&
- inset->par->size() > 0 && GetPWidth(cell).empty();
-
- if (rtl)
- os << "\\R{";
- ret += inset->Latex(buf, os, fragile, fp);
- if (rtl)
- os << "}";
-
- ret += TeXCellPostamble(os, cell);
- if (!IsLastCellInRow(cell)) { // not last cell in row
- os << "&\n";
- ++ret;
- }
- ++cell;
- }
- os << "\\\\\n";
- ret += TeXBottomHLine(os, i);
- bret = ret;
- if (IsLongTabular()) {
- if ((endhead > 0) && (i == (endhead - 1))) {
- os << "\\endhead\n";
- ++ret;
- }
- if ((endfirsthead > 0) && (i == (endfirsthead - 1))) {
- os << "\\endfirsthead\n";
- ++ret;
- }
- if ((endfoot > 0) && (i == (endfoot - 1))) {
- os << "\\endfoot\n";
- ++ret;
- }
- if ((endlastfoot > 0) && (i == (endlastfoot - 1))) {
- os << "\\endlastfoot\n";
- ++ret;
- }
-// if (ret > bret)
-// ret += TeXBottomHLine(os, i);
- if (row_info[i].newpage) {
+ for (row_type i = 0; i < rows_; ++i) {
+ if (isValidRow(i)) {
+ ret += TeXRow(os, i, buf, runparams);
+ if (is_long_tabular && row_info[i].newpage) {
os << "\\newpage\n";
++ret;
}
}
-int LyXTabular::DocBook(Buffer const * buf, ostream & os) const
+int LyXTabular::linuxdoc(Buffer const & buf, ostream & os,
+ const OutputParams & runparams) const
+{
+ os << "<tabular ca=\"";
+ for (col_type i = 0; i < columns_; ++i) {
+ switch (column_info[i].alignment) {
+ case LYX_ALIGN_LEFT:
+ os << 'l';
+ break;
+ case LYX_ALIGN_RIGHT:
+ os << 'r';
+ break;
+ default:
+ os << 'c';
+ break;
+ }
+ }
+ os << "\">\n";
+ idx_type cell = 0;
+ int ret = 0;
+ for (row_type i = 0; i < rows_; ++i) {
+ for (col_type j = 0; j < columns_; ++j) {
+ if (isPartOfMultiColumn(i, j))
+ continue;
+ shared_ptr<InsetText> inset = getCellInset(cell);
+
+ ret += inset->linuxdoc(buf, os, runparams);
+
+ if (isLastCellInRow(cell)) {
+ os << "@\n";
+ ++ret;
+ } else {
+ os << "|";
+ }
+ ++cell;
+ }
+ }
+ os << "</tabular>\n";
+ return ret;
+}
+
+
+int LyXTabular::docbookRow(Buffer const & buf, ostream & os, row_type row,
+ OutputParams const & runparams) const
+{
+ int ret = 0;
+ idx_type cell = getFirstCellInRow(row);
+
+ os << "<row>\n";
+ for (col_type j = 0; j < columns_; ++j) {
+ if (isPartOfMultiColumn(row, j))
+ continue;
+
+ os << "<entry align=\"";
+ switch (getAlignment(cell)) {
+ case LYX_ALIGN_LEFT:
+ os << "left";
+ break;
+ case LYX_ALIGN_RIGHT:
+ os << "right";
+ break;
+ default:
+ os << "center";
+ break;
+ }
+
+ os << "\" valign=\"";
+ switch (getVAlignment(cell)) {
+ case LYX_VALIGN_TOP:
+ os << "top";
+ break;
+ case LYX_VALIGN_BOTTOM:
+ os << "bottom";
+ break;
+ case LYX_VALIGN_MIDDLE:
+ os << "middle";
+ }
+ os << '"';
+
+ if (isMultiColumn(cell)) {
+ os << " namest=\"col" << j << "\" ";
+ os << "nameend=\"col" << j + cells_in_multicolumn(cell) - 1<< '"';
+ }
+
+ os << '>';
+ ret += getCellInset(cell)->docbook(buf, os, runparams);
+ os << "</entry>\n";
+ ++cell;
+ }
+ os << "</row>\n";
+ return ret;
+}
+
+
+int LyXTabular::docbook(Buffer const & buf, ostream & os,
+ OutputParams const & runparams) const
{
int ret = 0;
os << "<tgroup cols=\"" << columns_
<< "\" colsep=\"1\" rowsep=\"1\">\n";
-
- for (int i = 0; i < columns_; ++i) {
+
+ for (col_type i = 0; i < columns_; ++i) {
os << "<colspec colname=\"col" << i << "\" align=\"";
switch (column_info[i].alignment) {
case LYX_ALIGN_LEFT:
os << "center";
break;
}
- os << "\"/>\n";
+ os << '"';
+ if (runparams.flavor == OutputParams::XML)
+ os << '/';
+ os << ">\n";
++ret;
}
//+---------------------------------------------------------------------
- //+ the single row and columns (cells) +
+ //+ Long Tabular case +
//+---------------------------------------------------------------------
- int cell = 0;
- os << "<tbody>\n";
- for (int i = 0; i < rows_; ++i) {
- os << "<row>\n";
- for (int j = 0; j < columns_; ++j) {
- if (IsPartOfMultiColumn(i, j))
- continue;
-
- os << "<entry align=\"";
- switch (GetAlignment(cell)) {
- case LYX_ALIGN_LEFT:
- os << "left";
- break;
- case LYX_ALIGN_RIGHT:
- os << "right";
- break;
- default:
- os << "center";
- break;
- }
-
- os << "\" valign=\"";
- switch (GetVAlignment(cell)) {
- case LYX_VALIGN_TOP:
- os << "top";
- break;
- case LYX_VALIGN_BOTTOM:
- os << "bottom";
- break;
- case LYX_VALIGN_CENTER:
- os << "middle";
+ // output header info
+ if (haveLTHead() || haveLTFirstHead()) {
+ os << "<thead>\n";
+ ++ret;
+ for (row_type i = 0; i < rows_; ++i) {
+ if (row_info[i].endhead || row_info[i].endfirsthead) {
+ ret += docbookRow(buf, os, i, runparams);
}
- os << "\"";
-
- if (IsMultiColumn(cell)) {
- os << " namest=\"col" << j << "\" ";
- os << "nameend=\"col" << j + cells_in_multicolumn(cell) - 1<< "\"";
+ }
+ os << "</thead>\n";
+ ++ret;
+ }
+ // output footer info
+ if (haveLTFoot() || haveLTLastFoot()) {
+ os << "<tfoot>\n";
+ ++ret;
+ for (row_type i = 0; i < rows_; ++i) {
+ if (row_info[i].endfoot || row_info[i].endlastfoot) {
+ ret += docbookRow(buf, os, i, runparams);
}
-
- os << ">";
- ret += GetCellInset(cell)->DocBook(buf, os);
- os << "</entry>";
- ++cell;
}
- os << "</row>\n";
+ os << "</tfoot>\n";
+ ++ret;
+ }
+
+ //+---------------------------------------------------------------------
+ //+ the single row and columns (cells) +
+ //+---------------------------------------------------------------------
+
+ os << "<tbody>\n";
+ ++ret;
+ for (row_type i = 0; i < rows_; ++i) {
+ if (isValidRow(i)) {
+ ret += docbookRow(buf, os, i, runparams);
+ }
}
os << "</tbody>\n";
+ ++ret;
//+---------------------------------------------------------------------
//+ the closing of the tabular +
//+---------------------------------------------------------------------
}
-namespace {
-
- inline
- void print_n_chars(ostream & os, unsigned char ch, int n)
- {
- os << string(n, ch);
- }
-
-} // namespace anon
-
-
-int LyXTabular::AsciiTopHLine(ostream & os, int row,
- vector<unsigned int> const & clen) const
+int LyXTabular::asciiTopHLine(ostream & os, row_type row,
+ vector<unsigned int> const & clen) const
{
- int const fcell = GetFirstCellInRow(row);
- int const n = NumberOfCellsInRow(fcell) + fcell;
- int tmp = 0;
+ idx_type const fcell = getFirstCellInRow(row);
+ idx_type const n = numberOfCellsInRow(fcell) + fcell;
+ idx_type tmp = 0;
- for (int i = fcell; i < n; ++i) {
- if (TopLine(i)) {
+ for (idx_type i = fcell; i < n; ++i) {
+ if (topLine(i)) {
++tmp;
break;
}
return 0;
unsigned char ch;
- for (int i = fcell; i < n; ++i) {
- if (TopLine(i)) {
- if (LeftLine(i))
+ for (idx_type i = fcell; i < n; ++i) {
+ if (topLine(i)) {
+ if (leftLine(i))
os << "+-";
else
os << "--";
os << " ";
ch = ' ';
}
- int column = column_of_cell(i);
+ col_type column = column_of_cell(i);
int len = clen[column];
- while(IsPartOfMultiColumn(row, ++column))
+ while (column < columns_ - 1
+ && isPartOfMultiColumn(row, ++column))
len += clen[column] + 4;
- print_n_chars(os, ch, len);
- if (TopLine(i)) {
- if (RightLine(i))
+ os << string(len, ch);
+ if (topLine(i)) {
+ if (rightLine(i))
os << "-+";
else
os << "--";
}
-int LyXTabular::AsciiBottomHLine(ostream & os, int row,
- vector<unsigned int> const & clen) const
+int LyXTabular::asciiBottomHLine(ostream & os, row_type row,
+ vector<unsigned int> const & clen) const
{
- int const fcell = GetFirstCellInRow(row);
- int const n = NumberOfCellsInRow(fcell) + fcell;
- int tmp = 0;
+ idx_type const fcell = getFirstCellInRow(row);
+ idx_type const n = numberOfCellsInRow(fcell) + fcell;
+ idx_type tmp = 0;
- for (int i = fcell; i < n; ++i) {
- if (BottomLine(i)) {
+ for (idx_type i = fcell; i < n; ++i) {
+ if (bottomLine(i)) {
++tmp;
break;
}
return 0;
unsigned char ch;
- for (int i = fcell; i < n; ++i) {
- if (BottomLine(i)) {
- if (LeftLine(i))
+ for (idx_type i = fcell; i < n; ++i) {
+ if (bottomLine(i)) {
+ if (leftLine(i))
os << "+-";
else
os << "--";
os << " ";
ch = ' ';
}
- int column = column_of_cell(i);
+ col_type column = column_of_cell(i);
int len = clen[column];
- while(IsPartOfMultiColumn(row, ++column))
+ while (column < columns_ -1
+ && isPartOfMultiColumn(row, ++column))
len += clen[column] + 4;
- print_n_chars(os, ch, len);
- if (BottomLine(i)) {
- if (RightLine(i))
+ os << string(len, ch);
+ if (bottomLine(i)) {
+ if (rightLine(i))
os << "-+";
else
os << "--";
}
-int LyXTabular::AsciiPrintCell(Buffer const * buf, ostream & os,
- int cell, int row, int column,
- vector<unsigned int> const & clen) const
+int LyXTabular::asciiPrintCell(Buffer const & buf, ostream & os,
+ OutputParams const & runparams,
+ idx_type cell, row_type row, col_type column,
+ vector<unsigned int> const & clen,
+ bool onlydata) const
{
ostringstream sstr;
- int ret = GetCellInset(cell)->Ascii(buf, sstr, 0);
+ int const ret = getCellInset(cell)->plaintext(buf, sstr, runparams);
+
+ if (onlydata) {
+ os << sstr.str();
+ return ret;
+ }
- if (LeftLine(cell))
+ if (leftLine(cell))
os << "| ";
else
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;
- switch (GetAlignment(cell)) {
+ switch (getAlignment(cell)) {
default:
case LYX_ALIGN_LEFT:
len1 = 0;
break;
}
- for (unsigned int i = 0; i < len1; ++i)
- os << " ";
- os << sstr.str();
- for (unsigned int i = 0; i < len2; ++i)
- os << " ";
- if (RightLine(cell))
+ os << string(len1, ' ') << sstr.str() << string(len2, ' ');
+
+ if (rightLine(cell))
os << " |";
else
os << " ";
}
-int LyXTabular::Ascii(Buffer const * buf, ostream & os) const
+int LyXTabular::plaintext(Buffer const & buf, ostream & os,
+ OutputParams const & runparams,
+ int const depth,
+ bool onlydata, unsigned char delim) const
{
int ret = 0;
- //+---------------------------------------------------------------------
- //+ first calculate the width of the single columns +
- //+---------------------------------------------------------------------
+ // first calculate the width of the single columns
vector<unsigned int> clen(columns_);
- // first all non (real) multicolumn cells!
- for (int j = 0; j < columns_; ++j) {
- clen[j] = 0;
- for (int i = 0; i < rows_; ++i) {
- int cell = GetCellNumber(i, j);
- if (IsMultiColumn(cell, true))
- continue;
- ostringstream sstr;
- GetCellInset(cell)->Ascii(buf, sstr, 0);
- if (clen[j] < sstr.str().length())
- clen[j] = sstr.str().length();
+ if (!onlydata) {
+ // first all non (real) multicolumn cells!
+ for (col_type j = 0; j < columns_; ++j) {
+ clen[j] = 0;
+ for (row_type i = 0; i < rows_; ++i) {
+ idx_type cell = getCellNumber(i, j);
+ if (isMultiColumnReal(cell))
+ continue;
+ ostringstream sstr;
+ getCellInset(cell)->plaintext(buf, sstr, runparams);
+ if (clen[j] < sstr.str().length())
+ clen[j] = sstr.str().length();
+ }
}
- }
- // then all (real) multicolumn cells!
- for (int j = 0; j < columns_; ++j) {
- for (int i = 0; i < rows_; ++i) {
- int cell = GetCellNumber(i, j);
- if (!IsMultiColumn(cell, true) || IsPartOfMultiColumn(i, j))
- continue;
- ostringstream sstr;
- GetCellInset(cell)->Ascii(buf, sstr, 0);
- int len = int(sstr.str().length());
- int const n = cells_in_multicolumn(cell);
- for (int k = j; (len > 0) && (k < (j + n - 1)); ++k)
- len -= clen[k];
- if (len > int(clen[j + n - 1]))
- clen[j + n - 1] = len;
+ // then all (real) multicolumn cells!
+ for (col_type j = 0; j < columns_; ++j) {
+ for (row_type i = 0; i < rows_; ++i) {
+ idx_type cell = getCellNumber(i, j);
+ if (!isMultiColumnReal(cell) || isPartOfMultiColumn(i, j))
+ continue;
+ ostringstream sstr;
+ getCellInset(cell)->plaintext(buf, sstr, runparams);
+ int len = int(sstr.str().length());
+ idx_type const n = cells_in_multicolumn(cell);
+ for (col_type k = j; len > 0 && k < j + n - 1; ++k)
+ len -= clen[k];
+ if (len > int(clen[j + n - 1]))
+ clen[j + n - 1] = len;
+ }
}
}
- int cell = 0;
- for (int i = 0; i < rows_; ++i) {
- AsciiTopHLine(os, i, clen);
- for (int j = 0; j < columns_; ++j) {
- if (IsPartOfMultiColumn(i,j))
+ idx_type cell = 0;
+ for (row_type i = 0; i < rows_; ++i) {
+ if (!onlydata && asciiTopHLine(os, i, clen))
+ os << string(depth * 2, ' ');
+ for (col_type j = 0; j < columns_; ++j) {
+ if (isPartOfMultiColumn(i, j))
continue;
- ret += AsciiPrintCell(buf, os, cell, i, j, clen);
+ if (onlydata && j > 0)
+ os << delim;
+ ret += asciiPrintCell(buf, os, runparams,
+ cell, i, j, clen, onlydata);
++cell;
}
os << endl;
- AsciiBottomHLine(os, i, clen);
+ if (!onlydata) {
+ os << string(depth * 2, ' ');
+ if (asciiBottomHLine(os, i, clen))
+ os << string(depth * 2, ' ');
+ }
}
return ret;
}
-InsetText * LyXTabular::GetCellInset(int cell) const
+shared_ptr<InsetText> LyXTabular::getCellInset(idx_type cell) const
{
- return & cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
+ return cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
}
-InsetText * LyXTabular::GetCellInset(int row, int column) const
+shared_ptr<InsetText> LyXTabular::getCellInset(row_type row,
+ col_type column) const
{
- return & cell_info[row][column].inset;
+ return cell_info[row][column].inset;
}
-void LyXTabular::Validate(LaTeXFeatures & features) const
+LyXTabular::idx_type
+LyXTabular::getCellFromInset(InsetBase const * inset) const
{
- if (IsLongTabular())
- features.longtable = true;
- if (NeedRotating())
- features.rotating = true;
- for (int cell = 0; !features.array && (cell < numberofcells); ++cell) {
- if (GetVAlignment(cell) != LYX_VALIGN_TOP)
- features.array = true;
- GetCellInset(cell)->Validate(features);
+ // is this inset part of the tabular?
+ if (!inset) {
+ lyxerr << "Error: this is not a cell of the tabular!" << endl;
+ BOOST_ASSERT(false);
}
+
+ for (idx_type cell = 0, n = getNumberOfCells(); cell < n; ++cell)
+ if (getCellInset(cell).get() == inset) {
+ lyxerr[Debug::INSETTEXT] << "LyXTabular::getCellFromInset: "
+ << "cell=" << cell << endl;
+ return cell;
+ }
+
+ // We should have found a cell at this point
+ lyxerr << "LyXTabular::getCellFromInset: Cell of inset "
+ << inset << " not found!" << endl;
+ BOOST_ASSERT(false);
+ // shut up compiler
+ return 0;
}
-std::vector<string> const LyXTabular::getLabelList() const
+void LyXTabular::validate(LaTeXFeatures & features) const
{
- std::vector<string> label_list;
- for (int i = 0; i < rows_; ++i)
- for (int j = 0; j < columns_; ++j) {
- std::vector<string> const l =
- GetCellInset(i, j)->getLabelList();
- label_list.insert(label_list.end(),
- l.begin(), l.end());
- }
- return label_list;
+ features.require("NeedTabularnewline");
+ if (isLongTabular())
+ features.require("longtable");
+ if (needRotating())
+ features.require("rotating");
+ for (idx_type cell = 0; cell < numberofcells; ++cell) {
+ if (getVAlignment(cell) != LYX_VALIGN_TOP ||
+ (!getPWidth(cell).zero() && !isMultiColumn(cell)))
+ features.require("array");
+ getCellInset(cell)->validate(features);
+ }
+}
+
+
+void LyXTabular::getLabelList(Buffer const & buffer,
+ std::vector<string> & list) const
+{
+ for (row_type i = 0; i < rows_; ++i)
+ for (col_type j = 0; j < columns_; ++j)
+ getCellInset(i, j)->getLabelList(buffer, list);
}
-
-LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
+
+LyXTabular::BoxType LyXTabular::useParbox(idx_type cell) const
{
- LyXParagraph * par = GetCellInset(cell)->par;
+ ParagraphList const & parlist = getCellInset(cell)->paragraphs();
+ ParagraphList::const_iterator cit = parlist.begin();
+ ParagraphList::const_iterator end = parlist.end();
- for (; par; par = par->next()) {
- for (int i = 0; i < par->size(); ++i) {
- if (par->GetChar(i) == LyXParagraph::META_NEWLINE)
+ for (; cit != end; ++cit)
+ for (int i = 0; i < cit->size(); ++i)
+ if (cit->isNewline(i))
return BOX_PARBOX;
- }
- }
+
return BOX_NONE;
}
-
-/* Emacs:
- * Local variables:
- * tab-width: 4
- * End:
- * vi:set tabstop=4:
- */