using std::endl;
using std::vector;
-static int const WIDTH_OF_LINE = 5;
+namespace {
+
+int const WIDTH_OF_LINE = 5;
+
+} // namespace
/// Define a few methods for the inner structs
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;
int 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];
for (int i = 0; i < rows_; ++i) {
for (int j = 0; j <= column; ++j) {
#endif
-// #if 0
-// static inline
-// string const type2string(LyXAlignment num)
-// {
-// 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();
-// }
-
-
-// static inline
-// string const type2string(LyXTabular::VAlignment num)
-// {
-// 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();
-// }
-
-
-// static inline
-// string const type2string(LyXTabular::BoxType num)
-// {
-// switch(num) {
-// case LyXTabular::BOX_NONE:
-// return "none";
-// case LyXTabular::BOX_PARBOX:
-// return "parbox";
-// case LyXTabular::BOX_MINIPAGE:
-// return "minipage";
-// }
-// return string();
-// }
-
-// static inline
-// string const type2string(bool flag)
-// {
-// return (flag ? "true" : "false");
-// }
-// #else
template<>
inline
string const tostr(LyXAlignment const & num)
return string();
}
-// We already have a function like this in lstring.h (Lgb)
-//string const type2string(bool flag)
-//{
-// return (flag ? "true" : "false");
-//}
-
-
-//#endif
-
-
-
void LyXTabular::Write(Buffer const * buf, ostream & os) const
{
<< ">\n";
// global longtable options
os << "<features"
-//#if 0
-// << write_attribute("rotate", type2string(rotate))
-// << write_attribute("islongtable", type2string(is_long_tabular))
-//#else
<< write_attribute("rotate", tostr(rotate))
<< write_attribute("islongtable", tostr(is_long_tabular))
-//#endif
<< write_attribute("endhead", endhead)
<< write_attribute("endfirsthead", endfirsthead)
<< write_attribute("endfoot", endfoot)
<< ">\n";
for (int j = 0; j < columns_; ++j) {
os << "<column"
-//#if 0
-// << write_attribute("alignment", type2string(column_info[j].alignment))
-// << write_attribute("valignment", type2string(column_info[j].valignment))
-// << write_attribute("leftline", type2string(column_info[j].left_line))
-// << write_attribute("rightline", type2string(column_info[j].right_line))
-//#else
<< 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))
-//#endif
<< write_attribute("width",
VSpace(column_info[j].p_width)
.asLyXCommand())
}
for (int i = 0; i < rows_; ++i) {
os << "<row"
-//#if 0
-// << write_attribute("topline", type2string(row_info[i].top_line))
-// << write_attribute("bottomline", type2string(row_info[i].bottom_line))
-// << write_attribute("newpage", type2string(row_info[i].newpage))
-//#else
<< 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))
-//#endif
<< ">\n";
for (int j = 0; j < columns_; ++j) {
#if 0
if (!i) {
os << "<column"
-//#if 0
-// << write_attribute("alignment", type2string(column_info[j].alignment))
-// << write_attribute("valignment", type2string(column_info[j].valignment))
-// << write_attribute("leftline", type2string(column_info[j].left_line))
-// << write_attribute("rightline", type2string(column_info[j].right_line))
-//#else
<< 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))
-
-//#endif
<< write_attribute("width",
VSpace(column_info[j].p_width)
.asLyXCommand())
#endif
os << "<cell"
<< write_attribute("multicolumn", cell_info[i][j].multicolumn)
-//#if 0
-// << write_attribute("alignment", type2string(cell_info[i][j].alignment))
-// << write_attribute("valignment", type2string(cell_info[i][j].valignment))
-// << write_attribute("topline", type2string(cell_info[i][j].top_line))
-// << write_attribute("bottomline", type2string(cell_info[i][j].bottom_line))
-// << write_attribute("leftline", type2string(cell_info[i][j].left_line))
-// << write_attribute("rightline", type2string(cell_info[i][j].right_line))
-// << write_attribute("rotate", type2string(cell_info[i][j].rotate))
-// << write_attribute("usebox", type2string(cell_info[i][j].usebox))
-//#else
<< 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("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))
-//#endif
<< write_attribute("width", cell_info[i][j].p_width)
<< write_attribute("special", cell_info[i][j].align_special)
<< ">\n";
}
+namespace {
+
// I would have liked a fromstr template a lot better. (Lgb)
-static inline
+inline
bool string2type(string const str, LyXAlignment & num)
{
if (str == "none")
}
-static inline
+inline
bool string2type(string const str, LyXTabular::VAlignment & num)
{
if (str == "top")
}
-static inline
+inline
bool string2type(string const str, LyXTabular::BoxType & num)
{
if (str == "none")
}
-static inline
+inline
bool string2type(string const str, bool & num)
{
if (str == "true")
}
-static
bool getTokenValue(string const & str, const char * token, string & ret)
{
size_t token_length = strlen(token);
}
-//#define USE_OLD_READFORMAT
-
-//#ifndef USE_OLD_READFORMAT
-static
bool getTokenValue(string const & str, const char * token, int & num)
{
string tmp;
}
-static
bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
{
string tmp;
}
-static
bool getTokenValue(string const & str, const char * token,
LyXTabular::VAlignment & num)
{
}
-static
bool getTokenValue(string const & str, const char * token,
LyXTabular::BoxType & num)
{
}
-static
bool getTokenValue(string const & str, const char * token, bool & flag)
{
string tmp;
return string2type(tmp, flag);
}
-//#else
-
-// static
-// bool getTokenValue(string const & str, const char * token, int & num)
-// {
-// string::size_type pos = str.find(token);
-// char ch = str[pos + strlen(token)];
-
-// if ((pos == string::npos) || (ch != '='))
-// return false;
-// string ret;
-// pos += strlen(token) + 1;
-// ch = str[pos];
-// if ((ch != '"') && (ch != '\'')) { // only read till next space
-// if (!isdigit(ch))
-// return false;
-// ret += ch;
-// }
-// ++pos;
-// while((pos < str.length() - 1) && isdigit(str[pos]))
-// ret += str[pos++];
-
-// num = strToInt(ret);
-// return true;
-// }
-
-
-// static
-// bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
-// {
-// 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;
-// }
-
-
-// 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;
-// string ret;
-// pos += strlen(token) + 1;
-// ch = str[pos];
-// if ((ch != '"') && (ch != '\'')) { // only read till next space
-// if (!isdigit(ch))
-// return false;
-// ret += ch;
-// }
-// ++pos;
-// while((pos < str.length() - 1) && isdigit(str[pos]))
-// ret += str[pos++];
-
-// flag = strToInt(ret);
-// return true;
-// }
-
-// #endif
-
-static inline
+
+inline
void l_getline(istream & is, string & str)
{
- getline(is, str);
- while(str.empty())
+ str.erase();
+ while (str.empty()) {
getline(is, str);
+ if (!str.empty() && str[str.length() - 1] == '\r')
+ str.erase(str.length() - 1);
+ }
}
+} // namespace anon
-//#ifndef USE_OLD_READFORMAT
void LyXTabular::Read(Buffer const * buf, LyXLex & lex)
{
}
-//#if 0
-//void LyXTabular::ReadNew(Buffer const * buf, LyXLex & lex)
-//{
-// string line;
-// istream & is = lex.getStream();
-//
-// l_getline(is, line);
-// if (!prefixIs(line, "<LyXTabular ")) {
-// OldFormatRead(lex, line);
-// return;
-// }
-//
-// int version;
-// if (!getTokenValue(line, "version", version))
-// return;
-//#else
void LyXTabular::ReadNew(Buffer const * buf, istream & is,
LyXLex & lex, string const & l)
{
string line(l);
-//#endif
int rows_arg;
if (!getTokenValue(line, "rows", rows_arg))
return;
cell_info[i][j].inset.Read(buf, lex);
l_getline(is, line);
}
- if (line != "</cell>") {
+ if (!prefixIs(line, "</cell>")) {
lyxerr << "Wrong tabular format (expected </cell> got" <<
line << ")" << endl;
return;
}
}
l_getline(is, line);
- if (line != "</row>") {
+ if (!prefixIs(line, "</row>")) {
lyxerr << "Wrong tabular format (expected </row> got" <<
line << ")" << endl;
return;
}
}
- while (line != "</lyxtabular>") {
+ while (!prefixIs(line, "</lyxtabular>")) {
l_getline(is, line);
}
set_row_column_number_info();
}
-// #else
-
-// void LyXTabular::Read(Buffer const * buf, LyXLex & lex)
-// {
-// string line;
-// istream & is = lex.getStream();
-
-// l_getline(is, line);
-// if (!prefixIs(line, "<LyXTabular ")) {
-// OldFormatRead(lex, line);
-// return;
-// }
-
-// int version;
-// int rows_arg;
-// int columns_arg;
-// if (!getTokenValue(line, "version", version))
-// return;
-// if (!getTokenValue(line, "rows", rows_arg))
-// return;
-// if (!getTokenValue(line, "columns", columns_arg))
-// return;
-// Init(rows_arg, columns_arg);
-// l_getline(is, line);
-// if (!prefixIs(line, "<Features ")) {
-// lyxerr << "Wrong tabular format (expected <Feture ...> got" <<
-// line << ")" << endl;
-// return;
-// }
-// getTokenValue(line, "islongtable", is_long_tabular);
-// getTokenValue(line, "endhead", endhead);
-// getTokenValue(line, "endfirsthead", endfirsthead);
-// getTokenValue(line, "endfoot", endfoot);
-// getTokenValue(line, "endlastfoot", endlastfoot);
-
-// for (int i = 0; i < rows_; ++i) {
-// l_getline(is, line);
-// if (!prefixIs(line, "<Row ")) {
-// 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, "newpage", row_info[i].newpage);
-// for (int j = 0; j < columns_; ++j) {
-// l_getline(is,line);
-// if (!prefixIs(line,"<Column")) {
-// lyxerr << "Wrong tabular format (expected <Column ...> got" <<
-// line << ")" << endl;
-// return;
-// }
-// if (!i) {
-// getTokenValue(line, "alignment", column_info[j].alignment);
-// getTokenValue(line, "valignment", column_info[j].valignment);
-// getTokenValue(line, "leftline", column_info[j].left_line);
-// getTokenValue(line, "rightline", column_info[j].right_line);
-// getTokenValue(line, "width", column_info[j].p_width);
-// getTokenValue(line, "special", column_info[j].align_special);
-// }
-// l_getline(is, line);
-// if (!prefixIs(line, "<Cell")) {
-// lyxerr << "Wrong tabular format (expected <Cell ...> got" <<
-// line << ")" << endl;
-// return;
-// }
-// getTokenValue(line, "multicolumn", cell_info[i][j].multicolumn);
-// getTokenValue(line, "alignment", cell_info[i][j].alignment);
-// getTokenValue(line, "valignment", cell_info[i][j].valignment);
-// getTokenValue(line, "topline", cell_info[i][j].top_line);
-// getTokenValue(line, "bottomline", cell_info[i][j].bottom_line);
-// getTokenValue(line, "leftline", cell_info[i][j].left_line);
-// getTokenValue(line, "rightline", cell_info[i][j].right_line);
-// getTokenValue(line, "rotate", cell_info[i][j].rotate);
-// getTokenValue(line, "usebox", cell_info[i][j].usebox);
-// getTokenValue(line, "width", cell_info[i][j].p_width);
-// 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);
-// l_getline(is, line);
-// }
-// if (line != "</Cell>") {
-// lyxerr << "Wrong tabular format (expected </Cell> got" <<
-// line << ")" << endl;
-// return;
-// }
-// l_getline(is, line);
-// if (line != "</Column>") {
-// lyxerr << "Wrong tabular format (expected </Column> got" <<
-// line << ")" << endl;
-// return;
-// }
-// }
-// l_getline(is, line);
-// if (line != "</Row>") {
-// lyxerr << "Wrong tabular format (expected </Row> got" <<
-// line << ")" << endl;
-// return;
-// }
-// }
-// while (line != "</LyXTabular>") {
-// l_getline(is, line);
-// }
-// set_row_column_number_info();
-// }
-// #endif
void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
{
int version;
- int i, j;
+ int i;
+ int j;
int rows_arg = 0;
int columns_arg = 0;
int is_long_tabular_arg = false;
InsetText * inset = GetCellInset(cell);
int row;
+#ifndef NEW_INSETS
for (int i = 0; i < par->Last(); ++i) {
+#else
+ for (int i = 0; i < par->size(); ++i) {
+#endif
if (par->IsNewline(i)) {
++cell;
if (cell > GetNumberOfCells()) {
}
}
par->CopyIntoMinibuffer(*owner_->BufferOwner(), i);
+#ifndef NEW_INSETS
inset->par->InsertFromMinibuffer(inset->par->Last());
+#else
+ inset->par->InsertFromMinibuffer(inset->par->size());
+#endif
}
delete par;
Reinit();
}
-string const LyXTabular::GetDocBookAlign(int cell, bool isColumn) const
-{
- int const i = isColumn ? cell : column_of_cell(cell);
-
- if (!isColumn && IsMultiColumn(cell)) {
- if (!cellinfo_of_cell(cell)->align_special.empty()) {
- return cellinfo_of_cell(cell)->align_special;
- } else {
- switch (GetAlignment(cell)) {
- case LYX_ALIGN_LEFT:
- return "left";
- case LYX_ALIGN_RIGHT:
- return "right";
- default:
- return "center";
- }
- }
- } else {
- if (!column_info[i].align_special.empty()) {
- return column_info[i].align_special;
- }
-#ifdef IGNORE_THIS_FOR_NOW
- else if (!column_info[i].p_width.empty()) {
- file += "p{";
- file += column_info[i].p_width;
- file += '}';
- }
-#endif
- else {
- switch (column_info[i].alignment) {
- case LYX_ALIGN_LEFT:
- return "left";
- case LYX_ALIGN_RIGHT:
- return "right";
- default:
- return "center";
- }
- }
- }
-}
-
-
-// cell <0 will tex the preamble
-// returns the number of printed newlines
-int LyXTabular::DocBookEndOfCell(ostream & os, int cell, int & depth) const
-{
- int ret = 0;
- if (IsLastCell(cell)) {
- os << newlineAndDepth(--depth)
- << "</ENTRY>"
- << newlineAndDepth(--depth)
- << "</ROW>"
- << newlineAndDepth(--depth)
- << "</TBODY>"
- << newlineAndDepth(--depth);
- if (is_long_tabular)
- os << "</TGROUP>";
- else
- os << "</TGROUP>"
- << newlineAndDepth(--depth);
- ret += 4;
- } else {
- if (cell < 0) {
- // preamble
- if (is_long_tabular)
- os << "<TGROUP ";
- else
- os << "<TGROUP ";
- os << "COLS='"
- << columns_
- << "' COLSEP='1' ROWSEP='1'>"
- << newlineAndDepth(++depth);
- ++ret;
- for (int i = 0; i < columns_; ++i) {
- os << "<COLSPEC ALIGN='"
- << GetDocBookAlign(i, true)
- << "' COLNAME='col"
- << i + 1
- << "' COLNUM='"
- << i + 1
- << "' COLSEP='";
- if (i == (columns_-1)) {
- os << '1';
- } else {
- if (column_info[i].right_line ||
- column_info[i+1].left_line)
- os << '1';
- else
- os << '0';
- }
- os << "'>"
- << newlineAndDepth(depth);
- ++ret;
-#ifdef NOT_HANDLED_YET_AS_I_DONT_KNOW_HOW
- if (column_info[i].left_line)
- os << '|';
-#endif
- }
- os << "<TBODY>"
- << newlineAndDepth(++depth)
- << "<ROW>"
- << newlineAndDepth(++depth)
- << "<ENTRY ALIGN='"
- << GetDocBookAlign(0)
- << "'";
- if (IsMultiColumn(0)) {
- os << " NAMEST='col1' NAMEEND='col"
- << cells_in_multicolumn(0)
- << "'";
- }
- os << ">"
- << newlineAndDepth(++depth);
- ret += 3;
- } else {
- if (IsLastCellInRow(cell)) {
- os << newlineAndDepth(--depth)
- << "</ENTRY>"
- << newlineAndDepth(--depth)
- << "</ROW>"
- << newlineAndDepth(depth)
- << "<ROW>"
- << newlineAndDepth(++depth)
- << "<ENTRY ALIGN='"
- << GetDocBookAlign(cell + 1)
- << "' VALIGN='middle'";
- if (IsMultiColumn(cell + 1)) {
- os << " NAMEST='col"
- << column_of_cell(cell + 1) + 1
- << "' NAMEEND='col"
- << column_of_cell(cell + 1) +
- cells_in_multicolumn(cell + 1)
- << "'";
- }
- os << ">"
- << newlineAndDepth(++depth);
- ret += 4;
- } else {
- os << newlineAndDepth(--depth)
- << "</ENTRY>"
- << newlineAndDepth(depth)
- << "<ENTRY ALIGN='"
- << GetDocBookAlign(cell + 1)
- << "' VALIGN='middle'";
- if (IsMultiColumn(cell + 1)) {
- os << " NAMEST='col"
- << column_of_cell(cell + 1) + 1
- << "' NAMEEND='col"
- << column_of_cell(cell + 1) +
- cells_in_multicolumn(cell + 1)
- << "'";
- }
- os << ">"
- << newlineAndDepth(++depth);
- ret += 3;
- }
- }
- }
- return ret;
-}
-
-
bool LyXTabular::IsMultiColumn(int cell, bool real) const
{
return ((!real || (column_of_cell(cell) != right_column_of_cell(cell))) &&
if (LeftLine(cell))
os << '|';
if (!GetPWidth(cell).empty()) {
+#warning Jürgen, are these alignments correct? (Lgb)
switch (GetVAlignment(cell)) {
case LYX_VALIGN_TOP:
os << "p";
} else if (GetUsebox(cell) == BOX_MINIPAGE) {
os << "\\begin{minipage}[";
switch (GetVAlignment(cell)) {
+#warning Jürgen, are these alignments correct? (Lgb)
case LYX_VALIGN_TOP:
os << "t";
break;
os << column_info[i].align_special;
} else if (!column_info[i].p_width.empty()) {
switch (column_info[i].valignment) {
+#warning Jürgen, are these alignments correct? (Lgb)
case LYX_VALIGN_TOP:
os << "p";
break;
//+ the single row and columns (cells) +
//+---------------------------------------------------------------------
- //int bret;
for (int i = 0; i < rows_; ++i) {
ret += TeXTopHLine(os, i);
int bret = ret;
InsetText * inset = GetCellInset(cell);
bool rtl = inset->par->isRightToLeftPar(buf->params) &&
+#ifndef NEW_INSETS
inset->par->Last() > 0 && GetPWidth(cell).empty();
+#else
+ inset->par->size() > 0 && GetPWidth(cell).empty();
+#endif
if (rtl)
os << "\\R{";
ret += inset->Latex(buf, os, fragile, fp);
}
-static
+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
else
os << " ";
- return ret * 0; // eh? (Lgb)
+ return ret;
}
features.longtable = true;
if (NeedRotating())
features.rotating = true;
- for (int cell = 0; cell < numberofcells; ++cell) {
+ for (int cell = 0; !features.array && (cell < numberofcells); ++cell) {
if (GetVAlignment(cell) != LYX_VALIGN_TOP)
features.array = true;
GetCellInset(cell)->Validate(features);
}
+#ifndef NEW_INSETS
LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
{
LyXParagraph * par = GetCellInset(cell)->par;
- for (; par; par = par->next) {
+ for (; par; par = par->next_) {
for (int i = 0; i < par->Last(); ++i) {
if (par->GetChar(i) == LyXParagraph::META_NEWLINE)
return BOX_PARBOX;
}
return BOX_NONE;
}
+#else
+LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
+{
+ LyXParagraph * par = GetCellInset(cell)->par;
+
+ for (; par; par = par->next()) {
+ for (int i = 0; i < par->size(); ++i) {
+ if (par->GetChar(i) == LyXParagraph::META_NEWLINE)
+ return BOX_PARBOX;
+ }
+ }
+ return BOX_NONE;
+}
+#endif
projects / lyx.git / blobdiff