From 53e99dced5978d62cf2a99ffc2ea8b5ec87518d5 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Wed, 11 May 2011 14:26:48 +0000 Subject: [PATCH] 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 --- src/insets/InsetTabular.cpp | 4 +++- status.20x | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 4686862826..4a267e9d47 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -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); diff --git a/status.20x b/status.20x index 062921ca79..87255ab933 100644 --- a/status.20x +++ b/status.20x @@ -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).