Add private function used in calculating corresponding property values

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

2 files changed, 76 insertions, 0 deletions

diff --git a/src/org/apache/fop/fo/expr/FopPropValFunction.java b/src/org/apache/fop/fo/expr/FopPropValFunction.java
new file mode 100644
index 000000000..d59f7bbf9
--- /dev/null
+++ b/src/org/apache/fop/fo/expr/FopPropValFunction.java
@@ -0,0 +1,74 @@
+/*-- $Id$ --
+
+ ============================================================================
+                   The Apache Software License, Version 1.1
+ ============================================================================
+ 
+    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without modifica-
+ tion, are permitted provided that the following conditions are met:
+ 
+ 1. Redistributions of  source code must  retain the above copyright  notice,
+    this list of conditions and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ 
+ 3. The end-user documentation included with the redistribution, if any, must
+    include  the following  acknowledgment:  "This product includes  software
+    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
+    Alternately, this  acknowledgment may  appear in the software itself,  if
+    and wherever such third-party acknowledgments normally appear.
+ 
+ 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
+    endorse  or promote  products derived  from this  software without  prior
+    written permission. For written permission, please contact
+    apache@apache.org.
+ 
+ 5. Products  derived from this software may not  be called "Apache", nor may
+    "Apache" appear  in their name,  without prior written permission  of the
+    Apache Software Foundation.
+ 
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
+ APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
+ DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
+ ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
+ (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ This software  consists of voluntary contributions made  by many individuals
+ on  behalf of the Apache Software  Foundation and was  originally created by
+ James Tauber <jtauber@jtauber.com>. For more  information on the Apache 
+ Software Foundation, please see <http://www.apache.org/>.
+ 
+ */
+package org.apache.fop.fo.expr;
+
+import org.apache.fop.fo.Property;
+
+
+/**
+ * Return the specified or initial value of the property on this object.
+ */
+public class FopPropValFunction extends FunctionBase {
+
+  public int nbArgs() { return 1; }
+
+  public Property eval(Property[] args, PropertyInfo pInfo)
+    throws PropertyException
+  {
+    String propName = args[0].getString();
+    if (propName == null) {
+      throw new PropertyException("Incorrect parameter to _int-property-value function");
+    }
+    System.err.println("Get property-value for " + propName);
+    return pInfo.getPropertyList().get( propName);
+  }
+
+} 
diff --git a/src/org/apache/fop/fo/expr/PropertyParser.java b/src/org/apache/fop/fo/expr/PropertyParser.java
index 209193194..b10cf671c 100644
--- a/src/org/apache/fop/fo/expr/PropertyParser.java
+++ b/src/org/apache/fop/fo/expr/PropertyParser.java
@@ -85,6 +85,8 @@ public class PropertyParser extends PropertyTokenizer {
     functionTable.put("from-parent", new FromParentFunction());
     functionTable.put("from-nearest-specified-value", new NearestSpecPropFunction());
     functionTable.put("proportional-column-width", new PPColWidthFunction());
+    // NOTE: used from code generated for corresponding properties
+    functionTable.put("_fop-property-value", new FopPropValFunction());
 
      /*** NOT YET IMPLEMENTED!!!
     functionTable.put("icc-color", new ICCcolorFunction());