anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 14:29:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lowercase tabular identifiers

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1312 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-01-10 18:18:30 +00:00
parent 7a837013fd
commit 4e839f35c6
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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> 2001-01-10 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/support/lyxstring.C (rfind): better fix (from Dekel). * src/support/lyxstring.C (rfind): better fix (from Dekel).

51
src/tabular.C
View File

@ -1072,13 +1072,13 @@ string const tostr(LyXTabular::BoxType const & num)
void LyXTabular::Write(Buffer const * buf, ostream & os) const void LyXTabular::Write(Buffer const * buf, ostream & os) const
{ {
// header line // header line
os << "<LyXTabular" os << "<lyxtabular"
<< write_attribute("version", 2) << write_attribute("version", 2)
<< write_attribute("rows", rows_) << write_attribute("rows", rows_)
<< write_attribute("columns", columns_) << write_attribute("columns", columns_)
<< ">\n"; << ">\n";
// global longtable options // global longtable options
os << "<Features" os << "<features"
//#if 0 //#if 0
// << write_attribute("rotate", type2string(rotate)) // << write_attribute("rotate", type2string(rotate))
// << write_attribute("islongtable", type2string(is_long_tabular)) // << write_attribute("islongtable", type2string(is_long_tabular))
@ -1092,7 +1092,7 @@ void LyXTabular::Write(Buffer const * buf, ostream & os) const
<< write_attribute("endlastfoot", endlastfoot) << write_attribute("endlastfoot", endlastfoot)
<< ">\n"; << ">\n";
for (int j = 0; j < columns_; ++j) { for (int j = 0; j < columns_; ++j) {
os << "<Column" os << "<column"
//#if 0 //#if 0
// << write_attribute("alignment", type2string(column_info[j].alignment)) // << write_attribute("alignment", type2string(column_info[j].alignment))
// << write_attribute("valignment", type2string(column_info[j].valignment)) // << write_attribute("valignment", type2string(column_info[j].valignment))
@ -1111,7 +1111,7 @@ void LyXTabular::Write(Buffer const * buf, ostream & os) const
<< ">\n"; << ">\n";
} }
for (int i = 0; i < rows_; ++i) { for (int i = 0; i < rows_; ++i) {
os << "<Row" os << "<row"
//#if 0 //#if 0
// << write_attribute("topline", type2string(row_info[i].top_line)) // << write_attribute("topline", type2string(row_info[i].top_line))
// << write_attribute("bottomline", type2string(row_info[i].bottom_line)) // << write_attribute("bottomline", type2string(row_info[i].bottom_line))
@ -1125,7 +1125,7 @@ void LyXTabular::Write(Buffer const * buf, ostream & os) const
for (int j = 0; j < columns_; ++j) { for (int j = 0; j < columns_; ++j) {
#if 0 #if 0
if (!i) { if (!i) {
os << "<Column" os << "<column"
//#if 0 //#if 0
// << write_attribute("alignment", type2string(column_info[j].alignment)) // << write_attribute("alignment", type2string(column_info[j].alignment))
// << write_attribute("valignment", type2string(column_info[j].valignment)) // << write_attribute("valignment", type2string(column_info[j].valignment))
@ -1144,10 +1144,10 @@ void LyXTabular::Write(Buffer const * buf, ostream & os) const
<< write_attribute("special", column_info[j].align_special) << write_attribute("special", column_info[j].align_special)
<< ">\n"; << ">\n";
} else { } else {
os << "<Column>\n"; os << "<column>\n";
} }
#endif #endif
os << "<Cell" os << "<cell"
<< write_attribute("multicolumn", cell_info[i][j].multicolumn) << write_attribute("multicolumn", cell_info[i][j].multicolumn)
//#if 0 //#if 0
// << write_attribute("alignment", type2string(cell_info[i][j].alignment)) // << write_attribute("alignment", type2string(cell_info[i][j].alignment))
@ -1174,14 +1174,14 @@ void LyXTabular::Write(Buffer const * buf, ostream & os) const
os << "\\begin_inset "; os << "\\begin_inset ";
cell_info[i][j].inset.Write(buf, os); cell_info[i][j].inset.Write(buf, os);
os << "\n\\end_inset \n" os << "\n\\end_inset \n"
<< "</Cell>\n"; << "</cell>\n";
#if 0 #if 0
<< "</Column>\n"; << "</column>\n";
#endif #endif
} }
os << "</Row>\n"; os << "</row>\n";
} }
os << "</LyXTabular>\n"; os << "</lyxtabular>\n";
} }
@ -1429,7 +1429,8 @@ void LyXTabular::Read(Buffer const * buf, LyXLex & lex)
istream & is = lex.getStream(); istream & is = lex.getStream();
l_getline(is, line); l_getline(is, line);
if (!prefixIs(line, "<LyXTabular ")) { if (!prefixIs(line, "<lyxtabular ")
&& !prefixIs(line, "<LyXTabular ")) {
OldFormatRead(lex, line); OldFormatRead(lex, line);
return; return;
} }
@ -1473,8 +1474,8 @@ void LyXTabular::ReadNew(Buffer const * buf, istream & is,
return; return;
Init(rows_arg, columns_arg); Init(rows_arg, columns_arg);
l_getline(is, line); l_getline(is, line);
if (!prefixIs(line, "<Features")) { if (!prefixIs(line, "<features")) {
lyxerr << "Wrong tabular format (expected <Feture ...> got" << lyxerr << "Wrong tabular format (expected <features ...> got" <<
line << ")" << endl; line << ")" << endl;
return; return;
} }
@ -1487,8 +1488,8 @@ void LyXTabular::ReadNew(Buffer const * buf, istream & is,
for (int j = 0; j < columns_; ++j) { for (int j = 0; j < columns_; ++j) {
l_getline(is,line); l_getline(is,line);
if (!prefixIs(line,"<Column")) { if (!prefixIs(line,"<column")) {
lyxerr << "Wrong tabular format (expected <Column ...> got" << lyxerr << "Wrong tabular format (expected <column ...> got" <<
line << ")" << endl; line << ")" << endl;
return; return;
} }
@ -1502,8 +1503,8 @@ void LyXTabular::ReadNew(Buffer const * buf, istream & is,
for (int i = 0; i < rows_; ++i) { for (int i = 0; i < rows_; ++i) {
l_getline(is, line); l_getline(is, line);
if (!prefixIs(line, "<Row")) { if (!prefixIs(line, "<row")) {
lyxerr << "Wrong tabular format (expected <Row ...> got" << lyxerr << "Wrong tabular format (expected <row ...> got" <<
line << ")" << endl; line << ")" << endl;
return; return;
} }
@ -1512,8 +1513,8 @@ void LyXTabular::ReadNew(Buffer const * buf, istream & is,
getTokenValue(line, "newpage", row_info[i].newpage); getTokenValue(line, "newpage", row_info[i].newpage);
for (int j = 0; j < columns_; ++j) { for (int j = 0; j < columns_; ++j) {
l_getline(is, line); l_getline(is, line);
if (!prefixIs(line, "<Cell")) { if (!prefixIs(line, "<cell")) {
lyxerr << "Wrong tabular format (expected <Cell ...> got" << lyxerr << "Wrong tabular format (expected <cell ...> got" <<
line << ")" << endl; line << ")" << endl;
return; return;
} }
@ -1533,20 +1534,20 @@ void LyXTabular::ReadNew(Buffer const * buf, istream & is,
cell_info[i][j].inset.Read(buf, lex); cell_info[i][j].inset.Read(buf, lex);
l_getline(is, line); l_getline(is, line);
} }
if (line != "</Cell>") { if (line != "</cell>") {
lyxerr << "Wrong tabular format (expected </Cell> got" << lyxerr << "Wrong tabular format (expected </cell> got" <<
line << ")" << endl; line << ")" << endl;
return; return;
} }
} }
l_getline(is, line); l_getline(is, line);
if (line != "</Row>") { if (line != "</row>") {
lyxerr << "Wrong tabular format (expected </Row> got" << lyxerr << "Wrong tabular format (expected </row> got" <<
line << ")" << endl; line << ")" << endl;
return; return;
} }
} }
while (line != "</LyXTabular>") { while (line != "</lyxtabular>") {
l_getline(is, line); l_getline(is, line);
} }
set_row_column_number_info(); set_row_column_number_info();