From 616c75ba57da0463a5c9dd24280c5fc8f6173d1e Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 31 Aug 2006 16:29:49 +0000
Subject: [PATCH] Support rows that are *completely* overlapped by the
 preceding row

---
 xsl/common/table.xsl | 12 ++++++++++++
 xsl/fo/table.xsl     | 40 ++++++++++++++++++++++++++++++++++++++++
 xsl/html/table.xsl   | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+)

diff --git a/xsl/common/table.xsl b/xsl/common/table.xsl
index 4032543b9..c70267d51 100644
--- a/xsl/common/table.xsl
+++ b/xsl/common/table.xsl
@@ -461,4 +461,16 @@ or 0 (the empty string)</para>
   </xsl:for-each>
 </xsl:template>
 
+<xsl:template name="consume-row">
+  <xsl:param name="spans"/>
+
+  <xsl:if test="contains($spans,':')">
+    <xsl:value-of select="substring-before($spans,':') - 1"/>
+    <xsl:text>:</xsl:text>
+    <xsl:call-template name="consume-row">
+      <xsl:with-param name="spans" select="substring-after($spans,':')"/>
+    </xsl:call-template>
+  </xsl:if>
+</xsl:template>
+
 </xsl:stylesheet>
diff --git a/xsl/fo/table.xsl b/xsl/fo/table.xsl
index 26dcbd010..ccc497a8e 100644
--- a/xsl/fo/table.xsl
+++ b/xsl/fo/table.xsl
@@ -684,6 +684,46 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 <xsl:template match="row">
   <xsl:param name="spans"/>
 
+  <xsl:choose>
+    <xsl:when test="contains($spans, '0')">
+      <xsl:call-template name="normal-row">
+	<xsl:with-param name="spans" select="$spans"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+      <!--
+      <xsl:message>
+	<xsl:text>Ignoring row: </xsl:text>
+	<xsl:value-of select="$spans"/>
+	<xsl:text> = </xsl:text>
+	<xsl:call-template name="consume-row">
+	  <xsl:with-param name="spans" select="$spans"/>
+	</xsl:call-template>
+      </xsl:message>
+      -->
+
+      <xsl:if test="normalize-space(.//text()) != ''">
+	<xsl:message>Warning: overlapped row contains content!</xsl:message>
+      </xsl:if>
+
+      <fo:table-row>
+	<xsl:comment> This row intentionally left blank </xsl:comment>
+      </fo:table-row>
+
+      <xsl:apply-templates select="following-sibling::row[1]">
+	<xsl:with-param name="spans">
+	  <xsl:call-template name="consume-row">
+	    <xsl:with-param name="spans" select="$spans"/>
+	  </xsl:call-template>
+	</xsl:with-param>
+      </xsl:apply-templates>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="normal-row">
+  <xsl:param name="spans"/>
+
   <xsl:variable name="bgcolor">
     <xsl:call-template name="dbfo-attribute">
       <xsl:with-param name="pis" select="processing-instruction('dbfo')"/>
diff --git a/xsl/html/table.xsl b/xsl/html/table.xsl
index 18c344fed..a11ffe028 100644
--- a/xsl/html/table.xsl
+++ b/xsl/html/table.xsl
@@ -525,6 +525,44 @@
 <xsl:template match="row">
   <xsl:param name="spans"/>
 
+  <xsl:choose>
+    <xsl:when test="contains($spans, '0')">
+      <xsl:call-template name="normal-row">
+	<xsl:with-param name="spans" select="$spans"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+      <!--
+      <xsl:message>
+	<xsl:text>Ignoring row: </xsl:text>
+	<xsl:value-of select="$spans"/>
+	<xsl:text> = </xsl:text>
+	<xsl:call-template name="consume-row">
+	  <xsl:with-param name="spans" select="$spans"/>
+	</xsl:call-template>
+      </xsl:message>
+      -->
+
+      <xsl:if test="normalize-space(.//text()) != ''">
+	<xsl:message>Warning: overlapped row contains content!</xsl:message>
+      </xsl:if>
+
+      <tr><xsl:comment> This row intentionally left blank </xsl:comment></tr>
+
+      <xsl:apply-templates select="following-sibling::row[1]">
+	<xsl:with-param name="spans">
+	  <xsl:call-template name="consume-row">
+	    <xsl:with-param name="spans" select="$spans"/>
+	  </xsl:call-template>
+	</xsl:with-param>
+      </xsl:apply-templates>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="normal-row">
+  <xsl:param name="spans"/>
+
   <xsl:variable name="row-height">
     <xsl:if test="processing-instruction('dbhtml')">
       <xsl:call-template name="dbhtml-attribute">
-- 
2.50.1