anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx/table.cpp: fix bug #8204, also OK for branch or too late?

Browse Source
This commit is contained in:
Uwe Stöhr 2012-06-20 23:24:35 +02:00
parent 858a088c7f
commit c00fd8f8be
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tex2lyx/table.cpp
View File

@ -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';
}