From: Richard Heck <rgheck@comcast.net>
Date: Mon, 14 Dec 2009 15:44:49 +0000 (+0000)
Subject: Fix multicolumn output.
X-Git-Tag: 2.0.0~4819
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5f04bedb1cf8298de503db1fd7aff95d8a52c3c6;p=features.git

Fix multicolumn output.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32526 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 109bcd862c..eaa2f94e19 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -2672,7 +2672,7 @@ docstring Tabular::xhtmlRow(XHTMLStream & xs, row_type row,
 		attr << "'";
 
 		if (isMultiColumn(cell))
-			attr << " colspan='" << j + columnSpan(cell) - 1<< "'";
+			attr << " colspan='" << columnSpan(cell) << "'";
 
 		xs << StartTag("td", attr.str());
 		ret += cellInset(cell)->xhtml(xs, runparams);