static int const WIDTH_OF_LINE = 5;
-extern BufferView * current_view;
-
/// Define a few methods for the inner structs
LyXTabular::cellstruct::cellstruct()
multicolumn = LyXTabular::CELL_NORMAL;
alignment = LYX_ALIGN_CENTER;
valignment = LYX_VALIGN_TOP;
- top_line = false;
+ top_line = true;
bottom_line = false;
- left_line = false;
+ left_line = true;
right_line = false;
usebox = BOX_NONE;
rotate = false;
{
owner_ = inset;
Init(lt.rows_, lt.columns_);
+#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);
}
}
-LyXTabular::~LyXTabular()
-{
- delete[] rowofcell;
- delete[] columnofcell;
-}
-
-
LyXTabular & LyXTabular::operator=(LyXTabular const & lt)
{
// If this and lt is not of the same size we have a serious bug
LyXTabular * result = new LyXTabular(inset, *this);
// 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) {
+ 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);
}
/* activates all lines and sets all widths to 0 */
void LyXTabular::Init(int rows_arg, int columns_arg)
{
-
rows_ = rows_arg;
columns_ = columns_arg;
- row_info = vector<rowstruct>(rows_, rowstruct());
- column_info = vector<columnstruct>(columns_, columnstruct());
- cell_info = vector<vector<cellstruct> >
- (rows_, vector<cellstruct>(columns_, cellstruct()));
+ row_info = row_vector(rows_, rowstruct());
+ column_info = column_vector(columns_, columnstruct());
+ cell_info = cell_vvector(rows_, cell_vector(columns_, cellstruct()));
- // Jürgen, use iterators.
int cellno = 0;
- int i = 0;
- for (; i < rows_; ++i) {
+ 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++;
}
+ cell_info[i].back().right_line = true;
}
- row_info[i - 1].bottom_line = true;
- row_info[0].bottom_line = true;
+ row_info.back().bottom_line = true;
+ row_info.front().bottom_line = true;
- for (i = 0; i < columns_; ++i) {
+ for (int i = 0; i < columns_; ++i) {
calculate_width_of_column(i);
}
- column_info[columns_ - 1].right_line = true;
+ column_info.back().right_line = true;
calculate_width_of_tabular();
- rowofcell = 0;
- columnofcell = 0;
+ rowofcell = vector<int>();
+ columnofcell = vector<int>();
set_row_column_number_info();
is_long_tabular = false;
rotate = false;
}
-void LyXTabular::AppendRow(int cell )
+void LyXTabular::AppendRow(int cell)
{
++rows_;
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) {
+ 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) {
+ for (int i = row + 1; i < rows_; ++i) {
+ for (int j = 0; j < columns_; ++j) {
c_info[i][j] = cell_info[i-1][j];
}
}
void LyXTabular::DeleteRow(int row)
{
- if (!(rows_ - 1))
- return;
+ // 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]);
--rows_;
cell_vvector c_info = cell_vvector(rows_, cell_vector(columns_,
cellstruct()));
- int column = column_of_cell(cell);
+ int const column = column_of_cell(cell);
column_vector::iterator cit = column_info.begin() + column + 1;
column_info.insert(cit, columnstruct());
}
}
cell_info = c_info;
- ++column;
+ //++column;
for (int i = 0; i < rows_; ++i) {
- cell_info[i][column].inset.clear();
+ //cell_info[i][column].inset.clear();
+ cell_info[i][column + 1].inset.clear();
}
Reinit();
}
void LyXTabular::DeleteColumn(int column)
{
- if (!(columns_ - 1))
- return;
+ // Similar to DeleteRow
+ //if (!(columns_ - 1))
+ //return;
+ if (columns_ == 1) return; // Not allowed to delete last column
+
column_info.erase(column_info.begin() + column);
for (int i = 0; i < rows_; ++i) {
cell_info[i].erase(cell_info[i].begin() + column);
void LyXTabular::Reinit()
{
- // Jürgen, use iterators.
for (int i = 0; i < rows_; ++i) {
for (int j = 0; j < columns_; ++j) {
cell_info[i][j].width_of_cell = 0;
}
-void LyXTabular::set_row_column_number_info()
+void LyXTabular::set_row_column_number_info(bool oldformat)
{
- int c = 0;
- int column = 0;
numberofcells = -1;
- int row = 0;
- for (; row < rows_; ++row) {
- for (column = 0; column<columns_; ++column) {
+ for (int row = 0; row < rows_; ++row) {
+ for (int column = 0; column<columns_; ++column) {
if (cell_info[row][column].multicolumn
!= LyXTabular::CELL_PART_OF_MULTICOLUMN)
++numberofcells;
}
}
++numberofcells; // because this is one more than as we start from 0
- row = 0;
- column = 0;
- delete [] rowofcell;
- rowofcell = new int[numberofcells];
- delete [] columnofcell;
- columnofcell = new int[numberofcells];
-
- while (c < numberofcells && row < rows_ && column < columns_) {
+ rowofcell.resize(numberofcells);
+ columnofcell.resize(numberofcells);
+
+ for (int row = 0, column = 0, c = 0;
+ c < numberofcells && row < rows_ && column < columns_;) {
rowofcell[c] = row;
columnofcell[c] = column;
++c;
++row;
}
}
- for (row = 0; row < rows_; ++row) {
- for (column = 0; column<columns_; ++column) {
+
+ for (int row = 0; row < rows_; ++row) {
+ for (int 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());
}
int LyXTabular::NumberOfCellsInRow(int cell) const
{
- int row = row_of_cell(cell);
+ int const row = row_of_cell(cell);
int result = 0;
for (int i = 0; i < columns_; ++i) {
if (cell_info[row][i].multicolumn != LyXTabular::CELL_PART_OF_MULTICOLUMN)
/* returns 1 if there is a topline, returns 0 if not */
bool LyXTabular::TopLine(int cell, bool onlycolumn) const
{
- int row = row_of_cell(cell);
+ int const row = row_of_cell(cell);
if (!onlycolumn && IsMultiColumn(cell))
return cellinfo_of_cell(cell)->top_line;
bool LyXTabular::BottomLine(int cell, bool onlycolumn) const
{
- //no bottom line underneath non-existent cells if you please
- if(cell >= numberofcells)
+ // 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))
int LyXTabular::GetAdditionalHeight(int cell) const
{
- int row = row_of_cell(cell);
+ int const row = row_of_cell(cell);
if (!row) return 0;
-
- int top = 1; // bool top = true; ??
- int bottom = 1; // bool bottom = true; ??
+
+ bool top = true;
+ bool bottom = true;
for (int column = 0; column < columns_ - 1 && bottom; ++column) {
switch (cell_info[row - 1][column].multicolumn) {
{
// internally already set in SetWidthOfCell
// used to get it back in text.C
- int col = right_column_of_cell(cell);
+ int const col = right_column_of_cell(cell);
if (col < columns_ - 1 && column_info[col].right_line &&
column_info[col+1].left_line)
return WIDTH_OF_LINE;
int const column1 = column_of_cell(cell);
int const column2 = right_column_of_cell(cell);
int result = 0;
- int i = column1;
- for (; i <= column2; ++i) {
+ for (int i = column1; i <= column2; ++i) {
result += column_info[i].width_of_column;
}
return result;
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) {
+ for (int 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);
- for (i = column1; (i < column2) && (width>column_info[i].width_of_column);
- ++i)
- {
+
+ int 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;
}
int i = column1;
for (; i <= column2; ++i)
cell_info[row][i].width_of_cell = 0;
- for(i = cell + 1; (i < numberofcells) && (!IsMultiColumn(i)); ++i)
+ for (i = cell + 1; (i < numberofcells) && (!IsMultiColumn(i)); ++i)
;
if (i < numberofcells)
recalculateMulticolCells(i, GetWidthOfCell(i) - (2 * WIDTH_OF_LINE));
}
if (tmp) {
int i = 0;
- for(; i<columns_; ++i)
+ for (; i<columns_; ++i)
calculate_width_of_column_NMC(i);
- for(i = 0; (i < numberofcells) && !IsMultiColumn(i); ++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)
+ recalculateMulticolCells(i, GetWidthOfCell(i)-(2 * WIDTH_OF_LINE));
+ for (i = 0; i < columns_; ++i)
calculate_width_of_column(i);
calculate_width_of_tabular();
return true;
}
-bool LyXTabular::SetAlignment(int cell, char align, bool onlycolumn)
+bool LyXTabular::SetAlignment(int cell, LyXAlignment align, bool onlycolumn)
{
if (!IsMultiColumn(cell) || onlycolumn)
column_info[column_of_cell(cell)].alignment = align;
}
-bool LyXTabular::SetVAlignment(int cell, char align, bool onlycolumn)
+bool LyXTabular::SetVAlignment(int cell, VAlignment align, bool onlycolumn)
{
if (!IsMultiColumn(cell) || onlycolumn)
column_info[column_of_cell(cell)].valignment = align;
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) {
+ for (int i = 0; i < rows_; ++i) {
int c = GetCellNumber(i, j);
flag = !GetPWidth(c).empty(); // because of multicolumns!
GetCellInset(c)->SetAutoBreakRows(flag);
}
-bool LyXTabular::SetAlignSpecial(int cell, string const & special, int what)
+bool LyXTabular::SetAlignSpecial(int cell, string const & special,
+ LyXTabular::Feature what)
{
if (what == SET_SPECIAL_MULTI)
cellinfo_of_cell(cell)->align_special = special;
}
-char LyXTabular::GetAlignment(int cell, bool onlycolumn) const
+LyXAlignment LyXTabular::GetAlignment(int cell, bool onlycolumn) const
{
if (!onlycolumn && IsMultiColumn(cell))
return cellinfo_of_cell(cell)->alignment;
}
-char LyXTabular::GetVAlignment(int cell, bool onlycolumn) const
+LyXTabular::VAlignment
+LyXTabular::GetVAlignment(int cell, bool onlycolumn) const
{
if (!onlycolumn && IsMultiColumn(cell))
return cellinfo_of_cell(cell)->valignment;
return result;
}
+
int LyXTabular::GetBeginningOfTextInCell(int cell) const
{
int x = 0;
bool LyXTabular::IsFirstCellInRow(int cell) const
{
- return (column_of_cell(cell) == 0);
+ return column_of_cell(cell) == 0;
}
int LyXTabular::row_of_cell(int cell) const
{
if (cell >= numberofcells)
- return rows_-1;
+ 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;
+ return columns_ - 1;
else if (cell < 0)
return 0;
return columnofcell[cell];
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)
+ cell_info[row][column + 1].multicolumn == LyXTabular::CELL_PART_OF_MULTICOLUMN)
++column;
return column;
}
+// Perfect case for a template... (Lgb)
+#if 1
+template<class T>
+string const write_attribute(string const & name, T const & t)
+{
+ string str = " " + name + "=\"" + tostr(t) + "\"";
+ return str;
+}
+
+template <>
+string const write_attribute(string const & name, bool const & b)
+{
+ return write_attribute(name, int(b));
+}
+
+#else
+
+string const write_attribute(string const & name, int value)
+{
+ string str = " " + name + "=\"" + tostr(value) + "\"";
+ return str;
+}
+
+
+string const write_attribute(string const & name, string const & value)
+{
+ string str = " " + name + "=\"" + value + "\"";
+ return str;
+}
+
+
+string const write_attribute(string const & name, bool value)
+{
+ string str = " " + name + "=\"" + tostr(static_cast<int>(value)) + "\"";
+ return str;
+}
+#endif
+
+
void LyXTabular::Write(Buffer const * buf, ostream & os) const
{
// header line
- os << "<LyXTabular version=1 rows=" << rows_ << " columns=" << columns_ <<
- ">" << endl;
+ os << "<LyXTabular"
+ << write_attribute("version", 1)
+ << write_attribute("rows", rows_)
+ << write_attribute("columns", columns_)
+ << ">\n";
// global longtable options
- os << "<Features rotate=" << rotate <<
- " islongtable=" << is_long_tabular <<
- " endhead=" << endhead << " endfirsthead=" << endfirsthead <<
- " endfoot=" << endfoot << " endlastfoot=" << endlastfoot <<
- ">" << endl << endl;
+ os << "<Features"
+ << write_attribute("rotate", rotate)
+ << write_attribute("islongtable", is_long_tabular)
+ << write_attribute("endhead", endhead)
+ << write_attribute("endfirsthead", endfirsthead)
+ << write_attribute("endfoot", endfoot)
+ << write_attribute("endlastfoot", endlastfoot)
+ << ">\n\n";
for (int i = 0; i < rows_; ++i) {
- os << "<Row topline=" << row_info[i].top_line <<
- " bottomline=" << row_info[i].bottom_line <<
- " newpage=" << row_info[i].newpage <<
- ">" << endl;
+ os << "<Row"
+ << write_attribute("topline", row_info[i].top_line)
+ << write_attribute("bottomline", row_info[i].bottom_line)
+ << write_attribute("newpage", row_info[i].newpage)
+ << ">\n";
for (int j = 0; j < columns_; ++j) {
if (!i) {
- os << "<Column alignment=" << column_info[j].alignment <<
- " valignment=" << column_info[j].valignment <<
- " leftline=" << column_info[j].left_line <<
- " rightline=" << column_info[j].right_line <<
- " width=\"" << VSpace(column_info[j].p_width).asLyXCommand() <<
- "\" special=\"" << column_info[j].align_special <<
- "\">" << endl;
+ os << "<Column"
+ << 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",
+ VSpace(column_info[j].p_width)
+ .asLyXCommand())
+ << write_attribute("special", column_info[j].align_special)
+ << ">\n";
} else {
- os << "<Column>" << endl;
+ os << "<Column>\n";
}
- os << "<Cell multicolumn=" << cell_info[i][j].multicolumn <<
- " alignment=" << cell_info[i][j].alignment <<
- " valignment=" << cell_info[i][j].valignment <<
- " topline=" << cell_info[i][j].top_line <<
- " bottomline=" << cell_info[i][j].bottom_line <<
- " leftline=" << cell_info[i][j].left_line <<
- " rightline=" << cell_info[i][j].right_line <<
- " rotate=" << cell_info[i][j].rotate <<
- " usebox=" << (int)cell_info[i][j].usebox <<
- " width=\"" << cell_info[i][j].p_width <<
- "\" special=\"" << cell_info[i][j].align_special <<
- "\">" << endl;
+ os << "<Cell"
+ << write_attribute("multicolumn", cell_info[i][j].multicolumn)
+ << 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 " << endl;
- os << "</Cell>" << endl;
- os << "</Column>" << endl;
+ os << "\n\\end_inset \n"
+ << "</Cell>\n"
+ << "</Column>\n";
}
- os << "</Row>" << endl;
+ os << "</Row>\n";
}
- os << "</LyXTabular>" << endl;
+ os << "</LyXTabular>\n";
}
static
-bool getTokenValue(string const str, const char * token, string & ret)
+bool getTokenValue(string const & str, const char * token, string & ret)
{
- int pos = str.find(token);
- char ch = str[pos+strlen(token)];
+ string::size_type pos = str.find(token);
+ char ch = str[pos + strlen(token)];
- if ((pos < 0) || (ch != '='))
+ if ((pos == string::npos) || (ch != '='))
return false;
ret.erase();
- pos += strlen(token)+1;
+ pos += strlen(token) + 1;
ch = str[pos];
if ((ch != '"') && (ch != '\'')) { // only read till next space
ret += ch;
ch = ' ';
}
- while((pos < int(str.length()-1)) && (str[++pos] != ch))
+ while((pos < str.length() - 1) && (str[++pos] != ch))
ret += str[pos];
return true;
static
-bool getTokenValue(string const str, const char * token, int & num)
+bool getTokenValue(string const & str, const char * token, int & num)
{
- string ret;
- int pos = str.find(token);
- char ch = str[pos+strlen(token)];
+ string::size_type pos = str.find(token);
+ char ch = str[pos + strlen(token)];
- if ((pos < 0) || (ch != '='))
+ if ((pos == string::npos) || (ch != '='))
return false;
- ret.erase();
- pos += strlen(token)+1;
+ string ret;
+ pos += strlen(token) + 1;
ch = str[pos];
if ((ch != '"') && (ch != '\'')) { // only read till next space
if (!isdigit(ch))
ret += ch;
}
++pos;
- while((pos < int(str.length()-1)) && isdigit(str[pos]))
+ while((pos < str.length() - 1) && isdigit(str[pos]))
ret += str[pos++];
num = strToInt(ret);
static
-bool getTokenValue(string const str, const char * token, bool & flag)
+bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
{
- string ret;
- int pos = str.find(token);
- char ch = str[pos+strlen(token)];
+ int tmp;
+ bool const ret = getTokenValue(str, token, tmp);
+ num = static_cast<LyXAlignment>(tmp);
+ return ret;
+}
+
+
+static
+bool getTokenValue(string const & str, const char * token,
+ LyXTabular::VAlignment & num)
+{
+ int tmp;
+ bool const ret = getTokenValue(str, token, tmp);
+ num = static_cast<LyXTabular::VAlignment>(tmp);
+ return ret;
+}
+
+
+static
+bool getTokenValue(string const & str, const char * token,
+ LyXTabular::BoxType & num)
+{
+ int tmp;
+ bool ret = getTokenValue(str, token, tmp);
+ num = static_cast<LyXTabular::BoxType>(tmp);
+ return ret;
+}
+
- if ((pos < 0) || (ch != '='))
+static
+bool getTokenValue(string const & str, const char * token, bool & flag)
+{
+ string::size_type pos = str.find(token);
+ char ch = str[pos + strlen(token)];
+
+ if ((pos == string::npos) || (ch != '='))
return false;
- ret.erase();
- pos += strlen(token)+1;
+ string ret;
+ pos += strlen(token) + 1;
ch = str[pos];
if ((ch != '"') && (ch != '\'')) { // only read till next space
if (!isdigit(ch))
ret += ch;
}
++pos;
- while((pos < int(str.length()-1)) && isdigit(str[pos]))
+ while((pos < str.length() - 1) && isdigit(str[pos]))
ret += str[pos++];
flag = strToInt(ret);
getTokenValue(line, "endfirsthead", endfirsthead);
getTokenValue(line, "endfoot", endfoot);
getTokenValue(line, "endlastfoot", endlastfoot);
- int i, j;
- for(i = 0; i < rows_; ++i) {
+
+ for (int i = 0; i < rows_; ++i) {
l_getline(is, line);
if (!prefixIs(line, "<Row ")) {
lyxerr << "Wrong tabular format (expected <Row ...> got" <<
getTokenValue(line, "topline", row_info[i].top_line);
getTokenValue(line, "bottomline", row_info[i].bottom_line);
getTokenValue(line, "newpage", row_info[i].newpage);
- for (j = 0; j < columns_; ++j) {
+ for (int j = 0; j < columns_; ++j) {
l_getline(is,line);
if (!prefixIs(line,"<Column")) {
lyxerr << "Wrong tabular format (expected <Column ...> got" <<
int e = 0;
int f = 0;
int g = 0;
- int h = 0;
istream & is = lex.getStream();
string s(fl);
if (s.length() > 8)
- version = atoi(s.c_str() + 8);
+ version = lyx::atoi(s.substr(8, string::npos));
else
version = 1;
endfoot = c;
endlastfoot = d;
for (i = 0; i < rows_; ++i) {
- a = b = c = d = e = f = g = h = 0;
+ 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;
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<char>(a);
+ 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;
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<char>(b);
+ 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<bool>(g);
+ 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();
+ set_row_column_number_info(true);
LyXParagraph * par = new LyXParagraph;
LyXParagraph * return_par = 0;
LyXParagraph::footnote_flag footnoteflag = LyXParagraph::NO_FOOTNOTE;
LyXParagraph::footnote_kind footnotekind = LyXParagraph::FOOTNOTE;
#endif
- string token, tmptok;
+ string tmptok;
int pos = 0;
char depth = 0;
LyXFont font(LyXFont::ALL_SANE);
+ font.setLanguage(owner_->BufferOwner()->GetLanguage());
while (lex.IsOK()) {
lex.nextToken();
- token = lex.GetString();
+ string const token = lex.GetString();
if (token.empty())
continue;
- if ((token == "\\layout") || (token == "\\end_float") ||
- (token == "\\end_deeper"))
- {
+ if (token == "\\layout"
+ || token == "\\end_float"
+ || token == "\\end_deeper") {
lex.pushToken(token);
break;
}
InsetText * inset = GetCellInset(cell);
int row;
- for(int i = 0; i < par->Last(); ++i) {
+ for (int i = 0; i < par->Last(); ++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);
par->InsertChar(i, ' ');
}
}
- par->CopyIntoMinibuffer(current_view->buffer()->params, i);
+ par->CopyIntoMinibuffer(*owner_->BufferOwner(), i);
inset->par->InsertFromMinibuffer(inset->par->Last());
}
+ delete par;
Reinit();
}
string const LyXTabular::GetDocBookAlign(int cell, bool isColumn) const
{
- int i = isColumn ? cell : column_of_cell(cell);
+ int const i = isColumn ? cell : column_of_cell(cell);
if (!isColumn && IsMultiColumn(cell)) {
if (!cellinfo_of_cell(cell)->align_special.empty()) {
int LyXTabular::DocBookEndOfCell(ostream & os, int cell, int & depth) const
{
int ret = 0;
- int nvcell;
if (IsLastCell(cell)) {
os << newlineAndDepth(--depth)
<< "</ENTRY>"
<< newlineAndDepth(--depth);
ret += 4;
} else {
- nvcell = cell + 1;
if (cell < 0) {
// preamble
if (is_long_tabular)
bool LyXTabular::IsMultiColumn(int cell, bool real) const
{
return ((!real || (column_of_cell(cell) != right_column_of_cell(cell))) &&
- (cellinfo_of_cell(cell)->multicolumn !=LyXTabular::CELL_NORMAL));
+ (cellinfo_of_cell(cell)->multicolumn != LyXTabular::CELL_NORMAL));
}
int const column = column_of_cell(cell);
return &cell_info[row][column];
}
-
+
void LyXTabular::SetMultiColumn(int cell, int number)
{
}
-void LyXTabular::SetLongTabular(int what)
+void LyXTabular::SetLongTabular(bool what)
{
is_long_tabular = what;
}
}
-int LyXTabular::GetUsebox(int cell) const
+LyXTabular::BoxType LyXTabular::GetUsebox(int cell) const
{
if (column_info[column_of_cell(cell)].p_width.empty() &&
!(IsMultiColumn(cell) && !cellinfo_of_cell(cell)->p_width.empty()))
{
int height = 0;
- for(int row = 0; row < rows_; ++row)
+ for (int row = 0; row < rows_; ++row)
height += GetAscentOfRow(row) + GetDescentOfRow(row) +
GetAdditionalHeight(GetCellNumber(row, 0));
return height;
{
if ((row >= rows_) || (column >= columns_))
return false;
- return (cell_info[row][column].multicolumn==CELL_PART_OF_MULTICOLUMN);
+ return (cell_info[row][column].multicolumn == CELL_PART_OF_MULTICOLUMN);
}
int LyXTabular::TeXTopHLine(ostream & os, int row) const
{
-#warning should this return a bool? (Lgb)
int const fcell = GetFirstCellInRow(row);
int const n = NumberOfCellsInRow(fcell) + fcell;
int tmp = 0;
}
if (tmp == (n - fcell)){
os << "\\hline ";
- } else {
+ } else if (tmp) {
for (int i = fcell; i < n; ++i) {
if (TopLine(i)) {
os << "\\cline{"
<< "} ";
}
}
+ } else {
+ return 0;
}
- if (tmp) {
- os << endl;
- return 1;
- }
- return 0;
+ os << "\n";
+ return 1;
}
int LyXTabular::TeXBottomHLine(ostream & os, int row) const
{
-#warning should this return a bool? (Lgb)
int const fcell = GetFirstCellInRow(row);
int const n = NumberOfCellsInRow(fcell) + fcell;
int tmp = 0;
}
if (tmp == (n-fcell)){
os << "\\hline";
- } else {
+ } else if (tmp) {
for (int i = fcell; i < n; ++i) {
if (BottomLine(i)) {
os << "\\cline{"
<< "} ";
}
}
+ } else {
+ return 0;
}
- if (tmp) {
- os << endl;
- return 1;
- }
- return 0;
+ os << "\n";
+ return 1;
}
int ret = 0;
if (GetRotateCell(cell)) {
- os << "\\begin{sideways}" << endl;
+ os << "\\begin{sideways}\n";
++ret;
}
if (IsMultiColumn(cell)) {
os << "\\multicolumn{" << cells_in_multicolumn(cell) << "}{";
- if (!cellinfo_of_cell(cell+1)->align_special.empty()) {
- os << cellinfo_of_cell(cell+1)->align_special << "}{";
+ if (!cellinfo_of_cell(cell)->align_special.empty()) {
+ os << cellinfo_of_cell(cell)->align_special << "}{";
} else {
if (LeftLine(cell))
os << '|';
if (!GetPWidth(cell).empty()) {
- switch(GetVAlignment(cell)) {
+ switch (GetVAlignment(cell)) {
case LYX_VALIGN_TOP:
os << "p";
break;
}
if (GetUsebox(cell) == BOX_PARBOX) {
os << "\\parbox[";
- switch(GetVAlignment(cell)) {
+ switch (GetVAlignment(cell)) {
case LYX_VALIGN_TOP:
os << "t";
break;
os << "]{" << GetPWidth(cell) << "}{";
} else if (GetUsebox(cell) == BOX_MINIPAGE) {
os << "\\begin{minipage}[";
- switch(GetVAlignment(cell)) {
+ switch (GetVAlignment(cell)) {
case LYX_VALIGN_TOP:
os << "t";
break;
int LyXTabular::Latex(Buffer const * buf,
ostream & os, bool fragile, bool fp) const
{
-#warning Jürgen, this func should be split into more funcs (Lgb)
int ret = 0;
- int i,j;
int cell = 0;
//+---------------------------------------------------------------------
//+---------------------------------------------------------------------
if (rotate) {
- os << "\\begin{sideways}" << endl;
+ os << "\\begin{sideways}\n";
++ret;
}
if (is_long_tabular)
os << "\\begin{longtable}{";
else
os << "\\begin{tabular}{";
- for (i = 0; i < columns_; ++i) {
+ for (int i = 0; i < columns_; ++i) {
if (column_info[i].left_line)
os << '|';
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) {
+ switch (column_info[i].valignment) {
case LYX_VALIGN_TOP:
os << "p";
break;
if (column_info[i].right_line)
os << '|';
}
- os << "}" << endl;
+ os << "}\n";
++ret;
//+---------------------------------------------------------------------
//+ the single row and columns (cells) +
//+---------------------------------------------------------------------
- int bret;
- for(i=0; i < rows_; ++i) {
+ //int bret;
+ for (int i = 0; i < rows_; ++i) {
ret += TeXTopHLine(os, i);
- bret = ret;
+ int bret = ret;
if (IsLongTabular()) {
if ((endhead < 0) && (i == (abs(endhead)-1))) {
os << "\\endhead\n";
ret += TeXBottomHLine(os, i-1);
ret += TeXTopHLine(os, i);
}
- for(j=0; j < columns_; ++j) {
+ for (int j = 0; j < columns_; ++j) {
if (IsPartOfMultiColumn(i,j))
continue;
ret += TeXCellPreamble(os, cell);
ret += GetCellInset(cell)->Latex(buf, os, fragile, fp);
ret += TeXCellPostamble(os, cell);
if (!IsLastCellInRow(cell)) { // not last cell in row
- os << "&" << endl;
+ os << "&\n";
++ret;
}
++cell;
}
- os << "\\\\" << endl;
+ os << "\\\\\n";
ret += TeXBottomHLine(os, i);
bret = ret;
if (IsLongTabular()) {
- if ((endhead > 0) && (i == (endhead-1))) {
+ if ((endhead > 0) && (i == (endhead - 1))) {
os << "\\endhead\n";
++ret;
}
- if ((endfirsthead > 0) && (i == (endfirsthead-1))) {
+ if ((endfirsthead > 0) && (i == (endfirsthead - 1))) {
os << "\\endfirsthead\n";
++ret;
}
- if ((endfoot > 0) && (i == (endfoot-1))) {
+ if ((endfoot > 0) && (i == (endfoot - 1))) {
os << "\\endfoot\n";
++ret;
}
- if ((endlastfoot > 0) && (i == (endlastfoot-1))) {
+ if ((endlastfoot > 0) && (i == (endlastfoot - 1))) {
os << "\\endlastfoot\n";
++ret;
}
}
+int LyXTabular::DocBook(Buffer const * buf, ostream & os) const
+{
+ int ret = 0;
+
+ //+---------------------------------------------------------------------
+ //+ first the opening preamble +
+ //+---------------------------------------------------------------------
+
+ os << "<tgroup cols=\"" << columns_
+ << "\" colsep=\"1\" rowsep=\"1\">\n";
+
+ for (int i = 0; i < columns_; ++i) {
+ os << "<colspec colname=\"col" << i << "\" align=\"";
+ switch (column_info[i].alignment) {
+ case LYX_ALIGN_LEFT:
+ os << "left";
+ break;
+ case LYX_ALIGN_RIGHT:
+ os << "right";
+ break;
+ default:
+ os << "center";
+ break;
+ }
+ os << "\"/>\n";
+ ++ret;
+ }
+
+ //+---------------------------------------------------------------------
+ //+ the single row and columns (cells) +
+ //+---------------------------------------------------------------------
+
+ 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";
+ }
+ os << "\"";
+
+ if (IsMultiColumn(cell)) {
+ os << " namest=\"col" << j << "\" ";
+ os << "nameend=\"col" << j + cells_in_multicolumn(cell) - 1<< "\"";
+ }
+
+ os << ">";
+ ret += GetCellInset(cell)->DocBook(buf, os);
+ os << "</entry>";
+ ++cell;
+ }
+ os << "</row>\n";
+ }
+ os << "</tbody>\n";
+ //+---------------------------------------------------------------------
+ //+ the closing of the tabular +
+ //+---------------------------------------------------------------------
+
+ os << "</tgroup>";
+ ++ret;
+
+ return ret;
+}
+
+
+static
+inline
+void print_n_chars(ostream & os, unsigned char ch, int n)
+{
+ os << string(n, ch);
+}
+
+
+int LyXTabular::AsciiTopHLine(ostream & os, int row,
+ vector<unsigned int> const & clen) const
+{
+ int const fcell = GetFirstCellInRow(row);
+ int const n = NumberOfCellsInRow(fcell) + fcell;
+ int tmp = 0;
+
+ for (int i = fcell; i < n; ++i) {
+ if (TopLine(i)) {
+ ++tmp;
+ break;
+ }
+ }
+ if (!tmp)
+ return 0;
+
+ unsigned char ch;
+ for (int i = fcell; i < n; ++i) {
+ if (TopLine(i)) {
+ if (LeftLine(i))
+ os << "+-";
+ else
+ os << "--";
+ ch = '-';
+ } else {
+ os << " ";
+ ch = ' ';
+ }
+ int column = column_of_cell(i);
+ int len = clen[column];
+ while(IsPartOfMultiColumn(row, ++column))
+ len += clen[column] + 4;
+ print_n_chars(os, ch, len);
+ if (TopLine(i)) {
+ if (RightLine(i))
+ os << "-+";
+ else
+ os << "--";
+ } else {
+ os << " ";
+ }
+ }
+ os << endl;
+ return 1;
+}
+
+
+int LyXTabular::AsciiBottomHLine(ostream & os, int row,
+ vector<unsigned int> const & clen) const
+{
+ int const fcell = GetFirstCellInRow(row);
+ int const n = NumberOfCellsInRow(fcell) + fcell;
+ int tmp = 0;
+
+ for (int i = fcell; i < n; ++i) {
+ if (BottomLine(i)) {
+ ++tmp;
+ break;
+ }
+ }
+ if (!tmp)
+ return 0;
+
+ unsigned char ch;
+ for (int i = fcell; i < n; ++i) {
+ if (BottomLine(i)) {
+ if (LeftLine(i))
+ os << "+-";
+ else
+ os << "--";
+ ch = '-';
+ } else {
+ os << " ";
+ ch = ' ';
+ }
+ int column = column_of_cell(i);
+ int len = clen[column];
+ while(IsPartOfMultiColumn(row, ++column))
+ len += clen[column] + 4;
+ print_n_chars(os, ch, len);
+ if (BottomLine(i)) {
+ if (RightLine(i))
+ os << "-+";
+ else
+ os << "--";
+ } else {
+ os << " ";
+ }
+ }
+ os << endl;
+ return 1;
+}
+
+
+int LyXTabular::AsciiPrintCell(Buffer const * buf, ostream & os,
+ int cell, int row, int column,
+ vector<unsigned int> const & clen) const
+{
+ ostringstream sstr;
+ int ret = GetCellInset(cell)->Ascii(buf, sstr, 0);
+
+ if (LeftLine(cell))
+ os << "| ";
+ else
+ os << " ";
+
+ unsigned int len1 = sstr.str().length();
+ unsigned int len2 = clen[column];
+ while(IsPartOfMultiColumn(row, ++column))
+ len2 += clen[column] + 4;
+ len2 -= len1;
+
+ switch (GetAlignment(cell)) {
+ default:
+ case LYX_ALIGN_LEFT:
+ len1 = 0;
+ break;
+ case LYX_ALIGN_RIGHT:
+ len1 = len2;
+ len2 = 0;
+ break;
+ case LYX_ALIGN_CENTER:
+ len1 = len2 / 2;
+ len2 -= len1;
+ 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 << " |";
+ else
+ os << " ";
+
+ return ret * 0; // eh? (Lgb)
+}
+
+
+int LyXTabular::Ascii(Buffer const * buf, ostream & os) const
+{
+ int ret = 0;
+
+ //+---------------------------------------------------------------------
+ //+ 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();
+ }
+ }
+ // 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;
+ }
+ }
+ 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))
+ continue;
+ ret += AsciiPrintCell(buf, os, cell, i, j, clen);
+ ++cell;
+ }
+ os << endl;
+ AsciiBottomHLine(os, i, clen);
+ }
+ return ret;
+}
+
+
InsetText * LyXTabular::GetCellInset(int cell) const
{
return & cell_info[row_of_cell(cell)][column_of_cell(cell)].inset;
}
+InsetText * LyXTabular::GetCellInset(int row, int column) const
+{
+ return GetCellInset(GetCellNumber(row, column));
+}
+
+
void LyXTabular::Validate(LaTeXFeatures & features) const
{
if (IsLongTabular())
features.longtable = true;
if (NeedRotating())
features.rotating = true;
- for(int cell = 0; cell < numberofcells; ++cell) {
+ for (int cell = 0; cell < numberofcells; ++cell) {
if (GetVAlignment(cell) != LYX_VALIGN_TOP)
features.array = true;
GetCellInset(cell)->Validate(features);
}
-bool LyXTabular::UseParbox(int cell) const
+LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
{
LyXParagraph * par = GetCellInset(cell)->par;
- for(; par; par = par->next) {
- for(int i = 0; i < par->Last(); ++i) {
+ for (; par; par = par->next) {
+ for (int i = 0; i < par->Last(); ++i) {
if (par->GetChar(i) == LyXParagraph::META_NEWLINE)
- return true;
+ return BOX_PARBOX;
}
}
- return false;
+ return BOX_NONE;
}
projects / lyx.git / blobdiff