diff options
| -rw-r--r-- | src/codegen/fo-property-mapping.xsl | 25 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/Leader.java | 7 |
2 files changed, 24 insertions, 8 deletions
diff --git a/src/codegen/fo-property-mapping.xsl b/src/codegen/fo-property-mapping.xsl index b4acb2c8b..3c8a504e6 100644 --- a/src/codegen/fo-property-mapping.xsl +++ b/src/codegen/fo-property-mapping.xsl @@ -137,10 +137,27 @@ public class <xsl:value-of select="@family"/>PropertyMapping implements Constant } public static int getPropertyId(String name) { - Integer i = (Integer) s_htPropNames.get(name); - if (i == null) - return -1; - return i.intValue(); + // check to see if base.compound or just base property + int sepchar = name.indexOf('.'); + + if (sepchar > -1) { + Integer baseId = (Integer) s_htPropNames.get(name.substring(0, sepchar)); + if (baseId == null) { + return -1; + } else { + int cmpdId = getSubPropertyId(name.substring(sepchar + 1)); + if (cmpdId == -1) { + return -1; + } else { + return baseId.intValue() + cmpdId; + } + } + } else { + Integer baseId = (Integer) s_htPropNames.get(name); + if (baseId == null) + return -1; + return baseId.intValue(); + } } public static int getSubPropertyId(String name) { diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java index 8711f8ee2..3bb07c739 100644 --- a/src/java/org/apache/fop/fo/flow/Leader.java +++ b/src/java/org/apache/fop/fo/flow/Leader.java @@ -62,7 +62,7 @@ import org.apache.fop.fo.properties.CommonBackground; import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.fo.properties.CommonRelativePosition; -//import org.apache.fop.fo.properties.FOPropertyMapping; +import org.apache.fop.fo.properties.FOPropertyMapping; import org.apache.fop.fo.properties.LeaderPattern; import org.apache.fop.fonts.Font; @@ -166,9 +166,8 @@ public class Leader extends FObjMixed { public int getLength(String prop, int dim) { int length; -// int propId = FOPropertyMapping.getPropertyId(prop); -// System.out.println("prop/propID = " + prop + " " + propId); - Length maxlength = propertyList.get(prop).getLength(); + int propId = FOPropertyMapping.getPropertyId(prop); + Length maxlength = propertyList.get(propId).getLength(); if (maxlength instanceof PercentLength) { length = (int)(((PercentLength)maxlength).value() * dim); |