[docbook-checkins] CVS: xsl/fo table.xsl,1.44,1.45

[Robert S. <bob...@us...>]

Update of /cvsroot/docbook/xsl/fo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12436

Modified Files:
	table.xsl 
Log Message:
Fixed bug in char attribute, where text-align was being set to
any char value, even if the align attribute was not 'char'.
The CALS spec says text-align set to the value of char only
if the align attribute is 'char'.


Index: table.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/table.xsl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -U2 -r1.44 -r1.45
--- table.xsl	9 Aug 2005 09:30:44 -0000	1.44
+++ table.xsl	16 Aug 2005 19:26:31 -0000	1.45
@@ -750,15 +750,17 @@
       </xsl:if>
 
-      <xsl:if test="$align.inherit != ''">
-        <xsl:attribute name="text-align">
-          <xsl:value-of select="$align.inherit"/>
-        </xsl:attribute>
-      </xsl:if>
+      <xsl:choose>
+        <xsl:when test="$align.inherit = 'char' and $char.inherit != ''">
+          <xsl:attribute name="text-align">
+            <xsl:value-of select="$char.inherit"/>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:when test="$align.inherit != ''">
+          <xsl:attribute name="text-align">
+            <xsl:value-of select="$align.inherit"/>
+          </xsl:attribute>
+        </xsl:when>
+      </xsl:choose>
 
-      <xsl:if test="$char.inherit != ''">
-        <xsl:attribute name="text-align">
-          <xsl:value-of select="$char.inherit"/>
-        </xsl:attribute>
-      </xsl:if>
     </xsl:when>
     <xsl:otherwise>