anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid dataloss with \multicolumn

Browse Source 
When \multicolumn{ncol}{align}{content} is parsed and the ncol
parameter is not a numeric value, this parameter is swallowed
and replaced with '1'. Hence, if the file is subsequently saved
a dataloss would occur. With this commit, \multicolumn is not
interpreted when ncol is not a numeric value and is left as is.

See also #10466
This commit is contained in:
Enrico Forestieri 2016-11-05 10:15:37 +01:00
parent 75fce32556
commit 34ae9dc7f2
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/mathed/MathParser.cpp
View File

@ -1364,35 +1364,40 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
}
else if (t.cs() == "multicolumn") {
// extract column count and insert dummy cells
// if the columns are specified numerically,
// extract column count and insert dummy cells,
// otherwise parse it as an user macro
MathData count;
parse(count, FLAG_ITEM, mode);
int cols = 1;
if (!extractNumber(count, cols)) {
success_ = false;
error("can't extract number of multicolumn cells");
}
// resize the table if necessary
size_t first = grid.index(cellrow, cellcol);
for (int i = 1; i < cols; ++i) {
if (addCol(grid, cellcol)) {
size_t const idx = grid.index(cellrow, cellcol);
grid.cellinfo(idx).multi_ =
InsetMathGrid::CELL_PART_OF_MULTICOLUMN;
int cols;
if (extractNumber(count, cols)) {
// resize the table if necessary
size_t first = grid.index(cellrow, cellcol);
for (int i = 1; i < cols; ++i) {
if (addCol(grid, cellcol)) {
size_t const idx = grid.index(cellrow, cellcol);
grid.cellinfo(idx).multi_ =
InsetMathGrid::CELL_PART_OF_MULTICOLUMN;
}
}
// the first cell is the real thing, not a dummy
cell = &grid.cell(first);
grid.cellinfo(first).multi_ =
InsetMathGrid::CELL_BEGIN_OF_MULTICOLUMN;
// read special alignment
MathData align;
parse(align, FLAG_ITEM, mode);
grid.cellinfo(first).align_ = asString(align);
// parse the remaining contents into the "real" cell
parse(*cell, FLAG_ITEM, mode);
} else {
MathAtom at = MathAtom(new MathMacro(buf, t.cs()));
cell->push_back(at);
cell->push_back(MathAtom(new InsetMathBrace(count)));
}
// the first cell is the real thing, not a dummy
cell = &grid.cell(first);
grid.cellinfo(first).multi_ = InsetMathGrid::CELL_BEGIN_OF_MULTICOLUMN;
// read special alignment
MathData align;
parse(align, FLAG_ITEM, mode);
grid.cellinfo(first).align_ = asString(align);
// parse the remaining contents into the "real" cell
parse(*cell, FLAG_ITEM, mode);
}
else if (t.cs() == "limits" || t.cs() == "nolimits") {