You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ge...@apache.org on 2001/05/11 22:26:07 UTC
cvs commit: xml-fop/src/org/apache/fop/svg PDFDocumentGraphics2D.java PDFTranscoder.java PDFGraphics2D.java SVG.java SVGElementMapping.java SVGObj.java
gears 01/05/11 13:26:06
Modified: . Tag: fop-0_17_0_batikSVG build.sh
docs/examples/svg Tag: fop-0_17_0_batikSVG makedoc.sh
lib Tag: fop-0_17_0_batikSVG batik.jar
src/codegen Tag: fop-0_17_0_batikSVG svgelements.xml
src/org/apache/fop/apps Tag: fop-0_17_0_batikSVG
AWTStarter.java CommandLineStarter.java
src/org/apache/fop/datatypes Tag: fop-0_17_0_batikSVG
KeepValue.java
src/org/apache/fop/pdf Tag: fop-0_17_0_batikSVG
PDFDocument.java
src/org/apache/fop/render/awt Tag: fop-0_17_0_batikSVG
AWTRenderer.java
src/org/apache/fop/render/pdf Tag: fop-0_17_0_batikSVG
PDFRenderer.java
src/org/apache/fop/svg Tag: fop-0_17_0_batikSVG
PDFGraphics2D.java SVG.java SVGElementMapping.java
SVGObj.java
Added: . Tag: fop-0_17_0_batikSVG fop.sh
src/org/apache/fop/svg Tag: fop-0_17_0_batikSVG
PDFDocumentGraphics2D.java PDFTranscoder.java
Log:
Obtained from: Keiron Liddle
Submitted by: Steve Coffman
Reviewed by: Steve Coffman
This updates Keiron's branch that uses Batik for SVG. Adds a few files
missing.
Revision Changes Path
No revision
No revision
1.8.2.2 +3 -3 xml-fop/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-fop/build.sh,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- build.sh 2001/03/01 01:14:13 1.8.2.1
+++ build.sh 2001/05/11 20:24:07 1.8.2.2
@@ -12,9 +12,9 @@
echo "location of the Java Virtual Machine you want to use."
exit 1
fi
-
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:./lib/ant.jar:./lib/buildtools.jar:./lib/batik.jar
-ANT_HOME=./lib
+LIBDIR=lib
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar:$LIBDIR/jimi-1.0.jar
+ANT_HOME=$LIBDIR
echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
echo
No revision
No revision
1.1.2.1 +1 -1 xml-fop/fop.sh
Index: fop.sh
===================================================================
RCS file: /home/cvs/xml-fop/fop.sh,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- fop.sh 2001/04/03 01:01:55 1.1
+++ fop.sh 2001/05/11 20:24:09 1.1.2.1
@@ -1,3 +1,3 @@
#!/bin/sh
-java -cp fop.jar:lib/w3c.jar:lib/xalan-2.0.0.jar:lib/xerces-1.2.3.jar:lib/jimi-1.0.jar org.apache.fop.apps.Fop "$@"
+java -cp build/fop.jar:lib/w3c.jar:lib/xalan-2.0.0.jar:lib/xerces-1.2.3.jar:lib/jimi-1.0.jar org.apache.fop.apps.Fop "$@"
No revision
No revision
1.4.2.2 +1 -1 xml-fop/docs/examples/svg/makedoc.sh
Index: makedoc.sh
===================================================================
RCS file: /home/cvs/xml-fop/docs/examples/svg/makedoc.sh,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- makedoc.sh 2001/03/13 00:40:02 1.4.2.1
+++ makedoc.sh 2001/05/11 20:24:20 1.4.2.2
@@ -13,7 +13,7 @@
exit 1
fi
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:../../../lib/ant.jar:../../../lib/w3c.jar:../../../lib/buildtools.jar:../../../build/fop.jar:../../../lib/batik.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:../../../lib/ant.jar:../../../lib/xerces-1.2.3.jar:../../../lib/buildtools.jar:../../../build/fop.jar:../../../lib/batik.jar:../../../lib/xalan-2.0.0.jar
ANT_HOME=../../../lib
echo Building with classpath $CLASSPATH:$LOCALCLASSPATH
No revision
No revision
1.1.2.3 +6064 -5021xml-fop/lib/Attic/batik.jar
<<Binary file>>
No revision
No revision
1.1.2.5 +805 -43 xml-fop/src/codegen/Attic/svgelements.xml
Index: svgelements.xml
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/Attic/svgelements.xml,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- svgelements.xml 2001/03/15 04:40:04 1.1.2.4
+++ svgelements.xml 2001/05/11 20:24:40 1.1.2.5
@@ -1,4 +1,13 @@
<?xml version="1.0" ?>
+<!--
+
+This file provides all the information for the svg elements and
+attributes. The information corresponds to the svg dtd.
+
+This information is used to create the code for the svg elements
+and the property mappings.
+
+-->
<elements prefix="svg" ns="http://www.w3.org/2000/svg">
<commonAttributes ref="stdAttrs">
<attribute>id</attribute>
@@ -13,6 +22,40 @@
<attribute>requiredExtensions</attribute>
<attribute>systemLanguage</attribute>
</commonAttributes>
+ <commonAttributes ref="xlinkRefAttrs">
+ <attribute>xmlns:xlink</attribute>
+ <attribute>xlink:type</attribute>
+ <attribute>xlink:role</attribute>
+ <attribute>xlink:arcrole</attribute>
+ <attribute>xlink:title</attribute>
+ <attribute>xlink:show</attribute>
+ <attribute>xlink:actuate</attribute>
+ </commonAttributes>
+ <commonAttributes ref="graphicsElementEvents">
+ <attribute>onfocusin</attribute>
+ <attribute>onfocusout</attribute>
+ <attribute>onactivate</attribute>
+ <attribute>onclick</attribute>
+ <attribute>onmousedown</attribute>
+ <attribute>onmouseup</attribute>
+ <attribute>onmouseover</attribute>
+ <attribute>onmousemove</attribute>
+ <attribute>onmouseout</attribute>
+ <attribute>onload</attribute>
+ </commonAttributes>
+ <commonAttributes ref="documentEvents">
+ <attribute>onunload</attribute>
+ <attribute>onabort</attribute>
+ <attribute>onerror</attribute>
+ <attribute>onresize</attribute>
+ <attribute>onscroll</attribute>
+ <attribute>onzoom</attribute>
+ </commonAttributes>
+ <commonAttributes ref="animationEvents">
+ <attribute>onbegin</attribute>
+ <attribute>onend</attribute>
+ <attribute>onrepeat</attribute>
+ </commonAttributes>
<commonAttributes ref="PresentationAttributes-All">
<includeAttributes ref="PresentationAttributes-Containers"/>
<includeAttributes ref="PresentationAttributes-feFlood"/>
@@ -109,16 +152,76 @@
<attribute>clip</attribute>
<attribute>overflow</attribute>
</commonAttributes>
+ <commonAttributes ref="filter_primitive_attributes">
+ <attribute>x</attribute>
+ <attribute>y</attribute>
+ <attribute>width</attribute>
+ <attribute>height</attribute>
+ <attribute>result</attribute>
+ </commonAttributes>
+ <commonAttributes ref="filter_primitive_attributes_with_in">
+ <includeAttributes ref="filter_primitive_attributes"/>
+ <attribute>in</attribute>
+ </commonAttributes>
+ <commonAttributes ref="component_transfer_function_attributes">
+ <attribute>type</attribute>
+ <attribute>tableValues</attribute>
+ <attribute>slope</attribute>
+ <attribute>intercept</attribute>
+ <attribute>amplitude</attribute>
+ <attribute>exponent</attribute>
+ <attribute>offset</attribute>
+ </commonAttributes>
+ <commonAttributes ref="animElementAttrs">
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
+ </commonAttributes>
+ <commonAttributes ref="animAttributeAttrs">
+ <attribute>attributeName</attribute>
+ <attribute>attributeType</attribute>
+ </commonAttributes>
+ <commonAttributes ref="animTargetAttrs">
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
+ <attribute>attributeName</attribute>
+ <attribute>attributeType</attribute>
+ </commonAttributes>
+ <commonAttributes ref="animTimingAttrs">
+ <attribute>begin</attribute>
+ <attribute>dur</attribute>
+ <attribute>end</attribute>
+ <attribute>min</attribute>
+ <attribute>max</attribute>
+ <attribute>restart</attribute>
+ <attribute>repeatCount</attribute>
+ <attribute>repeatDur</attribute>
+ <attribute>fill</attribute>
+ </commonAttributes>
+ <commonAttributes ref="animValueAttrs">
+ <attribute>calcMode</attribute>
+ <attribute>values</attribute>
+ <attribute>keyTimes</attribute>
+ <attribute>keySplines</attribute>
+ <attribute>from</attribute>
+ <attribute>to</attribute>
+ <attribute>by</attribute>
+ </commonAttributes>
+ <commonAttributes ref="animAdditionAttrs">
+ <attribute>additive</attribute>
+ <attribute>accumulate</attribute>
+ </commonAttributes>
<element>
<tagname>a</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>xlnk:href</attribute>
+ <attribute>xmlns:xlink</attribute>
+ <attribute>xlink:type</attribute>
<attribute>xlink:role</attribute>
<attribute>xlink:arcrole</attribute>
<attribute>xlink:title</attribute>
<attribute>xlink:show</attribute>
<attribute>xlink:actuate</attribute>
+ <attribute>xlink:href</attribute>
<includeAttributes ref="testAttrs"/>
<includeAttributes ref="langSpaceAttrs"/>
<attribute>externalResourcesRequired</attribute>
@@ -126,7 +229,7 @@
<attribute>style</attribute>
<includeAttributes ref="PresentationAttributes-All"/>
<attribute>transform</attribute>
- <includeAttributes ref="graphicsElementsEvents"/>
+ <includeAttributes ref="graphicsElementEvents"/>
<attribute>target</attribute>
</attributes>
</element>
@@ -136,13 +239,13 @@
<includeAttributes ref="stdAttrs"/>
<includeAttributes ref="testAttrs"/>
<includeAttributes ref="langSpaceAttrs"/>
- <attribute>externalResourceRequired</attribute>
+ <attribute>externalResourcesRequired</attribute>
<attribute>class</attribute>
<attribute>style</attribute>
<includeAttributes ref="PresentationAttributes-FillStroke"/>
<includeAttributes ref="PresentationAttributes-Graphics"/>
<attribute>transform</attribute>
- <includeAttributes ref="graphicsElementsEvents"/>
+ <includeAttributes ref="graphicsElementEvents"/>
<attribute>cx</attribute>
<attribute>cy</attribute>
<attribute>r</attribute>
@@ -152,56 +255,168 @@
<tagname>altGlyph</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <attribute>xlink:href</attribute>
+ <attribute>glyphRef</attribute>
+ <attribute>format</attribute>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-FillStroke"/>
+ <includeAttributes ref="PresentationAttributes-FontSpecification"/>
+ <includeAttributes ref="PresentationAttributes-Graphics"/>
+ <includeAttributes ref="PresentationAttributes-TextContentElements"/>
+ <includeAttributes ref="graphicsElementEvents"/>
+ <attribute>x</attribute>
+ <attribute>y</attribute>
+ <attribute>dx</attribute>
+ <attribute>dy</attribute>
+ <attribute>rotate</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>altGlyphDef</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
</attributes>
</element>
<element>
+ <tagname>altGlyphItem</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ </attributes>
+ </element>
+ <element>
<tagname>animate</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <includeAttributes ref="animationEvents"/>
+ <includeAttributes ref="animElementAttrs"/>
+ <includeAttributes ref="animAttributeAttrs"/>
+ <includeAttributes ref="animTimingAttrs"/>
+ <includeAttributes ref="animValueAttrs"/>
+ <includeAttributes ref="animAdditionAttrs"/>
</attributes>
</element>
<element>
<tagname>animateColor</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <includeAttributes ref="animationEvents"/>
+ <includeAttributes ref="animElementAttrs"/>
+ <includeAttributes ref="animAttributeAttrs"/>
+ <includeAttributes ref="animTimingAttrs"/>
+ <includeAttributes ref="animValueAttrs"/>
+ <includeAttributes ref="animAdditionAttrs"/>
</attributes>
</element>
<element>
<tagname>animateMotion</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <includeAttributes ref="animationEvents"/>
+ <includeAttributes ref="animElementAttrs"/>
+ <includeAttributes ref="animTimingAttrs"/>
+ <attribute>calcMode</attribute>
+ <attribute>values</attribute>
+ <attribute>keyTimes</attribute>
+ <attribute>keySplines</attribute>
+ <attribute>from</attribute>
+ <attribute>to</attribute>
+ <attribute>by</attribute>
+ <includeAttributes ref="animAdditionAttrs"/>
+ <attribute>path</attribute>
+ <attribute>keyPoints</attribute>
+ <attribute>rotate</attribute>
+ <attribute>origin</attribute>
</attributes>
</element>
<element>
<tagname>animateTransform</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <includeAttributes ref="animationEvents"/>
+ <includeAttributes ref="animElementAttrs"/>
+ <includeAttributes ref="animAttributeAttrs"/>
+ <includeAttributes ref="animTimingAttrs"/>
+ <includeAttributes ref="animValueAttrs"/>
+ <includeAttributes ref="animAdditionAttrs"/>
+ <attribute>type</attribute>
</attributes>
</element>
<element>
<tagname>clipPath</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>id</attribute>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
<attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-FillStroke"/>
+ <includeAttributes ref="PresentationAttributes-FontSpecification"/>
+ <includeAttributes ref="PresentationAttributes-Graphics"/>
+ <includeAttributes ref="PresentationAttributes-TextContentElements"/>
+ <includeAttributes ref="PresentationAttributes-TextElements"/>
+ <attribute>transform</attribute>
<attribute>clipPathUnits</attribute>
</attributes>
</element>
<element>
+ <tagname>color-profile</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
+ <attribute>local</attribute>
+ <attribute>name</attribute>
+ <attribute>rendering-intent</attribute>
+ </attributes>
+ </element>
+ <element>
<tagname>cursor</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
+ <includeAttributes ref="testAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>x</attribute>
+ <attribute>y</attribute>
</attributes>
</element>
<element>
<tagname>defs</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <includeAttributes ref="graphicsElementEvents"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <attribute>transform</attribute>
</attributes>
</element>
<element addText="true">
<tagname>desc</tagname>
<attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <includeAttributes ref="StructuredText"/>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
</attributes>
</element>
<element>
@@ -210,13 +425,13 @@
<includeAttributes ref="stdAttrs"/>
<includeAttributes ref="testAttrs"/>
<includeAttributes ref="langSpaceAttrs"/>
- <attribute>externalResourceRequired</attribute>
+ <attribute>externalResourcesRequired</attribute>
<attribute>class</attribute>
<attribute>style</attribute>
<includeAttributes ref="PresentationAttributes-FillStroke"/>
<includeAttributes ref="PresentationAttributes-Graphics"/>
<attribute>transform</attribute>
- <includeAttributes ref="graphicsElementsEvents"/>
+ <includeAttributes ref="graphicsElementEvents"/>
<attribute>cx</attribute>
<attribute>cy</attribute>
<attribute>rx</attribute>
@@ -224,23 +439,382 @@
</attributes>
</element>
<element>
+ <tagname>feBlend</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ <attribute>in2</attribute>
+ <attribute>mode</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feColorMatrix</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ <attribute>type</attribute>
+ <attribute>values</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feComponentTransfer</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feComposite</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ <attribute>in2</attribute>
+ <attribute>operator</attribute>
+ <attribute>k1</attribute>
+ <attribute>k2</attribute>
+ <attribute>k3</attribute>
+ <attribute>k4</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feConvolveMatrix</tagname>
+ <attributes>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ <attribute>order</attribute>
+ <attribute>kernelMatrix</attribute>
+ <attribute>divisor</attribute>
+ <attribute>bias</attribute>
+ <attribute>targetX</attribute>
+ <attribute>targetY</attribute>
+ <attribute>edgeMode</attribute>
+ <attribute>kernelUnitLength</attribute>
+ <attribute>preserveAlpha</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feDistantLight</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <attribute>azimuth</attribute>
+ <attribute>elevation</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feDiffuseLighting</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-LightingEffects"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ <attribute>surfaceScale</attribute>
+ <attribute>diffuseConstant</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feDisplacementMap</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ <attribute>in2</attribute>
+ <attribute>scale</attribute>
+ <attribute>xChannelSelector</attribute>
+ <attribute>yChannelSelector</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feFlood</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-feFlood"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feFuncR</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="component_transfer_function_attributes"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feFuncG</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="component_transfer_function_attributes"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feFuncB</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="component_transfer_function_attributes"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feFuncA</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="component_transfer_function_attributes"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feGaussianBlur</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ <attribute>stdDeviation</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feOffset</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>fePointLight</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <attribute>x</attribute>
+ <attribute>y</attribute>
+ <attribute>z</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feImage</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <attribute>transform</attribute>
+ <includeAttributes ref="filter_primitive_attributes"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feMerge</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feMergeNode</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <attribute>in</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feMorphology</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ <attribute>operator</attribute>
+ <attribute>radius</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feOffset</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ <attribute>dx</attribute>
+ <attribute>dy</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feSpecularLighting</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-LightingEffects"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ <attribute>surfaceScale</attribute>
+ <attribute>specularConstant</attribute>
+ <attribute>specularExponent</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feSpotLight</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <attribute>x</attribute>
+ <attribute>y</attribute>
+ <attribute>z</attribute>
+ <attribute>pointsAtX</attribute>
+ <attribute>pointsAtY</attribute>
+ <attribute>pointsAtZ</attribute>
+ <attribute>specularExponent</attribute>
+ <attribute>limitingConeAngle</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feTile</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes_with_in"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>feTurbulence</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="filter_primitive_attributes"/>
+ <attribute>baseFrequency</attribute>
+ <attribute>numOctaves</attribute>
+ <attribute>seed</attribute>
+ <attribute>stitchTiles</attribute>
+ <attribute>type</attribute>
+ </attributes>
+ </element>
+ <element>
<tagname>filter</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <attribute>filterUnits</attribute>
+ <attribute>primitiveUnits</attribute>
+ <attribute>x</attribute>
+ <attribute>y</attribute>
+ <attribute>width</attribute>
+ <attribute>height</attribute>
+ <attribute>filterRes</attribute>
</attributes>
</element>
<element>
<tagname>font</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <attribute>horiz-origin-x</attribute>
+ <attribute>horiz-origin-y</attribute>
+ <attribute>horiz-adv-x</attribute>
+ <attribute>vert-origin-x</attribute>
+ <attribute>vert-origin-y</attribute>
+ <attribute>vert-adv-y</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>font-face</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <attribute>font-family</attribute>
+ <attribute>font-style</attribute>
+ <attribute>font-variant</attribute>
+ <attribute>font-weight</attribute>
+ <attribute>font-stretch</attribute>
+ <attribute>font-size</attribute>
+ <attribute>unicode-range</attribute>
+ <attribute>units-per-em</attribute>
+ <attribute>panose-1</attribute>
+ <attribute>stemv</attribute>
+ <attribute>stemh</attribute>
+ <attribute>slope</attribute>
+ <attribute>cap-height</attribute>
+ <attribute>x-height</attribute>
+ <attribute>accent-height</attribute>
+ <attribute>ascent</attribute>
+ <attribute>descent</attribute>
+ <attribute>widths</attribute>
+ <attribute>bbox</attribute>
+ <attribute>ideographic</attribute>
+ <attribute>alphabetic</attribute>
+ <attribute>mathematical</attribute>
+ <attribute>hanging</attribute>
+ <attribute>v-ideographic</attribute>
+ <attribute>v-alphabetic</attribute>
+ <attribute>v-mathematical</attribute>
+ <attribute>v-hanging</attribute>
+ <attribute>underline-position</attribute>
+ <attribute>underline-thickness</attribute>
+ <attribute>strikethrough-position</attribute>
+ <attribute>strikethrough-thickness</attribute>
+ <attribute>overline-position</attribute>
+ <attribute>overline-thickness</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>font-face-src</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>font-face-uri</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>font-face-format</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <attribute>string</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>font-face-name</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <attribute>name</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>foreignObject</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <attribute>transform</attribute>
+ <includeAttributes ref="graphicsElementEvents"/>
+ <attribute>x</attribute>
+ <attribute>y</attribute>
+ <attribute>width</attribute>
+ <attribute>height</attribute>
+ <includeAttributes ref="StructuredText"/>
+ </attributes>
+ </element>
+ <element>
+ <tagname>definition-src</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
</attributes>
</element>
<element>
<tagname>g</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
<includeAttributes ref="PresentationAttributes-All"/>
- <attribute>id</attribute>
+ <includeAttributes ref="graphicsElementEvents"/>
+ <attribute>externalResourcesRequired</attribute>
<attribute>style</attribute>
<attribute>transform</attribute>
<attribute>class</attribute>
@@ -250,22 +824,65 @@
<tagname>glyph</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <attribute>unicode</attribute>
+ <attribute>glyph-name</attribute>
+ <attribute>d</attribute>
+ <attribute>orientation</attribute>
+ <attribute>arabic-form</attribute>
+ <attribute>lang</attribute>
+ <attribute>horiz-adv-x</attribute>
+ <attribute>vert-origin-x</attribute>
+ <attribute>vert-origin-y</attribute>
+ <attribute>vert-adv-y</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>glyphRef</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-FontSpecification"/>
+ <attribute>glyphRef</attribute>
+ <attribute>format</attribute>
+ <attribute>x</attribute>
+ <attribute>y</attribute>
+ <attribute>dx</attribute>
+ <attribute>dy</attribute>
</attributes>
</element>
<element>
<tagname>hkern</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <attribute>u1</attribute>
+ <attribute>g1</attribute>
+ <attribute>u2</attribute>
+ <attribute>g2</attribute>
+ <attribute>k</attribute>
</attributes>
</element>
<element>
<tagname>image</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>id</attribute>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <includeAttributes ref="PresentationAttributes-Graphics"/>
+ <includeAttributes ref="PresentationAttributes-Images"/>
+ <includeAttributes ref="PresentationAttributes-Viewports"/>
+ <includeAttributes ref="graphicsElementEvents"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
<attribute>style</attribute>
<attribute>transform</attribute>
- <attribute>class</attribute>
+ <attribute>preserveAspectRatio</attribute>
<attribute>xlink:href</attribute>
<attribute>x</attribute>
<attribute>y</attribute>
@@ -279,14 +896,14 @@
<includeAttributes ref="stdAttrs"/>
<includeAttributes ref="testAttrs"/>
<includeAttributes ref="langSpaceAttrs"/>
- <attribute>externalResourceRequired</attribute>
+ <attribute>externalResourcesRequired</attribute>
<attribute>class</attribute>
<attribute>style</attribute>
<includeAttributes ref="PresentationAttributes-FillStroke"/>
<includeAttributes ref="PresentationAttributes-Graphics"/>
<includeAttributes ref="PresentationAttributes-Markers"/>
<attribute>transform</attribute>
- <includeAttributes ref="graphicsElementsEvents"/>
+ <includeAttributes ref="graphicsElementEvents"/>
<attribute>x1</attribute>
<attribute>x2</attribute>
<attribute>y1</attribute>
@@ -297,65 +914,128 @@
<tagname>linearGradient</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>id</attribute>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
<attribute>style</attribute>
- <attribute>transform</attribute>
+ <includeAttributes ref="PresentationAttributes-Gradients"/>
+ <attribute>gradientUnits</attribute>
+ <attribute>gradientTransform</attribute>
<attribute>class</attribute>
- <attribute>xlink:href</attribute>
<attribute>x1</attribute>
<attribute>y1</attribute>
<attribute>x2</attribute>
<attribute>y2</attribute>
- <attribute>gradientTransform</attribute>
<attribute>spreadMethod</attribute>
- <attribute>gradientUnits</attribute>
</attributes>
</element>
<element>
<tagname>marker</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <attribute>viewBox</attribute>
+ <attribute>preserveAspectRatio</attribute>
+ <attribute>refX</attribute>
+ <attribute>refY</attribute>
+ <attribute>markerUnits</attribute>
+ <attribute>markerWidth</attribute>
+ <attribute>markerHeight</attribute>
+ <attribute>orient</attribute>
</attributes>
</element>
<element>
<tagname>mask</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>id</attribute>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
<attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <attribute>transform</attribute>
+ <attribute>maskUnits</attribute>
+ <attribute>maskContentUnits</attribute>
+ <attribute>x</attribute>
+ <attribute>y</attribute>
+ <attribute>width</attribute>
+ <attribute>height</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>metadata</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
</attributes>
</element>
<element>
<tagname>missing-glyph</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <attribute>d</attribute>
+ <attribute>horiz-adv-x</attribute>
+ <attribute>vert-origin-x</attribute>
+ <attribute>vert-origin-y</attribute>
+ <attribute>vert-adv-y</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>mpath</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
+ <attribute>externalResourcesRequired</attribute>
</attributes>
</element>
<element>
<tagname>path</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>id</attribute>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <includeAttributes ref="PresentationAttributes-FillStroke"/>
+ <includeAttributes ref="PresentationAttributes-Graphics"/>
+ <includeAttributes ref="PresentationAttributes-Markers"/>
+ <includeAttributes ref="graphicsElementEvents"/>
+ <attribute>externalResourcesRequired</attribute>
<attribute>style</attribute>
<attribute>transform</attribute>
<attribute>class</attribute>
<attribute>d</attribute>
+ <attribute>pathLength</attribute>
</attributes>
</element>
<element>
<tagname>pattern</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>id</attribute>
- <attribute>style</attribute>
- <attribute>transform</attribute>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
<attribute>class</attribute>
+ <attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <attribute>viewBox</attribute>
+ <attribute>preserveAspectRatio</attribute>
<attribute>xlink:href</attribute>
<attribute>width</attribute>
<attribute>height</attribute>
<attribute>x</attribute>
<attribute>y</attribute>
<attribute>patternUnits</attribute>
+ <attribute>patternContentUnits</attribute>
+ <attribute>patternTransform</attribute>
</attributes>
</element>
<element>
@@ -371,7 +1051,7 @@
<includeAttributes ref="PresentationAttributes-Graphics"/>
<includeAttributes ref="PresentationAttributes-Markers"/>
<attribute>transform</attribute>
- <includeAttributes ref="graphicsElementsEvents"/>
+ <includeAttributes ref="graphicsElementEvents"/>
<attribute>points</attribute>
</attributes>
</element>
@@ -388,7 +1068,7 @@
<includeAttributes ref="PresentationAttributes-Graphics"/>
<includeAttributes ref="PresentationAttributes-Markers"/>
<attribute>transform</attribute>
- <includeAttributes ref="graphicsElementsEvents"/>
+ <includeAttributes ref="graphicsElementEvents"/>
<attribute>points</attribute>
</attributes>
</element>
@@ -396,10 +1076,11 @@
<tagname>radialGradient</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>id</attribute>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
<attribute>style</attribute>
- <attribute>transform</attribute>
<attribute>class</attribute>
+ <includeAttributes ref="PresentationAttributes-Gradients"/>
<attribute>gradientTransform</attribute>
<attribute>xlink:href</attribute>
<attribute>cx</attribute>
@@ -408,6 +1089,7 @@
<attribute>fx</attribute>
<attribute>fy</attribute>
<attribute>gradientUnits</attribute>
+ <attribute>spreadMethod</attribute>
</attributes>
</element>
<element>
@@ -416,13 +1098,13 @@
<includeAttributes ref="stdAttrs"/>
<includeAttributes ref="testAttrs"/>
<includeAttributes ref="langSpaceAttrs"/>
- <attribute>externalResourceRequired</attribute>
+ <attribute>externalResourcesRequired</attribute>
<attribute>class</attribute>
<attribute>style</attribute>
<includeAttributes ref="PresentationAttributes-FillStroke"/>
<includeAttributes ref="PresentationAttributes-Graphics"/>
<attribute>transform</attribute>
- <includeAttributes ref="graphicsElementsEvents"/>
+ <includeAttributes ref="graphicsElementEvents"/>
<attribute>x</attribute>
<attribute>y</attribute>
<attribute>width</attribute>
@@ -435,14 +1117,32 @@
<tagname>set</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <includeAttributes ref="animationEvents"/>
+ <includeAttributes ref="animElementAttrs"/>
+ <includeAttributes ref="animAttributeAttrs"/>
+ <includeAttributes ref="animTimingAttrs"/>
+ <attribute>to</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>script</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <attribute>xlink:href</attribute>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>type</attribute>
</attributes>
</element>
<element>
<tagname>stop</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>id</attribute>
+ <attribute>class</attribute>
<attribute>style</attribute>
+ <includeAttributes ref="PresentationAttributes-Gradients"/>
<attribute>offset</attribute>
</attributes>
</element>
@@ -450,25 +1150,61 @@
<tagname>style</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <attribute>xml:space</attribute>
+ <attribute>type</attribute>
+ <attribute>media</attribute>
+ <attribute>title</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>svg</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <includeAttributes ref="graphicsElementEvents"/>
+ <includeAttributes ref="documentEvents"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <attribute>viewBox</attribute>
+ <attribute>preserveAspectRatio</attribute>
+ <attribute>zoomAndPan</attribute>
+ <attribute>x</attribute>
+ <attribute>y</attribute>
+ <attribute>width</attribute>
+ <attribute>height</attribute>
+ <attribute>contentScriptType</attribute>
+ <attribute>contentStyleType</attribute>
</attributes>
</element>
<element>
<tagname>switch</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>id</attribute>
- <attribute>requiredFeatures</attribute>
- <attribute>requiredExtensions</attribute>
- <attribute>systemLanguage</attribute>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <includeAttributes ref="PresentationAttributes-all"/>
+ <includeAttributes ref="graphicsElementEvents"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
+ <attribute>transform</attribute>
</attributes>
</element>
<element>
<tagname>symbol</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>id</attribute>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <includeAttributes ref="graphicsElementEvents"/>
+ <attribute>class</attribute>
<attribute>style</attribute>
<attribute>viewBox</attribute>
+ <attribute>preserveAspectRatio</attribute>
</attributes>
</element>
<element>
@@ -479,14 +1215,14 @@
<attribute>xlink:href</attribute>
<includeAttributes ref="testAttrs"/>
<includeAttributes ref="langSpaceAttrs"/>
- <attribute>externalResourceRequired</attribute>
+ <attribute>externalResourcesRequired</attribute>
<attribute>class</attribute>
<attribute>style</attribute>
<includeAttributes ref="PresentationAttributes-FillStroke"/>
<includeAttributes ref="PresentationAttributes-FontSpecification"/>
<includeAttributes ref="PresentationAttributes-Graphics"/>
<includeAttributes ref="PresentationAttributes-TextContentElements"/>
- <includeAttributes ref="graphicsElementsEvents"/>
+ <includeAttributes ref="graphicsElementEvents"/>
<attribute>x</attribute>
<attribute>y</attribute>
<attribute>dx</attribute>
@@ -502,14 +1238,14 @@
<includeAttributes ref="stdAttrs"/>
<includeAttributes ref="testAttrs"/>
<includeAttributes ref="langSpaceAttrs"/>
- <attribute>externalResourceRequired</attribute>
+ <attribute>externalResourcesRequired</attribute>
<attribute>class</attribute>
<attribute>style</attribute>
<includeAttributes ref="PresentationAttributes-FillStroke"/>
<includeAttributes ref="PresentationAttributes-FontSpecification"/>
<includeAttributes ref="PresentationAttributes-Graphics"/>
<includeAttributes ref="PresentationAttributes-TextContentElements"/>
- <includeAttributes ref="graphicsElementsEvents"/>
+ <includeAttributes ref="graphicsElementEvents"/>
<attribute>x</attribute>
<attribute>y</attribute>
<attribute>dx</attribute>
@@ -525,7 +1261,7 @@
<includeAttributes ref="stdAttrs"/>
<includeAttributes ref="testAttrs"/>
<includeAttributes ref="langSpaceAttrs"/>
- <attribute>externalResourceRequired</attribute>
+ <attribute>externalResourcesRequired</attribute>
<attribute>class</attribute>
<attribute>style</attribute>
<includeAttributes ref="PresentationAttributes-FillStroke"/>
@@ -534,7 +1270,7 @@
<includeAttributes ref="PresentationAttributes-TextContentElements"/>
<includeAttributes ref="PresentationAttributes-TextElements"/>
<attribute>transform</attribute>
- <includeAttributes ref="graphicsElementsEvents"/>
+ <includeAttributes ref="graphicsElementEvents"/>
<attribute>x</attribute>
<attribute>y</attribute>
<attribute>textLength</attribute>
@@ -549,14 +1285,14 @@
<attribute>xlink:href</attribute>
<includeAttributes ref="langSpaceAttrs"/>
<includeAttributes ref="testAttrs"/>
- <attribute>externalResourceRequired</attribute>
+ <attribute>externalResourcesRequired</attribute>
<attribute>class</attribute>
<attribute>style</attribute>
<includeAttributes ref="PresentationAttributes-FillStroke"/>
<includeAttributes ref="PresentationAttributes-FontSpecification"/>
<includeAttributes ref="PresentationAttributes-Graphics"/>
<includeAttributes ref="PresentationAttributes-TextContentElements"/>
- <includeAttributes ref="graphicsElementsEvents"/>
+ <includeAttributes ref="graphicsElementEvents"/>
<attribute>startOffset</attribute>
<attribute>textLength</attribute>
<attribute>lengthAdjust</attribute>
@@ -568,13 +1304,23 @@
<tagname>title</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <includeAttributes ref="StructuredText"/>
+ <attribute>class</attribute>
+ <attribute>style</attribute>
</attributes>
</element>
<element>
<tagname>use</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
- <attribute>id</attribute>
+ <includeAttributes ref="xlinkRefAttrs"/>
+ <includeAttributes ref="testAttrs"/>
+ <includeAttributes ref="langSpaceAttrs"/>
+ <includeAttributes ref="PresentationAttributes-All"/>
+ <includeAttributes ref="graphicsElementEvents"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>class</attribute>
<attribute>style</attribute>
<attribute>transform</attribute>
<attribute>xlink:href</attribute>
@@ -588,6 +1334,22 @@
<tagname>vkern</tagname>
<attributes>
<includeAttributes ref="stdAttrs"/>
+ <attribute>u1</attribute>
+ <attribute>g1</attribute>
+ <attribute>u2</attribute>
+ <attribute>g2</attribute>
+ <attribute>k</attribute>
+ </attributes>
+ </element>
+ <element>
+ <tagname>view</tagname>
+ <attributes>
+ <includeAttributes ref="stdAttrs"/>
+ <attribute>externalResourcesRequired</attribute>
+ <attribute>viewBox</attribute>
+ <attribute>preserveAspectRatio</attribute>
+ <attribute>zoomAndPan</attribute>
+ <attribute>viewTarget</attribute>
</attributes>
</element>
</elements>
No revision
No revision
1.1.2.1 +178 -178 xml-fop/src/org/apache/fop/apps/AWTStarter.java
Index: AWTStarter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/AWTStarter.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- AWTStarter.java 2001/02/21 01:06:34 1.1
+++ AWTStarter.java 2001/05/11 20:24:47 1.1.2.1
@@ -1,178 +1,178 @@
-/*
- * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
- * For details on use and redistribution please refer to the
- * LICENSE file included with these sources."
- */
-
-package org.apache.fop.apps;
-/*
- originally contributed by
- Juergen Verwohlt: Juergen.Verwohlt@jCatalog.com,
- Rainer Steinkuhle: Rainer.Steinkuhle@jCatalog.com,
- Stanislav Gorkhover: Stanislav.Gorkhover@jCatalog.com
-
- */
-import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.viewer.*;
-import org.apache.fop.render.awt.*;
-
-
-import javax.swing.UIManager;
-import java.awt.*;
-
-// SAX
-import org.xml.sax.XMLReader;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-
-
-// Java
-import java.io.FileReader;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.*;
-
-
-
-/**
- * initialize AWT previewer
- */
-
-public class AWTStarter extends CommandLineStarter {
-
- PreviewDialog frame;
- AWTRenderer renderer;
- public static String TRANSLATION_PATH = "/org/apache/fop/viewer/resources/";
-
- private Translator resource;
-
- public AWTStarter (CommandLineOptions commandLineOptions) {
- super(commandLineOptions);
- init();
- }
-
- private void init () {
- try {
- UIManager.setLookAndFeel(
- new javax.swing.plaf.metal.MetalLookAndFeel());
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- String language = commandLineOptions.getLanguage();
-
- if (language == null)
- language = System.getProperty("user.language");
-
- resource = getResourceBundle(TRANSLATION_PATH + "resources." +
- language);
-
- UserMessage.setTranslator(
- getResourceBundle(TRANSLATION_PATH + "messages." +
- language));
-
- resource.setMissingEmphasized(false);
- renderer = new AWTRenderer(resource);
- frame = createPreviewDialog(renderer, resource);
- renderer.setProgressListener(frame);
- renderer.setComponent(frame);
- MessageHandler.setOutputMethod(MessageHandler.EVENT);
- MessageHandler.addListener(frame);
- }
-
-
- public void run () {
- Driver driver = new Driver();
- if (errorDump) {
- driver.setErrorDump(true);
- }
-
- //init parser
- frame.progress(resource.getString("Init parser") + " ...");
- XMLReader parser = inputHandler.getParser();
-
- if (parser == null) {
- MessageHandler.errorln("ERROR: Unable to create SAX parser");
- System.exit(1);
- }
-
- setParserFeatures(parser);
-
- try {
- driver.setRenderer(renderer);
-
- // init mappings: time
- frame.progress(resource.getString("Init mappings") + " ...");
-
- driver.addElementMapping("org.apache.fop.fo.StandardElementMapping");
- driver.addElementMapping("org.apache.fop.svg.SVGElementMapping");
- driver.addPropertyList("org.apache.fop.fo.StandardPropertyListMapping");
- driver.addPropertyList("org.apache.fop.svg.SVGPropertyListMapping");
-
- // build FO tree: time
- frame.progress(resource.getString("Build FO tree") + " ...");
- driver.buildFOTree(parser, inputHandler.getInputSource());
-
- // layout FO tree: time
- frame.progress(resource.getString("Layout FO tree") + " ...");
- driver.format();
-
- // render: time
- frame.progress(resource.getString("Render") + " ...");
- driver.render();
-
- frame.progress(resource.getString("Show"));
- frame.showPage();
-
- } catch (Exception e) {
- MessageHandler.errorln("FATAL ERROR: " + e.getMessage());
- e.printStackTrace();
- System.exit(1);
- }
-
- }
-
- protected PreviewDialog createPreviewDialog(AWTRenderer renderer,
- Translator res) {
- PreviewDialog frame = new PreviewDialog(renderer, res);
- frame.validate();
-
- // center window
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- Dimension frameSize = frame.getSize();
- if (frameSize.height > screenSize.height)
- frameSize.height = screenSize.height;
- if (frameSize.width > screenSize.width)
- frameSize.width = screenSize.width;
- frame.setLocation((screenSize.width - frameSize.width) / 2,
- (screenSize.height - frameSize.height) / 2);
- frame.setVisible(true);
- return frame;
- }
-
-
-
- private SecureResourceBundle getResourceBundle(String path) {
- InputStream in = null;
-
- try {
- URL url = getClass().getResource(path);
- in = url.openStream();
- } catch (Exception ex) {
- MessageHandler.logln("Can't find URL to: <" + path + "> " +
- ex.getMessage());
- }
- return new SecureResourceBundle(in);
- }
-}
-
-
-
+/*
+ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
+ * For details on use and redistribution please refer to the
+ * LICENSE file included with these sources."
+ */
+
+package org.apache.fop.apps;
+/*
+ originally contributed by
+ Juergen Verwohlt: Juergen.Verwohlt@jCatalog.com,
+ Rainer Steinkuhle: Rainer.Steinkuhle@jCatalog.com,
+ Stanislav Gorkhover: Stanislav.Gorkhover@jCatalog.com
+
+ */
+import org.apache.fop.messaging.MessageHandler;
+import org.apache.fop.viewer.*;
+import org.apache.fop.render.awt.*;
+
+
+import javax.swing.UIManager;
+import java.awt.*;
+
+// SAX
+import org.xml.sax.XMLReader;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+
+
+// Java
+import java.io.FileReader;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.io.IOException;
+import java.io.FileNotFoundException;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.*;
+
+
+
+/**
+ * initialize AWT previewer
+ */
+
+public class AWTStarter extends CommandLineStarter {
+
+ PreviewDialog frame;
+ AWTRenderer renderer;
+ public static String TRANSLATION_PATH = "/org/apache/fop/viewer/resources/";
+
+ private Translator resource;
+
+ public AWTStarter (CommandLineOptions commandLineOptions) {
+ super(commandLineOptions);
+ init();
+ }
+
+ private void init () {
+ try {
+ UIManager.setLookAndFeel(
+ new javax.swing.plaf.metal.MetalLookAndFeel());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ String language = commandLineOptions.getLanguage();
+
+ if (language == null)
+ language = System.getProperty("user.language");
+
+ resource = getResourceBundle(TRANSLATION_PATH + "resources." +
+ language);
+
+ UserMessage.setTranslator(
+ getResourceBundle(TRANSLATION_PATH + "messages." +
+ language));
+
+ resource.setMissingEmphasized(false);
+ renderer = new AWTRenderer(resource);
+ frame = createPreviewDialog(renderer, resource);
+ renderer.setProgressListener(frame);
+ renderer.setComponent(frame);
+ MessageHandler.setOutputMethod(MessageHandler.NONE);
+ MessageHandler.addListener(frame);
+ }
+
+
+ public void run () {
+ Driver driver = new Driver();
+ if (errorDump) {
+ driver.setErrorDump(true);
+ }
+
+ //init parser
+ frame.progress(resource.getString("Init parser") + " ...");
+ XMLReader parser = inputHandler.getParser();
+
+ if (parser == null) {
+ MessageHandler.errorln("ERROR: Unable to create SAX parser");
+ System.exit(1);
+ }
+
+ setParserFeatures(parser);
+
+ try {
+ driver.setRenderer(renderer);
+
+ // init mappings: time
+ frame.progress(resource.getString("Init mappings") + " ...");
+
+ driver.addElementMapping("org.apache.fop.fo.StandardElementMapping");
+ driver.addElementMapping("org.apache.fop.svg.SVGElementMapping");
+ driver.addPropertyList("org.apache.fop.fo.StandardPropertyListMapping");
+ driver.addPropertyList("org.apache.fop.svg.SVGPropertyListMapping");
+
+ // build FO tree: time
+ frame.progress(resource.getString("Build FO tree") + " ...");
+ driver.buildFOTree(parser, inputHandler.getInputSource());
+
+ // layout FO tree: time
+ frame.progress(resource.getString("Layout FO tree") + " ...");
+ driver.format();
+
+ // render: time
+ frame.progress(resource.getString("Render") + " ...");
+ driver.render();
+
+ frame.progress(resource.getString("Show"));
+ frame.showPage();
+
+ } catch (Exception e) {
+ MessageHandler.errorln("FATAL ERROR: " + e.getMessage());
+ e.printStackTrace();
+ System.exit(1);
+ }
+
+ }
+
+ protected PreviewDialog createPreviewDialog(AWTRenderer renderer,
+ Translator res) {
+ PreviewDialog frame = new PreviewDialog(renderer, res);
+ frame.validate();
+
+ // center window
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ Dimension frameSize = frame.getSize();
+ if (frameSize.height > screenSize.height)
+ frameSize.height = screenSize.height;
+ if (frameSize.width > screenSize.width)
+ frameSize.width = screenSize.width;
+ frame.setLocation((screenSize.width - frameSize.width) / 2,
+ (screenSize.height - frameSize.height) / 2);
+ frame.setVisible(true);
+ return frame;
+ }
+
+
+
+ private SecureResourceBundle getResourceBundle(String path) {
+ InputStream in = null;
+
+ try {
+ URL url = getClass().getResource(path);
+ in = url.openStream();
+ } catch (Exception ex) {
+ MessageHandler.logln("Can't find URL to: <" + path + "> " +
+ ex.getMessage());
+ }
+ return new SecureResourceBundle(in);
+ }
+}
+
+
+
1.1.2.1 +68 -68 xml-fop/src/org/apache/fop/apps/CommandLineStarter.java
Index: CommandLineStarter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineStarter.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- CommandLineStarter.java 2001/02/21 01:07:19 1.1
+++ CommandLineStarter.java 2001/05/11 20:24:49 1.1.2.1
@@ -1,68 +1,68 @@
-package org.apache.fop.apps;
-
-// SAX
-import org.xml.sax.XMLReader;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-// Java
-import java.io.*;
-import java.net.URL;
-
-
-// FOP
-import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.configuration.Configuration;
-
-/**
- * super class for all classes which start Fop from the commandline
- */
-
-public class CommandLineStarter extends Starter {
-
- CommandLineOptions commandLineOptions;
- boolean errorDump;
-
- public CommandLineStarter (CommandLineOptions commandLineOptions) {
- this.commandLineOptions = commandLineOptions;
- options.setCommandLineOptions(commandLineOptions);
- errorDump = Configuration.getBooleanValue("debugMode").booleanValue();
- super.setInputHandler(commandLineOptions.getInputHandler());
- }
-
- public void run() {
- String version = Version.getVersion();
- MessageHandler.logln(version);
-
- XMLReader parser = inputHandler.getParser();
- setParserFeatures(parser,errorDump);
-
- Driver driver = new Driver();
- if (errorDump) {
- driver.setErrorDump(true);
- }
-
- try {
- driver.setRenderer(commandLineOptions.getRenderer(), "");
- driver.addElementMapping("org.apache.fop.fo.StandardElementMapping");
- driver.addElementMapping("org.apache.fop.svg.SVGElementMapping");
- driver.addElementMapping("org.apache.fop.extensions.ExtensionElementMapping");
- driver.addPropertyList("org.apache.fop.fo.StandardPropertyListMapping");
- driver.addPropertyList("org.apache.fop.svg.SVGPropertyListMapping");
- driver.addPropertyList("org.apache.fop.extensions.ExtensionPropertyListMapping");
- driver.buildFOTree(parser,inputHandler.getInputSource());
- driver.format();
- driver.setOutputStream(new FileOutputStream(commandLineOptions.getOutputFile()));
- driver.render();
- } catch (Exception e) {
- MessageHandler.errorln("FATAL ERROR: " + e.getMessage());
- if (errorDump) {
- e.printStackTrace();
- }
- System.exit(1);
- }
- }
-
-}
-
+package org.apache.fop.apps;
+
+// SAX
+import org.xml.sax.XMLReader;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+// Java
+import java.io.*;
+import java.net.URL;
+
+
+// FOP
+import org.apache.fop.messaging.MessageHandler;
+import org.apache.fop.configuration.Configuration;
+
+/**
+ * super class for all classes which start Fop from the commandline
+ */
+
+public class CommandLineStarter extends Starter {
+
+ CommandLineOptions commandLineOptions;
+ boolean errorDump;
+
+ public CommandLineStarter (CommandLineOptions commandLineOptions) {
+ this.commandLineOptions = commandLineOptions;
+ options.setCommandLineOptions(commandLineOptions);
+ errorDump = Configuration.getBooleanValue("debugMode").booleanValue();
+ super.setInputHandler(commandLineOptions.getInputHandler());
+ }
+
+ public void run() {
+ String version = Version.getVersion();
+ MessageHandler.logln(version);
+
+ XMLReader parser = inputHandler.getParser();
+ setParserFeatures(parser,errorDump);
+
+ Driver driver = new Driver();
+ if (errorDump) {
+ driver.setErrorDump(true);
+ }
+
+ try {
+ driver.setRenderer(commandLineOptions.getRenderer(), "");
+ driver.addElementMapping("org.apache.fop.fo.StandardElementMapping");
+ driver.addElementMapping("org.apache.fop.svg.SVGElementMapping");
+ driver.addElementMapping("org.apache.fop.extensions.ExtensionElementMapping");
+ driver.addPropertyList("org.apache.fop.fo.StandardPropertyListMapping");
+ driver.addPropertyList("org.apache.fop.svg.SVGPropertyListMapping");
+ driver.addPropertyList("org.apache.fop.extensions.ExtensionPropertyListMapping");
+ driver.buildFOTree(parser,inputHandler.getInputSource());
+ driver.format();
+ driver.setOutputStream(new FileOutputStream(commandLineOptions.getOutputFile()));
+ driver.render();
+ } catch (Exception e) {
+ MessageHandler.errorln("FATAL ERROR: " + e.getMessage());
+ if (errorDump) {
+ e.printStackTrace();
+ }
+ System.exit(0);
+ }
+ }
+
+}
+
No revision
No revision
1.1.2.1 +6 -1 xml-fop/src/org/apache/fop/datatypes/KeepValue.java
Index: KeepValue.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/KeepValue.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- KeepValue.java 2001/01/03 23:14:35 1.1
+++ KeepValue.java 2001/05/11 20:24:58 1.1.2.1
@@ -1,4 +1,4 @@
-/*-- $Id: KeepValue.java,v 1.1 2001/01/03 23:14:35 keiron Exp $ --
+/*-- $Id: KeepValue.java,v 1.1.2.1 2001/05/11 20:24:58 gears Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -72,6 +72,11 @@
}
public String getType()
+ {
+ return type;
+ }
+
+ public String toString()
{
return type;
}
No revision
No revision
1.19.2.1 +3 -1 xml-fop/src/org/apache/fop/pdf/PDFDocument.java
Index: PDFDocument.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/pdf/PDFDocument.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- PDFDocument.java 2001/02/27 12:28:16 1.19
+++ PDFDocument.java 2001/05/11 20:25:06 1.19.2.1
@@ -1,4 +1,4 @@
-/*-- $Id: PDFDocument.java,v 1.19 2001/02/27 12:28:16 fotis Exp $ --
+/*-- $Id: PDFDocument.java,v 1.19.2.1 2001/05/11 20:25:06 gears Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -915,11 +915,13 @@
contents,
pagewidth, pageheight);
+ if(currentPage != null) {
Enumeration enum=currentPage.getIDList().elements();
while ( enum.hasMoreElements() ) {
String id=enum.nextElement().toString();
idReferences.setInternalGoToPageReference(id,page.referencePDF());
}
+ }
/* add it to the list of objects */
this.objects.addElement(page);
No revision
No revision
1.18.2.4 +17 -0 xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -r1.18.2.3 -r1.18.2.4
--- AWTRenderer.java 2001/03/14 05:55:18 1.18.2.3
+++ AWTRenderer.java 2001/05/11 20:25:16 1.18.2.4
@@ -27,6 +27,7 @@
import org.apache.batik.gvt.*;
import org.apache.batik.gvt.renderer.*;
import org.apache.batik.gvt.filter.*;
+import org.apache.batik.gvt.event.*;
import java.awt.*;
import java.awt.Image;
@@ -690,6 +691,7 @@
BridgeContext ctx = new BridgeContext(userAgent, rc);
GraphicsNode root;
graphics.translate(x / 1000f, pageHeight - y / 1000f);
+ graphics.setRenderingHints(rc.getRenderingHints());
try {
root = builder.build(ctx, doc);
root.paint(graphics, rc);
@@ -926,6 +928,21 @@
public Dimension2D getViewportSize()
{
return new Dimension(100, 100);
+ }
+
+ public EventDispatcher getEventDispatcher()
+ {
+ return null;
+ }
+
+ public boolean supportExtension(String str)
+ {
+ return false;
+ }
+
+ public boolean hasFeature(String str)
+ {
+ return false;
}
}
}
No revision
No revision
1.55.2.4 +20 -1 xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.55.2.3
retrieving revision 1.55.2.4
diff -u -r1.55.2.3 -r1.55.2.4
--- PDFRenderer.java 2001/03/15 03:52:56 1.55.2.3
+++ PDFRenderer.java 2001/05/11 20:25:26 1.55.2.4
@@ -1,4 +1,4 @@
-/*-- $Id: PDFRenderer.java,v 1.55.2.3 2001/03/15 03:52:56 keiron Exp $ --
+/*-- $Id: PDFRenderer.java,v 1.55.2.4 2001/05/11 20:25:26 gears Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -75,6 +75,7 @@
import org.apache.batik.gvt.*;
import org.apache.batik.gvt.renderer.*;
import org.apache.batik.gvt.filter.*;
+import org.apache.batik.gvt.event.*;
import org.w3c.dom.*;
import org.w3c.dom.svg.*;
@@ -574,6 +575,7 @@
case Overflow.HIDDEN:
break;
}
+
area.getObject().render(this);
currentStream.add("Q\n");
currentStream.add("BT\n");
@@ -628,10 +630,12 @@
GraphicsNodeRenderContext rc = getRenderContext();
BridgeContext ctx = new BridgeContext(userAgent, rc);
GraphicsNode root;
+ //System.out.println("creating PDFGraphics2D");
PDFGraphics2D graphics = new PDFGraphics2D(true, area.getFontState(), pdfDoc,
currentFontName, currentFontSize, currentXPosition,
currentYPosition);
graphics.setGraphicContext(new org.apache.batik.ext.awt.g2d.GraphicContext());
+ graphics.setRenderingHints(rc.getRenderingHints());
try {
root = builder.build(ctx, doc);
root.paint(graphics, rc);
@@ -1277,5 +1281,20 @@
{
return new Dimension(100, 100);
}
+
+ public EventDispatcher getEventDispatcher()
+ {
+ return null;
+ }
+
+ public boolean supportExtension(String str)
+ {
+ return false;
+ }
+
+ public boolean hasFeature(String str)
+ {
+ return false;
+ }
}
}
No revision
No revision
1.1.2.3 +181 -59 xml-fop/src/org/apache/fop/svg/Attic/PDFGraphics2D.java
Index: PDFGraphics2D.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/Attic/PDFGraphics2D.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PDFGraphics2D.java 2001/03/15 03:52:55 1.1.2.2
+++ PDFGraphics2D.java 2001/05/11 20:25:41 1.1.2.3
@@ -12,6 +12,8 @@
import org.apache.fop.layout.*;
import org.apache.fop.fonts.*;
import org.apache.fop.render.pdf.*;
+import org.apache.fop.image.*;
+import org.apache.fop.datatypes.ColorSpace;
import org.apache.batik.ext.awt.g2d.*;
@@ -36,22 +38,24 @@
* implementing a <tt>Graphic2D</tt> piece-meal.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: PDFGraphics2D.java,v 1.1.2.2 2001/03/15 03:52:55 keiron Exp $
+ * @version $Id: PDFGraphics2D.java,v 1.1.2.3 2001/05/11 20:25:41 gears Exp $
* @see org.apache.batik.ext.awt.g2d.AbstractGraphics2D
*/
public class PDFGraphics2D extends AbstractGraphics2D {
+ protected PDFDocument pdfDoc;
+
+ protected FontState fontState;
+
boolean standalone = false;
/** the PDF Document being created */
- protected PDFDocument pdfDoc;
+ //protected PDFDocument pdfDoc;
- protected FontState fontState;
+ //protected FontState fontState;
/** the current stream to add PDF commands to */
StringWriter currentStream = new StringWriter();
- PDFStream pdfStream;
-
/** the current (internal) font name */
protected String currentFontName;
@@ -65,9 +69,9 @@
protected int currentXPosition = 0;
/** the current colour for use in svg */
- private PDFColor currentColour = new PDFColor(0, 0, 0);
+ PDFColor currentColour = new PDFColor(0, 0, 0);
- private FontInfo fontInfo;
+ FontInfo fontInfo;
/**
* Create a new PDFGraphics2D with the given pdf document info.
@@ -85,38 +89,10 @@
fontState = fs;
}
- /**
- * Create a new PDFGraphics2D with the given pdf document info.
- * This is used to create a Graphics object for use inside an already
- * existing document.
- * Maybe this could be handled as a subclass (PDFDocumentGraphics2d)
- */
- public PDFGraphics2D(boolean textAsShapes, OutputStream stream)
+ public PDFGraphics2D(boolean textAsShapes)
{
super(textAsShapes);
- standalone = true;
- this.pdfDoc = new PDFDocument();
- this.pdfDoc.setProducer("FOP SVG Renderer");
- pdfStream = this.pdfDoc.makeStream();
-
- currentFontName = "";
- currentFontSize = 0;
- currentYPosition = 0;
- currentXPosition = 0;
-// fontState = fs;
-
- // end part
- /*
- FontSetup.addToResources(this.pdfDoc, fontInfo);
- pdfStream.write(getString())
- this.pdfResources = this.pdfDoc.getResources();
- currentPage = this.pdfDoc.makePage(this.pdfResources, currentStream,
- page.getWidth() / 1000,
- page.getHeight() / 1000, page);
- this.pdfDoc.output(stream);
- */
-
- }
+ }
public String getString() {
return currentStream.toString();
@@ -144,13 +120,6 @@
return new PDFGraphics2D(this);
}
- public void setColor(Color c){
- super.setColor(c);
- currentColour = new PDFColor(c.getRed(), c.getGreen(), c.getBlue());
- currentStream.write(currentColour.getColorSpaceOut(false));
- currentStream.write(currentColour.getColorSpaceOut(true));
- }
-
/**
* Draws as much of the specified image as is currently available.
* The image is drawn with its top-left corner at
@@ -176,20 +145,161 @@
* @see java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, int, int, int, int)
*/
public boolean drawImage(Image img, int x, int y, ImageObserver observer){
- System.err.println("drawImage");
-/* int width = img.getWidth(observer);
- int height = img.getHeight(observer);
- FopImage fopimg = new FopImage() {
- };
+ System.err.println("drawImage:x, y");
+
+ final int width = img.getWidth(observer);
+ final int height = img.getHeight(observer);
+ if(width == -1 || height == -1) {
+ return false;
+ }
+
+ Dimension size = new Dimension(width, height);
+ BufferedImage buf = buildBufferedImage(size);
+
+ java.awt.Graphics2D g = buf.createGraphics();
+ g.setComposite(AlphaComposite.SrcOver);
+ g.setBackground(new Color(1, 1, 1, 0));
+ g.setPaint(new Color(1, 1, 1, 0));
+ g.fillRect(0, 0, width, height);
+ g.clip(new Rectangle(0, 0, buf.getWidth(), buf.getHeight()));
+
+ if(!g.drawImage(img, 0, 0, observer)) {
+ return false;
+ }
+ g.dispose();
+
+ final byte[] result = new byte[buf.getWidth() * buf.getHeight() * 3];
+
+ Raster raster = buf.getData();
+ DataBuffer bd = raster.getDataBuffer();
+
+ int count = 0;
+ switch(bd.getDataType()) {
+ case DataBuffer.TYPE_INT:
+ int[][] idata = ((DataBufferInt)bd).getBankData();
+ for(int i = 0; i < idata.length; i++) {
+ for(int j = 0; j < idata[i].length; j++) {
+ //System.out.println("data:" + ((idata[i][j] >> 24) & 0xFF));
+ if(((idata[i][j] >> 24) & 0xFF) != 255) {
+System.out.println("data:" + ((idata[i][j] >> 24) & 0xFF));
+ result[count++] = (byte)0xFF;
+ result[count++] = (byte)0xFF;
+ result[count++] = (byte)0xFF;
+ } else {
+ result[count++] = (byte)((idata[i][j] >> 16) & 0xFF);
+ result[count++] = (byte)((idata[i][j] >> 8) & 0xFF);
+ result[count++] = (byte)((idata[i][j]) & 0xFF);
+ }
+ }
+ }
+ break;
+ default:
+ // error
+ break;
+ }
+
+ try {
+ FopImage fopimg = new TempImage(width, height, result);
int xObjectNum = this.pdfDoc.addImage(fopimg);
- currentStream.add("q\n" + (((float) w) / 1000f) +
- " 0 0 " + (((float) h) / 1000f) + " " +
+ /*currentStream.write("q\n" + (((float) width)) +
+ " 0 0 " + (((float) height)) + " " +
x + " " +
- ((float)(y - h)) + " cm\n" + "/Im" +
+ ((float)(y - height)) + " cm\n" + "/Im" +
xObjectNum + " Do\nQ\n");*/
+ AffineTransform at = getTransform();
+ double[] matrix = new double[6];
+ at.getMatrix(matrix);
+ currentStream.write("q\n" + matrix[0] +
+ " " + matrix[1] + " " + matrix[2] + " " + matrix[3] + " " +
+ matrix[4] + " " +
+ matrix[5] + " cm\n");
+ currentStream.write("" + width +
+ " 0 0 " + (-height) + " " +
+ x + " " +
+ (y + height) + " cm\n" + "/Im" +
+ xObjectNum + " Do\nQ\n");
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
return true;
}
+ public BufferedImage buildBufferedImage(Dimension size) {
+ return new BufferedImage(size.width, size.height,
+ BufferedImage.TYPE_INT_ARGB);
+ }
+
+ class TempImage implements FopImage {
+ int m_height;
+ int m_width;
+ int m_bitsPerPixel;
+ ColorSpace m_colorSpace;
+ int m_bitmapSiye;
+ byte[] m_bitmaps;
+ PDFColor transparent = new PDFColor(255, 255, 255);
+
+ TempImage(int width, int height, byte[] result) throws FopImageException
+ {
+ this.m_height = height;
+ this.m_width = width;
+ this.m_bitsPerPixel = 8;
+ this.m_colorSpace = new ColorSpace(ColorSpace.DEVICE_RGB);
+ //this.m_isTransparent = false;
+ //this.m_bitmapsSize = this.m_width * this.m_height * 3;
+ this.m_bitmaps = result;
+ }
+
+ public String getURL() {return "" + m_bitmaps;}
+
+ // image size
+ public int getWidth() throws FopImageException
+ {
+ return m_width;
+ }
+
+ public int getHeight() throws FopImageException
+ {return m_height;}
+
+ // DeviceGray, DeviceRGB, or DeviceCMYK
+ public ColorSpace getColorSpace() throws FopImageException
+ {return m_colorSpace;}
+
+ // bits per pixel
+ public int getBitsPerPixel() throws FopImageException
+ {return m_bitsPerPixel;}
+
+ // For transparent images
+ public boolean isTransparent() throws FopImageException
+ {return transparent != null;}
+ public PDFColor getTransparentColor() throws FopImageException
+ {return transparent;}
+
+ // get the image bytes, and bytes properties
+
+ // get uncompressed image bytes
+ public byte[] getBitmaps() throws FopImageException
+ {return m_bitmaps;}
+// width * (bitsPerPixel / 8) * height, no ?
+ public int getBitmapsSize() throws FopImageException
+ {return m_width * m_height * 3;}
+
+ // get compressed image bytes
+ // I don't know if we really need it, nor if it
+ // should be changed...
+ public byte[] getRessourceBytes() throws FopImageException
+ {return null;}
+ public int getRessourceBytesSize() throws FopImageException
+ {return 0;}
+ // return null if no corresponding PDFFilter
+ public PDFFilter getPDFFilter() throws FopImageException
+ {return null;}
+
+ // release memory
+ public void close() {}
+
+ }
+
+
/**
* Draws as much of the specified image as has already been scaled
* to fit inside the specified rectangle.
@@ -278,10 +388,17 @@
* @see #setComposite
*/
public void draw(Shape s){
- System.out.println("draw(Shape)");
+ //System.out.println("draw(Shape)");
+ Color c = getColor();
+ currentColour = new PDFColor(c.getRed(), c.getGreen(), c.getBlue());
+ currentStream.write(currentColour.getColorSpaceOut(true));
+ c = getBackground();
+ PDFColor col = new PDFColor(c.getRed(), c.getGreen(), c.getBlue());
+ currentStream.write(col.getColorSpaceOut(false));
+
PDFNumber pdfNumber = new PDFNumber();
- PathIterator iter = s.getPathIterator(new AffineTransform());
+ PathIterator iter = s.getPathIterator(getTransform());
while(!iter.isDone()) {
double vals[] = new double[6];
int type = iter.currentSegment(vals);
@@ -427,8 +544,6 @@
System.err.println("drawString(AttributedCharacterIterator)");
}
-
-
/**
* Fills the interior of a <code>Shape</code> using the settings of the
* <code>Graphics2D</code> context. The rendering attributes applied
@@ -444,10 +559,17 @@
* @see #setClip
*/
public void fill(Shape s){
- System.err.println("fill");
+ //System.err.println("fill");
+ Color c = getColor();
+ currentColour = new PDFColor(c.getRed(), c.getGreen(), c.getBlue());
+ currentStream.write(currentColour.getColorSpaceOut(true));
+ c = getBackground();
+ PDFColor col = new PDFColor(c.getRed(), c.getGreen(), c.getBlue());
+ currentStream.write(col.getColorSpaceOut(false));
+
PDFNumber pdfNumber = new PDFNumber();
- PathIterator iter = s.getPathIterator(new AffineTransform());
+ PathIterator iter = s.getPathIterator(getTransform());
while(!iter.isDone()) {
double vals[] = new double[6];
int type = iter.currentSegment(vals);
@@ -503,7 +625,7 @@
*/
public GraphicsConfiguration getDeviceConfiguration(){
System.out.println("getDeviceConviguration");
- return null;
+ return GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration();
}
/**
1.18.2.4 +7 -1 xml-fop/src/org/apache/fop/svg/SVG.java
Index: SVG.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVG.java,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -r1.18.2.3 -r1.18.2.4
--- SVG.java 2001/03/15 03:52:55 1.18.2.3
+++ SVG.java 2001/05/11 20:25:48 1.18.2.4
@@ -1,4 +1,4 @@
-/*-- $Id: SVG.java,v 1.18.2.3 2001/03/15 03:52:55 keiron Exp $ --
+/*-- $Id: SVG.java,v 1.18.2.4 2001/05/11 20:25:48 gears Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -64,6 +64,8 @@
import org.w3c.dom.svg.*;
import org.w3c.dom.svg.SVGLength;
+import java.io.File;
+
/**
* class representing svg:svg pseudo flow object.
*/
@@ -329,6 +331,10 @@
/* create an SVG area */
/* if width and height are zero, may want to get the bounds of the content. */
SVGOMDocument doc = new SVGOMDocument(null, SVGDOMImplementation.getDOMImplementation());
+ try {
+ doc.setURLObject(new File(".").toURL());
+ } catch(Exception e) {
+ }
DefaultSVGContext dc = new DefaultSVGContext() {
public float getPixelToMM() {
1.10.4.2 +7 -1 xml-fop/src/org/apache/fop/svg/SVGElementMapping.java
Index: SVGElementMapping.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGElementMapping.java,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -u -r1.10.4.1 -r1.10.4.2
--- SVGElementMapping.java 2001/03/01 02:12:18 1.10.4.1
+++ SVGElementMapping.java 2001/05/11 20:25:50 1.10.4.2
@@ -1,4 +1,4 @@
-/*-- $Id: SVGElementMapping.java,v 1.10.4.1 2001/03/01 02:12:18 keiron Exp $ --
+/*-- $Id: SVGElementMapping.java,v 1.10.4.2 2001/05/11 20:25:50 gears Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -106,5 +106,11 @@
builder.addMapping(uri, "animateTransform", AnimateTransform.maker());
builder.addMapping(uri, "cursor", Cursor.maker());
builder.addMapping(uri, "filter", Filter.maker());
+
+ builder.addMapping(uri, "feFlood", FeFlood.maker());
+ builder.addMapping(uri, "feGaussianBlur", FeGaussianBlur.maker());
+ builder.addMapping(uri, "feOffset", FeOffset.maker());
+ builder.addMapping(uri, "feMerge", FeMerge.maker());
+ builder.addMapping(uri, "feMergeNode", FeMergeNode.maker());
}
}
1.1.4.4 +19 -3 xml-fop/src/org/apache/fop/svg/SVGObj.java
Index: SVGObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGObj.java,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -r1.1.4.3 -r1.1.4.4
--- SVGObj.java 2001/03/15 03:52:54 1.1.4.3
+++ SVGObj.java 2001/05/11 20:25:52 1.1.4.4
@@ -1,4 +1,4 @@
-/*-- $Id: SVGObj.java,v 1.1.4.3 2001/03/15 03:52:54 keiron Exp $ --
+/*-- $Id: SVGObj.java,v 1.1.4.4 2001/05/11 20:25:52 gears Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -62,6 +62,8 @@
import org.w3c.dom.svg.*;
import org.w3c.dom.*;
+import java.util.*;
+
/**
* Since SVG objects are not layed out then this class checks
* that this element is not being layed out inside some incorrect
@@ -80,14 +82,28 @@
super(parent, propertyList);
}
+ protected static Hashtable ns = new Hashtable();
+
public void addGraphic(Document doc, Element parent) {
Element element = doc.createElementNS("http://www.w3.org/2000/svg", tagName);
// Element element = doc.createElement(tagName);
for(int count = 0; count < props.length; count++) {
if(this.properties.get(props[count]) != null) {
String rf = this.properties.get(props[count]).getString();
- if(rf != null)
- element.setAttribute(props[count], rf);
+ if(rf != null) {
+ if(props[count].indexOf(":") == -1) {
+ element.setAttribute(props[count], rf);
+ } else {
+ String pref = props[count].substring(0, props[count].indexOf(":"));
+System.out.println(pref);
+ if(pref.equals("xmlns")) {
+ ns.put(props[count].substring(props[count].indexOf(":") + 1), rf);
+System.out.println(ns);
+ }
+ ns.put("xlink", "http://www.w3.org/1999/xlink");
+ element.setAttributeNS((String)ns.get(pref), props[count], rf);
+ }
+ }
}
}
parent.appendChild(element);
No revision
No revision
1.1.2.1 +120 -0 xml-fop/src/org/apache/fop/svg/Attic/PDFDocumentGraphics2D.java
1.1.2.1 +655 -0 xml-fop/src/org/apache/fop/svg/Attic/PDFTranscoder.java
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org