forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ferdin...@apache.org
Subject svn commit: r603903 - /forrest/branches/UpdateFOPto094/main/webapp/skins/common/xslt/fo/document-to-fo.xsl
Date Thu, 13 Dec 2007 12:22:06 GMT
Author: ferdinand
Date: Thu Dec 13 04:22:05 2007
New Revision: 603903

URL: http://svn.apache.org/viewvc?rev=603903&view=rev
Log:
Updates to make stylesheet work with fop .94

Modified:
    forrest/branches/UpdateFOPto094/main/webapp/skins/common/xslt/fo/document-to-fo.xsl

Modified: forrest/branches/UpdateFOPto094/main/webapp/skins/common/xslt/fo/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/main/webapp/skins/common/xslt/fo/document-to-fo.xsl?rev=603903&r1=603902&r2=603903&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/main/webapp/skins/common/xslt/fo/document-to-fo.xsl (original)
+++ forrest/branches/UpdateFOPto094/main/webapp/skins/common/xslt/fo/document-to-fo.xsl Thu
Dec 13 04:22:05 2007
@@ -292,7 +292,7 @@
                     <fo:region-before
                         region-name="even-header"
                         extent="0.5in"
-                    />
+                        />
                     <!-- commented out from region-body
                            because it is not standard conforming
                         border-bottom="0.5pt solid"  -->
@@ -314,8 +314,7 @@
                         margin-bottom=".5in" />
                     <fo:region-before
                         region-name="odd-header"
-                        extent="0.5in"
-                        />
+                        extent="0.5in" />
                     <!-- commented out from region-body
                         because it is not standard conforming
                         border-bottom="0.5pt solid"  -->
@@ -1172,16 +1171,22 @@
             color="#FFFFFF"
             background-color="{$background-color}"
             border="1pt solid {$border-color}">
-            <xsl:attribute
-                name="number-columns-spanned">
-                <xsl:value-of
-                    select="@colspan" />
-            </xsl:attribute>
-            <xsl:attribute
-                name="number-rows-spanned">
-                <xsl:value-of
-                    select="@rowspan" />
-            </xsl:attribute>
+            <xsl:if
+                test="@colspan!=''">
+                <xsl:attribute
+                    name="number-columns-spanned">
+                    <xsl:value-of
+                        select="@colspan" />
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if
+                test="@rowspan!=''">
+                <xsl:attribute
+                    name="number-rows-spanned">
+                    <xsl:value-of
+                        select="@rowspan" />
+                </xsl:attribute>
+            </xsl:if>
             <fo:block
                 text-align="center">
                 <xsl:apply-templates />
@@ -1203,16 +1208,22 @@
             padding-end="4pt"
             background-color="{$background-color}"
             border="1pt solid {$border-color}">
-            <xsl:attribute
-                name="number-columns-spanned">
-                <xsl:value-of
-                    select="@colspan" />
-            </xsl:attribute>
-            <xsl:attribute
-                name="number-rows-spanned">
-                <xsl:value-of
-                    select="@rowspan" />
-            </xsl:attribute>
+            <xsl:if
+                test="@colspan!=''">
+                <xsl:attribute
+                    name="number-columns-spanned">
+                    <xsl:value-of
+                        select="@colspan" />
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if
+                test="@rowspan!=''">
+                <xsl:attribute
+                    name="number-rows-spanned">
+                    <xsl:value-of
+                        select="@rowspan" />
+                </xsl:attribute>
+            </xsl:if>
             <fo:block>
                 <xsl:apply-templates />
             </fo:block>



Mime
View raw message