Return-Path: 
 <svn-return-4576-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 2309 invoked from network); 20 Dec 2005 19:06:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 20 Dec 2005 19:06:02 -0000
Received: (qmail 11511 invoked by uid 500); 20 Dec 2005 19:05:43 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 11436 invoked by uid 500); 20 Dec 2005 19:05:42 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 11425 invoked by uid 99); 20 Dec 2005 19:05:42 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2005 11:05:42 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 20 Dec 2005 11:05:41 -0800
Received: (qmail 1713 invoked by uid 65534); 20 Dec 2005 19:04:59 -0000
Message-ID: <20051220190459.1594.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r358073 -
 /forrest/branches/forrest_07_branch/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/resources/stylesheets/sdocbook2document.xsl
Date: Tue, 20 Dec 2005 19:04:15 -0000
To: svn@forrest.apache.org
From: josch@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: josch
Date: Tue Dec 20 11:02:37 2005
New Revision: 358073

URL: http://svn.apache.org/viewcvs?rev=358073&view=rev
Log:
added support for spans in tables, fixes FOR-769

Modified:
    forrest/branches/forrest_07_branch/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/resources/stylesheets/sdocbook2document.xsl

Modified: forrest/branches/forrest_07_branch/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/resources/stylesheets/sdocbook2document.xsl
URL: http://svn.apache.org/viewcvs/forrest/branches/forrest_07_branch/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/resources/stylesheets/sdocbook2document.xsl?rev=358073&r1=358072&r2=358073&view=diff
==============================================================================
--- forrest/branches/forrest_07_branch/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/resources/stylesheets/sdocbook2document.xsl (original)
+++ forrest/branches/forrest_07_branch/plugins/org.apache.forrest.plugin.input.simplifiedDocbook/resources/stylesheets/sdocbook2document.xsl Tue Dec 20 11:02:37 2005
@@ -621,22 +621,68 @@
       </xsl:template>
       <xsl:template match="entry" mode="thead">
             <th>
+                  <xsl:call-template name="entry.spans"/>
                   <xsl:apply-templates/>
             </th>
       </xsl:template>
       <xsl:template match="row">
             <tr>
-                  <xsl:apply-templates/>
+              <xsl:apply-templates/>
             </tr>
       </xsl:template>
       <xsl:template match="tbody|tfoot">
             <xsl:apply-templates/>
       </xsl:template>
+
       <xsl:template match="entry">
             <td>
+                  <xsl:call-template name="entry.spans"/>
                   <xsl:apply-templates/>
             </td>
       </xsl:template>
+
+      <xsl:template name="entry.spans">
+              <xsl:if test="@morerows">
+                <xsl:attribute name="rowspan">
+                  <xsl:value-of select="number(@morerows)+1"/>
+                </xsl:attribute>
+              </xsl:if>
+              <xsl:if test="@namest and @nameend">
+                  <xsl:attribute name="colspan">
+
+                  <xsl:variable name="start">
+                    <xsl:call-template name="colspec.index">
+                      <xsl:with-param name="olist" select="ancestor::tgroup/colspec"/>
+                      <xsl:with-param name="colname" select="@namest"/>
+                    </xsl:call-template>
+                  </xsl:variable>
+                  <xsl:variable name="end">
+                    <xsl:call-template name="colspec.index">
+                      <xsl:with-param name="olist" select="ancestor::tgroup/colspec"/>
+                      <xsl:with-param name="colname" select="@nameend"/>
+                    </xsl:call-template>
+                  </xsl:variable>
+
+                  <xsl:value-of select="number($end)-number($start)+1"/>
+                </xsl:attribute>
+              </xsl:if>
+      </xsl:template>
+      <xsl:template name="colspec.index">
+        <!-- calculate the index for a given colname, e.g. from entry/@nameend -->
+        <!-- inspired from the original docbook stylesheets -->
+        <xsl:param name="olist" select="//table/tgroup/colspec"/>
+        <xsl:param name="colname" select="c1"/>
+        <xsl:for-each select="$olist">
+          <xsl:if test="@colname=$colname">
+            <xsl:choose>
+              <xsl:when test="@colnum"><xsl:value-of select="@colnum"/></xsl:when>
+              <xsl:otherwise><xsl:value-of select="position()"/></xsl:otherwise>
+            </xsl:choose>
+          </xsl:if>
+        </xsl:for-each>
+      </xsl:template>
+
+
       <xsl:template match="trademark">
             <xsl:apply-templates/>
             <sup>TM</sup>