Modify compound property handling; add support for corresponding properties and mixed property types

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193940 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 18 insertions, 0 deletions

diff --git a/src/org/apache/fop/fo/PropertyListBuilder.java b/src/org/apache/fop/fo/PropertyListBuilder.java
index e8f1ed214..c4da11f1b 100644
--- a/src/org/apache/fop/fo/PropertyListBuilder.java
+++ b/src/org/apache/fop/fo/PropertyListBuilder.java
@@ -90,7 +90,12 @@ public class PropertyListBuilder {
 	Property p = null;
 	Property.Maker propertyMaker = findMaker(space, element, propertyName);
 	if (propertyMaker != null) {
+	  try {
 	    p = propertyMaker.compute(propertyList);
+          } catch (FOPException e) {
+    	     MessageHandler.errorln("ERROR: exception occurred while computing" +
+    	         " value of property '" + propertyName +"': " + e.getMessage());
+          }
 	} else {
 	    MessageHandler.errorln("WARNING: property " + propertyName + " ignored");
 	}
@@ -209,6 +214,19 @@ public class PropertyListBuilder {
     }
     else return null;
   }
+    
+  
+    public boolean isCorrespondingForced(PropertyList propertyList, String space,
+    	 String element, String propertyName) {
+	Property.Maker propertyMaker = findMaker(space, element, propertyName);
+	if (propertyMaker != null) {
+	    return propertyMaker.isCorrespondingForced(propertyList);
+	} else {
+	    MessageHandler.errorln("WARNING: no Maker for " + propertyName);
+	}
+	return false;
+    }
+    
 
     public Property makeProperty(PropertyList propertyList, String space, String element, String propertyName) throws FOPException {