anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

multicolumn improvemnt

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5004 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2002-08-15 18:04:01 +00:00
parent 0cfafddc7d
commit 1538facded
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mathed/math_gridinset.C
View File

@ -534,9 +534,9 @@ string MathGridInset::eolString(row_type row, bool fragile) const
}
string MathGridInset::eocString(col_type col) const
string MathGridInset::eocString(col_type col, col_type lastcol) const
{
if (col + 1 == ncols())
if (col + 1 == lastcol)
return string();
return " & ";
}
@ -864,8 +864,12 @@ void MathGridInset::write(WriteStream & os) const
for (row_type row = 0; row < nrows(); ++row) {
os << verboseHLine(rowinfo_[row].lines_);
// don't write & and empty cells at end of line
col_type lastcol = 0;
for (col_type col = 0; col < ncols(); ++col)
os << cell(index(row, col)) << eocString(col);
if (!cell(index(row, col)).empty())
lastcol = col + 1;
for (col_type col = 0; col < lastcol; ++col)
os << cell(index(row, col)) << eocString(col, lastcol);
os << eolString(row, os.fragile());
}
string const s = verboseHLine(rowinfo_[nrows()].lines_);

2
src/mathed/math_gridinset.h
View File

@ -218,7 +218,7 @@ protected:
/// returns proper 'end of line' code for LaTeX
virtual string eolString(row_type row, bool fragile = false) const;
/// returns proper 'end of column' code for LaTeX
virtual string eocString(col_type col) const;
virtual string eocString(col_type col, col_type lastcol) const;
/// extract number of columns from alignment string
col_type guessColumns(string const & halign) const;
/// splits cells and shifts right part to the next cell

2
src/mathed/math_parser.C
View File

@ -853,7 +853,7 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
cell = &grid.cell(grid.index(cellrow, cellcol));
}
#if 1
#if 0
else if (t.cs() == "multicolumn") {
// extract column count and insert dummy cells
MathArray count;