The branch, master, has been updated. - Log -----------------------------------------------------------------
commit c00fd8f8be2a8478f0ae6c8ed92a232dba269897 Author: Uwe Stöhr <[email protected]> Date: Wed Jun 20 23:24:35 2012 +0200 tex2lyx/table.cpp: fix bug #8204, also OK for branch or too late? diff --git a/src/tex2lyx/table.cpp b/src/tex2lyx/table.cpp index 399a555..a0de111 100644 --- a/src/tex2lyx/table.cpp +++ b/src/tex2lyx/table.cpp @@ -1164,8 +1164,20 @@ void handle_tabular(Parser & p, ostream & os, string const & name, cellinfo[row][col].content += os.str(); // add dummy cells for multicol - for (size_t i = 0; i < ncells - 1 && col < colinfo.size(); ++i) { + for (size_t i = 0; i + 1 < ncells; ++i) { ++col; + if (col >= colinfo.size()) { + cerr << "The cell '" + << cells[cell] + << "' specifies " + << convert<string>(ncells) + << " columns while the table has only " + << convert<string>(colinfo.size()) + << " columns!" + << " Therefore the surplus columns will be ignored." + << endl; + break; + } cellinfo[row][col].multi = CELL_PART_OF_MULTICOLUMN; cellinfo[row][col].align = 'c'; } ----------------------------------------------------------------------- Summary of changes: src/tex2lyx/table.cpp | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository
