klease 02/02/23 08:47:02
Modified: src/codegen foproperties.xml properties.xsl
Log:
Add corresponding properties for space-*
Revision Changes Path
1.30 +9 -0 xml-fop/src/codegen/foproperties.xml
Index: foproperties.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/foproperties.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- foproperties.xml 17 Feb 2002 21:59:29 -0000 1.29
+++ foproperties.xml 23 Feb 2002 16:47:01 -0000 1.30
@@ -844,10 +844,18 @@
<property>
<name>space-before</name>
<use-generic>GenericSpace</use-generic>
+ <!-- Get corresponding margin property using PARENT's writing-mode -->
+ <corresponding use-if-specified="true">
+ <propval>margin-<parwmrel2abs dir="BEFORE"/></propval>
+ </corresponding>
</property>
<property>
<name>space-after</name>
<use-generic>GenericSpace</use-generic>
+ <!-- Get corresponding margin property using PARENT's writing-mode -->
+ <corresponding use-if-specified="true">
+ <propval>margin-<parwmrel2abs dir="AFTER"/></propval>
+ </corresponding>
</property>
<property>
<name>start-indent</name>
@@ -860,6 +868,7 @@
<propval>margin-<wmrel2abs dir="START"/></propval>+
<propval>padding-<wmrel2abs dir="START"/></propval>+
<propval>border-<wmrel2abs dir="START"/>-width</propval>
+ <!-- + parent start-indent unless parent generates ref area (?) -->
</propexpr>
</corresponding>
</property>
1.15 +5 -0 xml-fop/src/codegen/properties.xsl
Index: properties.xsl
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/properties.xsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- properties.xsl 22 Nov 2001 07:15:38 -0000 1.14
+++ properties.xsl 23 Feb 2002 16:47:01 -0000 1.15
@@ -459,6 +459,7 @@
<xsl:if test=".//corresponding">
<xsl:if test=".//corresponding/@use-if-specified='true'">
public boolean isCorrespondingForced(PropertyList propertyList) {
+ FObj parentFO = propertyList.getParentFObj();
StringBuffer sbExpr=new StringBuffer();
<xsl:for-each select=".//corresponding/propval">
sbExpr.setLength(0);
@@ -550,6 +551,10 @@
<xsl:template match="propval/wmrel2abs">
sbExpr.append(propertyList.wmRelToAbs(PropertyList.<xsl:value-of
select="@dir"/>));
+</xsl:template>
+
+<xsl:template match="propval/parwmrel2abs">
+ sbExpr.append(parentFO.properties.wmRelToAbs(PropertyList.<xsl:value-of
select="@dir"/>));
</xsl:template>
<xsl:template match="propval/wmabs2rel">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
