mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Fix multirow output for XHTML, now for branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38707 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
691107bb7a
commit
53e99dced5
@ -2867,7 +2867,7 @@ docstring Tabular::xhtmlRow(XHTMLStream & xs, row_type row,
|
||||
|
||||
xs << html::StartTag("tr");
|
||||
for (col_type c = 0; c < ncols(); ++c) {
|
||||
if (isPartOfMultiColumn(row, c))
|
||||
if (isPartOfMultiColumn(row, c) || isPartOfMultiRow(row, c))
|
||||
continue;
|
||||
|
||||
stringstream attr;
|
||||
@ -2899,6 +2899,8 @@ docstring Tabular::xhtmlRow(XHTMLStream & xs, row_type row,
|
||||
|
||||
if (isMultiColumn(cell))
|
||||
attr << " colspan='" << columnSpan(cell) << "'";
|
||||
else if (isMultiRow(cell))
|
||||
attr << " rowspan='" << rowSpan(cell) << "'";
|
||||
|
||||
xs << html::StartTag(celltag, attr.str()) << html::CR();
|
||||
ret += cellInset(cell)->xhtml(xs, runparams);
|
||||
|
@ -64,15 +64,20 @@ What's new
|
||||
|
||||
- Macros that use other macros now output properly to XHTML (bug #7532).
|
||||
|
||||
- Fixed XHTML output for tables that use multirow.
|
||||
|
||||
|
||||
* USER INTERFACE
|
||||
|
||||
- Fix crash relating to outliner and mouse movement.
|
||||
|
||||
- Fix crash when putting multirow tables into notes---or any other inset
|
||||
that appears in the outliner (bug #7547).
|
||||
|
||||
- Advanced F&R would previously ask to open a master document under some
|
||||
circumstances, or do strange things with \selectlanguage(bug #6560). This
|
||||
has been mostly fixed. Please see the bug report for remaining issues.
|
||||
|
||||
- Fix crash relating to outliner and mouse movement.
|
||||
|
||||
- Show the correct label after adding a line to an AMS Multline formula (bug
|
||||
#7511).
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user