+2001-01-10 Lars Gullik Bjønnes <larsbj@lyx.org>
+
+ * src/tabular.C (Write): write lowercase identifiers
+ (Read): read lowercase identifiers
+
2001-01-10 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/support/lyxstring.C (rfind): better fix (from Dekel).
2001-01-10 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/support/lyxstring.C (rfind): better fix (from Dekel).
void LyXTabular::Write(Buffer const * buf, ostream & os) const
{
// header line
void LyXTabular::Write(Buffer const * buf, ostream & os) const
{
// header line
<< write_attribute("version", 2)
<< write_attribute("rows", rows_)
<< write_attribute("columns", columns_)
<< ">\n";
// global longtable options
<< write_attribute("version", 2)
<< write_attribute("rows", rows_)
<< write_attribute("columns", columns_)
<< ">\n";
// global longtable options
//#if 0
// << write_attribute("rotate", type2string(rotate))
// << write_attribute("islongtable", type2string(is_long_tabular))
//#if 0
// << write_attribute("rotate", type2string(rotate))
// << write_attribute("islongtable", type2string(is_long_tabular))
<< write_attribute("endlastfoot", endlastfoot)
<< ">\n";
for (int j = 0; j < columns_; ++j) {
<< write_attribute("endlastfoot", endlastfoot)
<< ">\n";
for (int j = 0; j < columns_; ++j) {
//#if 0
// << write_attribute("alignment", type2string(column_info[j].alignment))
// << write_attribute("valignment", type2string(column_info[j].valignment))
//#if 0
// << write_attribute("alignment", type2string(column_info[j].alignment))
// << write_attribute("valignment", type2string(column_info[j].valignment))
<< ">\n";
}
for (int i = 0; i < rows_; ++i) {
<< ">\n";
}
for (int i = 0; i < rows_; ++i) {
//#if 0
// << write_attribute("topline", type2string(row_info[i].top_line))
// << write_attribute("bottomline", type2string(row_info[i].bottom_line))
//#if 0
// << write_attribute("topline", type2string(row_info[i].top_line))
// << write_attribute("bottomline", type2string(row_info[i].bottom_line))
for (int j = 0; j < columns_; ++j) {
#if 0
if (!i) {
for (int j = 0; j < columns_; ++j) {
#if 0
if (!i) {
//#if 0
// << write_attribute("alignment", type2string(column_info[j].alignment))
// << write_attribute("valignment", type2string(column_info[j].valignment))
//#if 0
// << write_attribute("alignment", type2string(column_info[j].alignment))
// << write_attribute("valignment", type2string(column_info[j].valignment))
<< write_attribute("special", column_info[j].align_special)
<< ">\n";
} else {
<< write_attribute("special", column_info[j].align_special)
<< ">\n";
} else {
<< write_attribute("multicolumn", cell_info[i][j].multicolumn)
//#if 0
// << write_attribute("alignment", type2string(cell_info[i][j].alignment))
<< write_attribute("multicolumn", cell_info[i][j].multicolumn)
//#if 0
// << write_attribute("alignment", type2string(cell_info[i][j].alignment))
os << "\\begin_inset ";
cell_info[i][j].inset.Write(buf, os);
os << "\n\\end_inset \n"
os << "\\begin_inset ";
cell_info[i][j].inset.Write(buf, os);
os << "\n\\end_inset \n"
- os << "</LyXTabular>\n";
+ os << "</lyxtabular>\n";
istream & is = lex.getStream();
l_getline(is, line);
istream & is = lex.getStream();
l_getline(is, line);
- if (!prefixIs(line, "<LyXTabular ")) {
+ if (!prefixIs(line, "<lyxtabular ")
+ && !prefixIs(line, "<LyXTabular ")) {
OldFormatRead(lex, line);
return;
}
OldFormatRead(lex, line);
return;
}
return;
Init(rows_arg, columns_arg);
l_getline(is, line);
return;
Init(rows_arg, columns_arg);
l_getline(is, line);
- if (!prefixIs(line, "<Features")) {
- lyxerr << "Wrong tabular format (expected <Feture ...> got" <<
+ if (!prefixIs(line, "<features")) {
+ lyxerr << "Wrong tabular format (expected <features ...> got" <<
line << ")" << endl;
return;
}
line << ")" << endl;
return;
}
for (int j = 0; j < columns_; ++j) {
l_getline(is,line);
for (int j = 0; j < columns_; ++j) {
l_getline(is,line);
- if (!prefixIs(line,"<Column")) {
- lyxerr << "Wrong tabular format (expected <Column ...> got" <<
+ if (!prefixIs(line,"<column")) {
+ lyxerr << "Wrong tabular format (expected <column ...> got" <<
line << ")" << endl;
return;
}
line << ")" << endl;
return;
}
for (int i = 0; i < rows_; ++i) {
l_getline(is, line);
for (int i = 0; i < rows_; ++i) {
l_getline(is, line);
- if (!prefixIs(line, "<Row")) {
- lyxerr << "Wrong tabular format (expected <Row ...> got" <<
+ if (!prefixIs(line, "<row")) {
+ lyxerr << "Wrong tabular format (expected <row ...> got" <<
line << ")" << endl;
return;
}
line << ")" << endl;
return;
}
getTokenValue(line, "newpage", row_info[i].newpage);
for (int j = 0; j < columns_; ++j) {
l_getline(is, line);
getTokenValue(line, "newpage", row_info[i].newpage);
for (int j = 0; j < columns_; ++j) {
l_getline(is, line);
- if (!prefixIs(line, "<Cell")) {
- lyxerr << "Wrong tabular format (expected <Cell ...> got" <<
+ if (!prefixIs(line, "<cell")) {
+ lyxerr << "Wrong tabular format (expected <cell ...> got" <<
line << ")" << endl;
return;
}
line << ")" << endl;
return;
}
cell_info[i][j].inset.Read(buf, lex);
l_getline(is, line);
}
cell_info[i][j].inset.Read(buf, lex);
l_getline(is, line);
}
- if (line != "</Cell>") {
- lyxerr << "Wrong tabular format (expected </Cell> got" <<
+ if (line != "</cell>") {
+ lyxerr << "Wrong tabular format (expected </cell> got" <<
line << ")" << endl;
return;
}
}
l_getline(is, line);
line << ")" << endl;
return;
}
}
l_getline(is, line);
- if (line != "</Row>") {
- lyxerr << "Wrong tabular format (expected </Row> got" <<
+ if (line != "</row>") {
+ lyxerr << "Wrong tabular format (expected </row> got" <<
line << ")" << endl;
return;
}
}
line << ")" << endl;
return;
}
}
- while (line != "</LyXTabular>") {
+ while (line != "</lyxtabular>") {
l_getline(is, line);
}
set_row_column_number_info();
l_getline(is, line);
}
set_row_column_number_info();