From e661ef1dd6b20a334f5c1ecf950711b6ad0a40b7 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 1 Apr 2009 00:05:10 +0000
Subject: [PATCH] Add support for colspan and rowspan and bgcolor in td and th
 elements in HTML table markup.

---
 xsl/fo/htmltbl.xsl | 51 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/xsl/fo/htmltbl.xsl b/xsl/fo/htmltbl.xsl
index 1954d956b..14f0105ba 100644
--- a/xsl/fo/htmltbl.xsl
+++ b/xsl/fo/htmltbl.xsl
@@ -156,15 +156,38 @@
 </xsl:template>
 
 <xsl:template match="td" mode="htmlTable">
-  <xsl:variable name="bgcolor">
+  <xsl:variable name="bgcolor.pi">
     <xsl:call-template name="pi.dbfo_bgcolor"/>
   </xsl:variable>
+  <xsl:variable name="bgcolor">
+    <xsl:choose>
+      <xsl:when test="$bgcolor.pi != ''">
+        <xsl:value-of select="$bgcolor.pi"/>
+      </xsl:when>
+      <xsl:when test="string-length(@bgcolor) != 0">
+        <xsl:value-of select="@bgcolor"/>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:variable>
   <fo:table-cell xsl:use-attribute-sets="table.cell.padding">
     <xsl:call-template name="table.cell.properties">
       <xsl:with-param name="bgcolor.pi" select="$bgcolor"/>
       <xsl:with-param name="rowsep.inherit" select="0"/>
       <xsl:with-param name="colsep.inherit" select="0"/>
     </xsl:call-template>
+
+    <xsl:if test="@colspan &gt; 1">
+      <xsl:attribute name="number-columns-spanned">
+        <xsl:value-of select="@colspan"/>
+      </xsl:attribute>
+    </xsl:if>
+
+    <xsl:if test="@rowspan &gt; 1">
+      <xsl:attribute name="number-rows-spanned">
+        <xsl:value-of select="@rowspan"/>
+      </xsl:attribute>
+    </xsl:if>
+
     <fo:block>
       <xsl:call-template name="table.cell.block.properties"/>
       <xsl:apply-templates/>
@@ -180,15 +203,39 @@
 </xsl:template>
 
 <xsl:template match="th" mode="htmlTable">
-  <xsl:variable name="bgcolor">
+  <xsl:variable name="bgcolor.pi">
     <xsl:call-template name="pi.dbfo_bgcolor"/>
   </xsl:variable>
+  <xsl:variable name="bgcolor">
+    <xsl:choose>
+      <xsl:when test="$bgcolor.pi != ''">
+        <xsl:value-of select="$bgcolor.pi"/>
+      </xsl:when>
+      <xsl:when test="string-length(@bgcolor) != 0">
+        <xsl:value-of select="@bgcolor"/>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:variable>
   <fo:table-cell xsl:use-attribute-sets="th.style table.cell.padding">
+
     <xsl:call-template name="table.cell.properties">
       <xsl:with-param name="bgcolor.pi" select="$bgcolor"/>
       <xsl:with-param name="rowsep.inherit" select="0"/>
       <xsl:with-param name="colsep.inherit" select="0"/>
     </xsl:call-template>
+
+    <xsl:if test="@colspan &gt; 1">
+      <xsl:attribute name="number-columns-spanned">
+        <xsl:value-of select="@colspan"/>
+      </xsl:attribute>
+    </xsl:if>
+
+    <xsl:if test="@rowspan &gt; 1">
+      <xsl:attribute name="number-rows-spanned">
+        <xsl:value-of select="@rowspan"/>
+      </xsl:attribute>
+    </xsl:if>
+
     <fo:block>
       <xsl:call-template name="table.cell.block.properties"/>
       <xsl:apply-templates/>
-- 
2.50.1