gmazza 2003/12/22 15:23:06
Modified: . build.xml
src/java/org/apache/fop/fo FObj.java Property.java
PropertyList.java PropertyManager.java
Added: src/codegen property-sets.xsl
src/java/org/apache/fop/fo PropertySets.java
Log:
Initial Check-in of PropertySets.java and .xsl. (Similar to Alt-Design's
PropertySets, however uses integer arrays to identify those properties
relevant for an FO.)
Revision Changes Path
1.96 +2 -0 xml-fop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- build.xml 22 Dec 2003 21:37:43 -0000 1.95
+++ build.xml 22 Dec 2003 23:23:05 -0000 1.96
@@ -920,6 +920,8 @@
<target name="xsltToJava" >
<style in="src\codegen\constants.xml" style="src\codegen\constants.xsl"
out="Constants.java"/>
+ <style in="src/codegen/foelements.xml" style="src/codegen/property-sets.xsl"
+ out="PropertySets.java"/>
</target>
<!-- =================================================================== -->
1.1 xml-fop/src/codegen/property-sets.xsl
Index: property-sets.xsl
===================================================================
<!-- $Id: property-sets.xsl,v 1.1 2003/12/22 23:23:05 gmazza Exp $
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2003 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
[EMAIL PROTECTED]
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 <[EMAIL PROTECTED]>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:output method="text" />
<xsl:include href="propinc.xsl"/>
<xsl:template match="root">
<xsl:text>
package org.apache.fop.fo;
import java.util.BitSet;
public class PropertySets {
public static short[][] mapping = null;
public static void initialize() {
mapping = new short[Constants.ELEMENT_COUNT][];
</xsl:text>
<xsl:apply-templates/>
<xsl:text>
boolean loop = true;
while (loop) {
loop = false;
</xsl:text>
<xsl:apply-templates mode="content"/>
}
<xsl:apply-templates mode="mapping"/>
<xsl:text>
}
private static short[] makeSparseIndices(BitSet set) {
short[] indices = new short[Constants.PROPERTY_COUNT];
indices[0] = (short) (set.cardinality() + 1);
int j = 1;
for (int i = set.nextSetBit(0); i >= 0; i = set.nextSetBit(i+1)) {
indices[i] = (short) j++;
}
return indices;
}
private static boolean mergeContent(BitSet node, BitSet content,
boolean loop)
{
int c = node.cardinality();
node.or(content);
if (c == node.cardinality())
return loop;
return true;
}
public static short[] getPropertySet(int elementId) {
if (mapping == null)
initialize();
return mapping[elementId];
}
}
</xsl:text>
</xsl:template>
<xsl:template match="common">
<xsl:variable name="name" select="name"/>
<xsl:text>
BitSet </xsl:text><xsl:value-of select="$name"/>
<xsl:text> = new BitSet();
</xsl:text>
<xsl:apply-templates select="property">
<xsl:with-param name="setname" select="$name"/>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="common/property">
<xsl:param name="setname"/>
<xsl:text> </xsl:text>
<xsl:value-of select="../name"/><xsl:text>.set(Constants.PR_</xsl:text>
<xsl:call-template name="makeEnumConstant">
<xsl:with-param name="propstr" select="." />
</xsl:call-template>);
</xsl:template>
<xsl:template match="element">
<!--
<xsl:text>
public static final int FO_</xsl:text>
<xsl:call-template name="makeEnumName">
<xsl:with-param name="propstr" select="name" />
</xsl:call-template>
<xsl:text> = </xsl:text>
<xsl:value-of select="count(preceding-sibling::element)"/>;
-->
<xsl:variable name="name">
<xsl:text>fo_</xsl:text>
<xsl:value-of select="translate(name, '-', '_')"/>
</xsl:variable>
<xsl:text>
BitSet </xsl:text><xsl:value-of select="$name"/>
<xsl:text> = new BitSet();
</xsl:text>
<xsl:apply-templates select="common-ref | property">
<xsl:with-param name="setname" select="$name"/>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="element" mode="content">
<xsl:variable name="name">
<xsl:text>fo_</xsl:text>
<xsl:value-of select="translate(name, '-', '_')"/>
</xsl:variable>
<xsl:apply-templates select="content">
<xsl:with-param name="setname" select="$name"/>
</xsl:apply-templates>
</xsl:template>
<xsl:template match="element/content">
<xsl:param name="setname"/>
<xsl:variable name="name">
<xsl:text>fo_</xsl:text>
<xsl:value-of select="translate(., '-', '_')"/>
</xsl:variable>
<xsl:choose>
<xsl:when test=". = '%block;'">
loop = mergeContent(<xsl:value-of select="$setname"/>, fo_block, loop);
loop = mergeContent(<xsl:value-of select="$setname"/>,
fo_block_container, loop);
loop = mergeContent(<xsl:value-of select="$setname"/>,
fo_table_and_caption, loop);
loop = mergeContent(<xsl:value-of select="$setname"/>, fo_table, loop);
loop = mergeContent(<xsl:value-of select="$setname"/>, fo_list_block,
loop);
</xsl:when>
<xsl:when test=". = '%inline;'">
loop = mergeContent(<xsl:value-of select="$setname"/>, fo_bidi_override,
loop);
loop = mergeContent(<xsl:value-of select="$setname"/>, fo_character,
loop);
loop = mergeContent(<xsl:value-of select="$setname"/>,
fo_external_graphic, loop);
loop = mergeContent(<xsl:value-of select="$setname"/>,
fo_instream_foreign_object, loop);
loop = mergeContent(<xsl:value-of select="$setname"/>, fo_inline, loop);
loop = mergeContent(<xsl:value-of select="$setname"/>,
fo_inline_container, loop);
loop = mergeContent(<xsl:value-of select="$setname"/>, fo_leader, loop);
loop = mergeContent(<xsl:value-of select="$setname"/>, fo_page_number,
loop);
loop = mergeContent(<xsl:value-of select="$setname"/>,
fo_page_number_citation, loop);
loop = mergeContent(<xsl:value-of select="$setname"/>, fo_basic_link,
loop);
loop = mergeContent(<xsl:value-of select="$setname"/>, fo_multi_toggle,
loop);
</xsl:when>
<xsl:otherwise>
loop = mergeContent(<xsl:value-of select="$setname"/>, <xsl:value-of
select="$name"/>, loop);
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="element" mode="mapping">
<xsl:variable name="name">
<xsl:text>fo_</xsl:text>
<xsl:value-of select="translate(name, '-', '_')"/>
</xsl:variable>
<xsl:text> mapping[Constants.</xsl:text>
<xsl:call-template name="makeEnumConstant">
<xsl:with-param name="propstr" select="$name" />
</xsl:call-template>] = makeSparseIndices(<xsl:value-of select="$name"/>);
</xsl:template>
<xsl:template match="element/common-ref">
<xsl:param name="setname"/>
<xsl:text> </xsl:text>
<xsl:value-of select="$setname"/>.or(<xsl:value-of select="."/>);
</xsl:template>
<xsl:template match="element/property">
<xsl:param name="setname"/>
<xsl:text> </xsl:text>
<xsl:value-of select="$setname"/><xsl:text>.set(Constants.PR_</xsl:text>
<xsl:call-template name="makeEnumConstant">
<xsl:with-param name="propstr" select="." />
</xsl:call-template>);
</xsl:template>
<xsl:template match="text()"/>
<xsl:template match="text()" mode="content"/>
<xsl:template match="text()" mode="mapping"/>
</xsl:stylesheet>
1.26 +0 -1 xml-fop/src/java/org/apache/fop/fo/FObj.java
Index: FObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- FObj.java 22 Dec 2003 21:37:43 -0000 1.25
+++ FObj.java 22 Dec 2003 23:23:05 -0000 1.26
@@ -59,7 +59,6 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.flow.Marker;
-import org.apache.fop.fo.Constants;
import org.apache.fop.fo.properties.FOPropertyMapping;
import org.xml.sax.Attributes;
1.6 +0 -1 xml-fop/src/java/org/apache/fop/fo/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Property.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Property.java 22 Dec 2003 21:37:43 -0000 1.5
+++ Property.java 22 Dec 2003 23:23:05 -0000 1.6
@@ -61,7 +61,6 @@
import org.apache.fop.fo.expr.Numeric;
import org.apache.fop.fo.expr.PropertyParser;
import org.apache.fop.fo.expr.PropertyInfo;
-import org.apache.fop.fo.Constants;
import org.apache.fop.fo.properties.FOPropertyMapping;
import org.apache.fop.apps.FOPException;
import java.util.Vector;
1.8 +0 -1 xml-fop/src/java/org/apache/fop/fo/PropertyList.java
Index: PropertyList.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PropertyList.java 22 Dec 2003 21:37:43 -0000 1.7
+++ PropertyList.java 22 Dec 2003 23:23:05 -0000 1.8
@@ -57,7 +57,6 @@
// FOP
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.Property.Maker;
-import org.apache.fop.fo.Constants;
import org.apache.fop.fo.properties.FOPropertyMapping;
import org.apache.fop.fo.properties.WritingMode;
1.17 +0 -1 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PropertyManager.java 22 Dec 2003 21:37:43 -0000 1.16
+++ PropertyManager.java 22 Dec 2003 23:23:05 -0000 1.17
@@ -67,7 +67,6 @@
import org.apache.fop.traits.InlineProps;
import org.apache.fop.traits.SpaceVal;
import org.apache.fop.traits.LayoutProps; // keep, break, span, space?
-import org.apache.fop.fo.Constants;
import org.apache.fop.fo.properties.Span;
import org.apache.fop.fonts.FontMetrics;
import org.apache.fop.fo.properties.CommonHyphenation;
1.2 +1295 -0 xml-fop/src/java/org/apache/fop/fo/PropertySets.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
