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

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 4686862826697d1a2d0c471f80eb8b19b524f378..4a267e9d47e0f367d1a6fc232bde362f6bb8f3a7 100644 (file)
--- 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 062921ca795d0865dec9ba1ae47c960c75590b59..87255ab93350d79686c02bb39dbaa322ad3b7ad0 100644 (file)
--- 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).