+#ifndef USE_OLD_READFORMAT
+
+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, "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) {
+ l_getline(is,line);
+ if (!prefixIs(line,"<Column")) {
+ lyxerr << "Wrong tabular format (expected <Column ...> got" <<
+ line << ")" << endl;
+ return;
+ }
+ 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);
+ }
+
+ 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, "<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 != "</Row>") {
+ lyxerr << "Wrong tabular format (expected </Row> got" <<
+ line << ")" << endl;
+ return;
+ }
+ }
+ while (line != "</LyXTabular>") {
+ l_getline(is, line);
+ }
+ set_row_column_number_info();
+}
+
+#else
+