You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by de...@apache.org on 2006/12/09 16:10:38 UTC
svn commit: r484993 - in /xmlgraphics/batik/trunk: ./
sources/org/apache/batik/bridge/ sources/org/apache/batik/bridge/svg12/
test-references/org/apache/batik/transcoder/image/
test-references/org/apache/batik/transcoder/wmf/ test-references/samples/
t...
Author: deweese
Date: Sat Dec 9 07:10:34 2006
New Revision: 484993
URL: http://svn.apache.org/viewvc?view=rev&rev=484993
Log:
1) Fixed Build.bat for new jars
2) Added NullURI test back, since lockup seems fixed(?),
unfortunately the fix was done in the JSVGCanvasHandler
(I was hoping this was tied to stopAndRun problem in Canvas).
Still has uncleared references but we should investigate these.
3) Fixed NPE when reloading an SVG12 document quickly.
4) Fixed Broken Link images when interrupting the load of an
SVG image refernce.
5) Fixed reference images for new gradient interpolation.
Added:
xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/image/cssMediaProjection.png (with props)
Modified:
xmlgraphics/batik/trunk/build.bat
xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java
xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java
xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/black_shapes.svg
xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/imageWMF.svg
xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/testChart.svg
xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/textGreek.svg
xmlgraphics/batik/trunk/test-references/samples/GVT.png
xmlgraphics/batik/trunk/test-references/samples/asf-logo.png
xmlgraphics/batik/trunk/test-references/samples/batik3D.png
xmlgraphics/batik/trunk/test-references/samples/batikFX.png
xmlgraphics/batik/trunk/test-references/samples/batikYin.png
xmlgraphics/batik/trunk/test-references/samples/chessboard.png
xmlgraphics/batik/trunk/test-references/samples/extensions/colorSwitch.png
xmlgraphics/batik/trunk/test-references/samples/gradients.png
xmlgraphics/batik/trunk/test-references/samples/moonPhases.png
xmlgraphics/batik/trunk/test-references/samples/sizeOfSun.png
xmlgraphics/batik/trunk/test-references/samples/sunRise.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/filters/feDisplacementMap.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/filters/feTile.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/filters/feTileTarget.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/fonts/fontArabic.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/linking/anchor.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/linking/pointerEvents2.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/masking/clipTransform.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/painting/bboxOnText.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/painting/markersShapes.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/externalPaints.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/gradientLimit.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/linearGradientLine.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/linearGradientOrientation.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/linearGradientRepeat.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradient.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradient2.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradient3.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradientLine.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradientOrientation.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/rendering/paintOpacity.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/display.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/image.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/imageRefUpdate.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/imagesvg.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/paintType.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/relativeURI.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/setProperty.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/transform.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/visibility.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/visibilityOnClick.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/zeroSize.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/externalUseCascading.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/image.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/useStylesheet.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/useStyling.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/useStylingURI.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/xmlBaseStyling.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/text/textEffect.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/text/textEffect2.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec/text/textEffect3.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec12/text/flowBidi.png
xmlgraphics/batik/trunk/test-references/samples/tests/spec12/text/flowText5.png
xmlgraphics/batik/trunk/test-references/samples/textRotate.png
xmlgraphics/batik/trunk/test-references/samples/textRotateShadows.png
xmlgraphics/batik/trunk/test-references/svgbe/color-property-BE-02.png
xmlgraphics/batik/trunk/test-references/svgbe/coords-unitsProc-BE-05.png
xmlgraphics/batik/trunk/test-references/svgbe/filters-blend-BE-02.png
xmlgraphics/batik/trunk/test-references/svgbe/filters-colorMtrx-BE-03.png
xmlgraphics/batik/trunk/test-references/svgbe/filters-transfer-BE-04.png
xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-linearGr-BE-01.png
xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-linearGr-BE-02.png
xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-radialGr-BE-04.png
xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-radialGr-BE-05.png
xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-referenc-BE-08.png
xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-stop-BE-06.png
xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-stop-BE-10.png
xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-transfrm-BE-09.png
xmlgraphics/batik/trunk/test-references/svgbe/masking-mask-BE-05.png
xmlgraphics/batik/trunk/test-resources/org/apache/batik/swing/unitTesting.xml
xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGCanvasHandler.java
Modified: xmlgraphics/batik/trunk/build.bat
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/build.bat?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
--- xmlgraphics/batik/trunk/build.bat (original)
+++ xmlgraphics/batik/trunk/build.bat Sat Dec 9 07:10:34 2006
@@ -33,11 +33,12 @@
:: ----- Set Up The Runtime Classpath -----------------------------------------
-set CP=%JAVA_HOME%\lib\tools.jar;lib\build\ant_1_4_1.jar;.\lib\build\crimson-ant.jar;.\lib\build\jaxp.jar
+set CP=%JAVA_HOME%\lib\tools.jar;.\lib\build\ant-1.6.5.jar;.\lib\build\ant-launcher-1.6.5.jar;.\lib\build\crimson-1.1.3.jar
:: ----- Execute The Requested Build ------------------------------------------
+echo %JAVA_HOME%\bin\java.exe %ANT_OPTS% -classpath %CP% org.apache.tools.ant.Main -emacs -Dant.home=. %1 -Dargs="%2 %3 %4 %5 %6 %7 %8 %9"
%JAVA_HOME%\bin\java.exe %ANT_OPTS% -classpath %CP% org.apache.tools.ant.Main -emacs -Dant.home=. %1 -Dargs="%2 %3 %4 %5 %6 %7 %8 %9"
:: ----- Cleanup the environment ----------------------------------------------
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/SVGImageElementBridge.java Sat Dec 9 07:10:34 2006
@@ -26,6 +26,7 @@
import java.awt.geom.Rectangle2D;
import java.io.BufferedInputStream;
import java.io.InputStream;
+import java.io.InterruptedIOException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -50,8 +51,9 @@
import org.apache.batik.gvt.ImageNode;
import org.apache.batik.gvt.RasterImageNode;
import org.apache.batik.gvt.ShapeNode;
-import org.apache.batik.util.ParsedURL;
+import org.apache.batik.util.HaltingThread;
import org.apache.batik.util.MimeTypeConstants;
+import org.apache.batik.util.ParsedURL;
import org.apache.batik.util.XMLConstants;
import org.w3c.dom.Document;
@@ -264,6 +266,8 @@
// Reset the stream for next try.
reference.retry();
} catch (IOException ioe) {
+ reference.release();
+ reference = null;
try {
// Couldn't reset stream so reopen it.
reference = openStream(e, purl);
@@ -286,6 +290,12 @@
} catch (SecurityException ex) {
throw new BridgeException(ctx, e, ERR_URI_UNSECURE,
new Object[] {purl});
+ } catch (InterruptedIOException iioe) {
+ if (HaltingThread.hasBeenHalted())
+ throw new InterruptedBridgeException();
+
+ } catch (InterruptedBridgeException ibe) {
+ throw ibe;
} catch (Exception ex) {
/* Nothing to do */
// ex.printStackTrace();
@@ -294,6 +304,8 @@
try {
reference.retry();
} catch (IOException ioe) {
+ reference.release();
+ reference = null;
try {
// Couldn't reset stream so reopen it.
reference = openStream(e, purl);
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java Sat Dec 9 07:10:34 2006
@@ -43,6 +43,7 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
@@ -131,8 +132,6 @@
* Disposes this BridgeContext.
*/
public void dispose() {
- AbstractNode n = (AbstractNode) document;
- XBLEventSupport es = (XBLEventSupport) n.initializeEventSupport();
childContexts.clear();
synchronized (eventListenerSet) {
@@ -150,7 +149,13 @@
}
if (m instanceof ImplementationEventListenerMememto) {
String ns = m.getNamespaceURI();
- es.removeImplementationEventListenerNS(ns, t, el, uc);
+ Node nde = (Node)et;
+ AbstractNode n = (AbstractNode)nde.getOwnerDocument();
+ if (n != null) {
+ XBLEventSupport es;
+ es = (XBLEventSupport) n.initializeEventSupport();
+ es.removeImplementationEventListenerNS(ns, t, el, uc);
+ }
} else if (in) {
String ns = m.getNamespaceURI();
et.removeEventListenerNS(ns, t, el, uc);
Added: xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/image/cssMediaProjection.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/image/cssMediaProjection.png?view=auto&rev=484993
==============================================================================
Binary file - no diff available.
Propchange: xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/image/cssMediaProjection.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/image/cssMediaProjection.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/black_shapes.svg
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/black_shapes.svg?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/black_shapes.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/black_shapes.svg Sat Dec 9 07:10:34 2006
@@ -4,22 +4,22 @@
<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="'Arial'" width="960" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" viewBox="0 0 960 720" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="720" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1"
><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
/><g
- ><g fill="white" stroke="white" stroke-linejoin="round" stroke-linecap="butt"
- ><rect width="960" x="0" height="720" y="0" stroke="none"
+ ><g fill="white" stroke-linejoin="round" stroke-linecap="butt" stroke="white"
+ ><rect x="0" width="960" height="720" y="0" stroke="none"
/></g
- ><g font-size="0" stroke-linecap="butt" fill="rgb(255,255,153)" stroke-linejoin="round" stroke="rgb(255,255,153)" stroke-width="0.6667"
- ><rect width="484" x="240.1667" height="492.1667" y="114.1667" stroke="none"
- /><rect x="240.1667" y="114.1667" fill="none" width="484" height="492.1667" stroke="black"
- /><rect x="240" y="432" fill="black" width="483.8333" height="173.5" stroke="none"
+ ><g fill="rgb(255,255,153)" font-size="0" stroke-width="0.6667" stroke="rgb(255,255,153)" stroke-linejoin="round" stroke-linecap="butt"
+ ><rect x="240.1667" width="484" height="492.1667" y="114.1667" stroke="none"
+ /><rect fill="none" x="240.1667" width="484" height="492.1667" y="114.1667" stroke="black"
+ /><rect fill="black" x="240" width="483.8333" height="173.5" y="432" stroke="none"
/></g
- ><g stroke-linecap="butt" fill="aqua" font-family="'monospaced'" stroke-linejoin="round" stroke="aqua" stroke-width="0.6667"
- ><text xml:space="preserve" x="678.3334" y="491.5" stroke="none"
+ ><g fill="aqua" stroke-width="0.6667" font-family="'monospaced'" stroke="aqua" stroke-linecap="butt" stroke-linejoin="round"
+ ><text x="678.3334" xml:space="preserve" y="491.5" stroke="none"
>20</text
- ><text x="624" font-size="10" y="522.5" fill="rgb(255,102,255)" stroke="none" xml:space="preserve"
+ ><text fill="rgb(255,102,255)" x="624" xml:space="preserve" font-size="10" y="522.5" stroke="none"
>SHTZ</text
- ><text x="655.6667" font-size="10" y="522.5" fill="rgb(255,102,255)" stroke="none" xml:space="preserve"
+ ><text fill="rgb(255,102,255)" x="655.6667" xml:space="preserve" font-size="10" y="522.5" stroke="none"
>1500 </text
- ><text x="687.3334" font-size="10" y="522.5" fill="rgb(255,102,255)" stroke="none" xml:space="preserve"
+ ><text fill="rgb(255,102,255)" x="687.3334" xml:space="preserve" font-size="10" y="522.5" stroke="none"
>FT</text
><path fill="lime" d="M520 473.5 L524.8334 473.8333 L527.1667 474 L527.6667 471.1667 L524.8334 470.8333 L520 470.5 L515.1667 470.8333 L510.3333 471.5 L509.8333 471.5 L507.8333 472.1667 L508.5 475 L511 474.3333 L510.3333 473 L510.3333 474.5 L515.1667 473.8333 Z" stroke="none"
/><path fill="lime" d="M500.3333 477.8333 L499 475.1667 L496.5 476.3333 L492.6667 478.8333 L492.1667 479.1667 L488.6667 481.8333 L490.5 484.1667 L494.3333 481.3333 L493.1667 480.1667 L493.8333 481.6667 L497.6667 479.1667 Z" stroke="none"
Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/imageWMF.svg
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/imageWMF.svg?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/imageWMF.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/imageWMF.svg Sat Dec 9 07:10:34 2006
@@ -4,8 +4,8 @@
<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="'Arial'" width="960" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" viewBox="0 0 960 720" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="720" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1"
><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
/><g
- ><g fill="white" stroke-width="0.4805" stroke="white" stroke-linecap="butt" stroke-linejoin="round"
- ><rect width="492" x="247" height="150" y="279" stroke="none"
+ ><g fill="white" stroke-width="0.4805" stroke="white" stroke-linejoin="round" stroke-linecap="butt"
+ ><rect x="247" width="492" height="150" y="279" stroke="none"
/><image x="247" y="279" width="492" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAewAAACWCAYAAAAc5LtzAAAgAElEQVR42u29PWwc
ybIumNJtAVWABqg2LsBe4BltPIPySI801uAxFuB4lLGAaHI8yZOMXYyMa3CMBSRj
AdEbmhxPNB4gGg84NJ5BeSSwC4jGPtw27gWawLtAN7AH6DK40FZUVnblT0RmZFY1
Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/testChart.svg
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/testChart.svg?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/testChart.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/testChart.svg Sat Dec 9 07:10:34 2006
@@ -5,216 +5,216 @@
><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
/><g
><defs id="defs1"
- ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern1" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern1" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAOklEQVR42o3NQQ4A
IAgDwZb//1mFg4kK0j1PWgIYK3SZgkjCFORjpqC4VlAJb5TCDD2wQgf8oQ075E23
tx8QKLvT2gAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="10" preserveAspectRatio="none" xlink:show="embed"
/></pattern
- ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern2" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern2" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAH0lEQVR42mNkYGD4
z0AEYAER//8TVsvEQCQYVYgXAADl9AQSAIUWgQAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="10" preserveAspectRatio="none" xlink:show="embed"
/></pattern
- ><pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern3" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern3" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAM0lEQVR42m2OsQ0A
QAgChf13Rho/5AOddwaFpLkAeCMnYmpXRDpkVXayUm+z0v9G/yqps266GwzTfgxK
AAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed"
/></pattern
- ><pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern4" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern4" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAOklEQVR42mNgAIP/
//9DSAgAshkZYADCBwkxggSZMEUROjBFUUxHNhPEhduGDIAi6HZA2IwQB2C1AwDv
GDvbZ2CR/gAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed"
/></pattern
- ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern5" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern5" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAASklEQVR42oXPUQoA
IAgD0Ln737myEMRc+ekeNQ3AWIPf0JGZPZHnxHlSYt97zlh0OND+OgcZZ3TBjOuB
VJ1qDapOFbNDXWcqVPEEfe80ExU5GvgAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="10" preserveAspectRatio="none" xlink:show="embed"
/></pattern
- ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern6" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern6" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAHklEQVR42mNkYGD4
z0AEYPn/nyh1DEwMRIJRhXgBAPHoBBIyVomkAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="10" preserveAspectRatio="none" xlink:show="embed"
/></pattern
- ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern7" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern7" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGklEQVR42mNkYGD4
DwQMhAATA5FgVCF1FAIAXaYEEMKvnIEAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="10" preserveAspectRatio="none" xlink:show="embed"
/></pattern
- ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern8" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern8" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAQUlEQVR42oXQSQoA
MAgDwCT//3MXiiCijScto2gJYJ2AC11E0kO8kRYrEoeVix9WfZiwuu4Oa9qpYv0u
zVju/wJvF2YfEFUgIOwAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="10" preserveAspectRatio="none" xlink:show="embed"
/></pattern
- ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern9" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern9" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAQElEQVR42mP8z8Dw
HwgJAiawIkZiFIIAEYqZ4CwCiplQeHgUM2GI4FDMhFU7FsVMOB2FppgJr1eRFDMR
DECoYgBjXAwRld6/zwAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="10" preserveAspectRatio="none" xlink:show="embed"
/></pattern
- ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern10" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern10" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAQUlEQVR42oXQSQoA
MAgDwCT//3MXiiCijScto2gJYJ2AC11E0kO8kRYrEoeVix9WfZiwuu4Oa9qpYv0u
zVju/wJvF2YfEFUgIOwAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="10" preserveAspectRatio="none" xlink:show="embed"
/></pattern
- ><pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern11" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern11" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAJklEQVR42mP8//8/
AxgwMjIyIAFGuASKKCMjEwMOQLoEdjvIMgoAOSQJC7g1m/AAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed"
/></pattern
- ><pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern12" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other"
+ ><pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" patternUnits="userSpaceOnUse" xlink:actuate="onLoad" id="pattern12" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other"
><image x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAJUlEQVR42mNgwAX+
//+PVZwJlxwTLn1MuMxkwmUfEy63MOFyJwBK/hT4sr1A4wAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed"
/></pattern
></defs
- ><g stroke-width="1.5118" stroke-linecap="butt" stroke-linejoin="round"
- ><rect fill="none" width="454.3748" x="47.2441" height="156.6992" y="580.989"
- /><rect fill="none" width="451.9937" x="549.2787" height="156.6992" y="580.989"
- /><rect fill="none" width="454.3748" x="549.2787" height="154.3181" y="174.7654"
- /><rect fill="none" width="454.3748" x="47.2441" height="153.1086" y="178.3181"
- /><text font-size="63" x="33.0315" y="84.1701" text-decoration="underline" stroke="none" font-weight="bold" xml:space="preserve"
+ ><g stroke-linecap="butt" stroke-linejoin="round" stroke-width="1.5118"
+ ><rect fill="none" x="47.2441" width="454.3748" height="156.6992" y="580.989"
+ /><rect fill="none" x="549.2787" width="451.9937" height="156.6992" y="580.989"
+ /><rect fill="none" x="549.2787" width="454.3748" height="154.3181" y="174.7654"
+ /><rect fill="none" x="47.2441" width="454.3748" height="153.1086" y="178.3181"
+ /><text x="33.0315" font-size="63" y="84.1701" text-decoration="underline" stroke="none" font-weight="bold" xml:space="preserve"
>Metafile Companion Test Chart</text
></g
><g font-size="26" stroke-linecap="butt" transform="translate(70.1858,185.4992)" fill="white" stroke-linejoin="round" stroke="white" font-weight="bold" stroke-width="1.5118"
- ><rect width="100" x="0" height="25" y="-19" stroke="none"
+ ><rect x="0" width="100" height="25" y="-19" stroke="none"
/></g
><g font-size="26" stroke-width="1.5118" font-weight="bold" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="70.1858" y="185.4992" stroke="none"
+ ><text x="70.1858" xml:space="preserve" y="185.4992" stroke="none"
>Objects</text
><rect x="0" y="-19" transform="translate(573.4677,185.4992)" fill="white" width="86" height="20" stroke="none"
/></g
><g font-size="26" stroke-width="1.5118" font-weight="bold" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="573.4677" y="185.4992" stroke="none"
+ ><text x="573.4677" xml:space="preserve" y="185.4992" stroke="none"
>Colors</text
><rect x="-1" y="-19" transform="translate(573.4677,591.7606)" fill="white" width="130" height="20" stroke="none"
/></g
><g font-size="26" stroke-width="1.5118" font-weight="bold" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="573.4677" y="591.7606" stroke="none"
+ ><text x="573.4677" xml:space="preserve" y="591.7606" stroke="none"
>Advanced</text
><rect x="1" y="-19" transform="translate(72.7559,591.6094)" fill="white" width="54" height="20" stroke="none"
/></g
><g font-size="26" stroke-width="1.5118" font-weight="bold" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="72.7559" y="591.6094" stroke="none"
+ ><text x="72.7559" xml:space="preserve" y="591.6094" stroke="none"
>Fills</text
- ><line fill="none" x1="70.1102" x2="112.8945" y1="278.9291" y2="230.8535" stroke-width="0.7559"
- /><rect x="200.8063" y="235.011" fill="none" width="42.1417" height="39.7607" stroke-width="0.7559"
- /><ellipse fill="none" rx="26.9858" cx="295.1055" ry="24.0189" cy="256.6488" stroke-width="0.7559"
+ ><line y2="230.8535" fill="none" stroke-width="0.7559" x1="70.1102" x2="112.8945" y1="278.9291"
+ /><rect fill="none" x="200.8063" width="42.1417" stroke-width="0.7559" height="39.7607" y="235.011"
+ /><ellipse rx="26.9858" fill="none" ry="24.0189" stroke-width="0.7559" cx="295.1055" cy="256.6488"
/></g
><g font-size="26" stroke-linecap="butt" transform="translate(857.7512,672.0977) rotate(-20)" fill="white" stroke-linejoin="round" stroke="white" stroke-width="0.7559"
- ><rect width="88" x="2" height="20" y="-19" stroke="none"
+ ><rect x="2" width="88" height="20" y="-19" stroke="none"
/></g
><g font-size="26" transform="matrix(0.9397,-0.342,0.342,0.9397,-216.0685,358.3464)" stroke-linejoin="round" stroke-linecap="butt"
- ><text xml:space="preserve" x="945.7512" y="662.0977" stroke="none"
+ ><text x="945.7512" xml:space="preserve" y="662.0977" stroke="none"
>Rotated</text
></g
><g font-size="26" stroke-linecap="butt" transform="translate(433.1717,263.3575)" fill="white" stroke-linejoin="round" stroke="white" stroke-width="0.7559"
- ><rect width="51" x="0" height="20" y="-19" stroke="none"
+ ><rect x="0" width="51" height="20" y="-19" stroke="none"
/></g
- ><g font-size="26" stroke-width="0.7559" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="433.1717" y="263.3575" stroke="none"
+ ><g font-size="26" stroke-width="0.7559" stroke-linejoin="round" stroke-linecap="butt"
+ ><text x="433.1717" xml:space="preserve" y="263.3575" stroke="none"
>Text</text
- ><path fill="silver" stroke-width="0.0378" d="M792.6047 679.7858 L830.4 625.3607 L866.6835 679.7858 ZM806.3622 673.5874 L829.6441 638.9669 L852.6236 673.5874 ZM818.3055 665.5748 L828.8882 649.852 L839.3197 665.5748 Z" fill-rule="evenodd" stroke="none"
- /><path fill="none" d="M792.6047 679.7858 L830.4 625.3607 L866.6835 679.7858 Z" stroke-width="0.0378"
- /><path fill="none" d="M806.3622 673.5874 L829.6441 638.9669 L852.6236 673.5874 Z" stroke-width="0.0378"
- /><path fill="none" d="M818.3055 665.5748 L828.8882 649.852 L839.3197 665.5748 Z" stroke-width="0.0378"
+ ><path fill="silver" d="M792.6047 679.7858 L830.4 625.3607 L866.6835 679.7858 ZM806.3622 673.5874 L829.6441 638.9669 L852.6236 673.5874 ZM818.3055 665.5748 L828.8882 649.852 L839.3197 665.5748 Z" stroke-width="0.0378" fill-rule="evenodd" stroke="none"
+ /><path fill="none" stroke-width="0.0378" d="M792.6047 679.7858 L830.4 625.3607 L866.6835 679.7858 Z"
+ /><path fill="none" stroke-width="0.0378" d="M806.3622 673.5874 L829.6441 638.9669 L852.6236 673.5874 Z"
+ /><path fill="none" stroke-width="0.0378" d="M818.3055 665.5748 L828.8882 649.852 L839.3197 665.5748 Z"
/><line fill="none" x1="75.4772" x2="174.0472" y1="478.7906" y2="478.7906" stroke-dasharray="15.0857,6.0343,3.0171,6.0343,3.0171,6.0343" stroke-width="0.0378" stroke-miterlimit="45.2571"
/><line fill="none" x1="75.4772" x2="174.0472" y1="441.1465" y2="441.1465" stroke-dasharray="3.0171,15.0857" stroke-width="0.0378" stroke-miterlimit="30.1714"
- /><line fill="none" x1="74.1165" x2="172.6866" y1="403.5023" y2="403.5023" stroke-width="0.0378"
+ /><line y2="403.5023" fill="none" stroke-width="0.0378" x1="74.1165" x2="172.6866" y1="403.5023"
/><line fill="none" x1="74.1165" x2="172.6866" y1="421.6441" y2="421.6441" stroke-dasharray="15.0857,6.0343" stroke-width="0.0378" stroke-miterlimit="30.1714"
/><line fill="none" x1="75.4772" x2="174.0472" y1="459.2882" y2="459.2882" stroke-dasharray="15.0857,6.0343,3.0171,6.0343" stroke-width="0.0378" stroke-miterlimit="30.1714"
/><rect x="133.4929" y="661.304" fill="url(#pattern1)" width="44.485" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="133.4929" y="661.304" fill="none" width="44.485" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="133.4929" width="44.485" stroke-width="0.0378" height="44.485" y="661.304"
/><rect x="191.3575" y="661.304" fill="url(#pattern2)" width="44.485" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="191.3575" y="661.304" fill="none" width="44.485" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="191.3575" width="44.485" stroke-width="0.0378" height="44.485" y="661.304"
/><rect x="354.3685" y="606.9921" fill="url(#pattern3)" width="44.485" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="354.3685" y="606.9921" fill="none" width="44.485" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="354.3685" width="44.485" stroke-width="0.0378" height="44.485" y="606.9921"
/><rect x="871.748" y="232.6299" fill="blue" width="45.6567" height="45.6567" stroke="none" stroke-width="0.0378"
- /><rect x="871.748" y="232.6299" fill="none" width="45.6567" height="45.6567" stroke-width="0.0378"
+ /><rect fill="none" x="871.748" width="45.6567" stroke-width="0.0378" height="45.6567" y="232.6299"
/><rect x="815.0173" y="232.6299" fill="green" width="44.5228" height="45.6567" stroke="none" stroke-width="0.0378"
- /><rect x="815.0173" y="232.6299" fill="none" width="44.5228" height="45.6567" stroke-width="0.0378"
+ /><rect fill="none" x="815.0173" width="44.5228" stroke-width="0.0378" height="45.6567" y="232.6299"
/><rect x="411.0614" y="606.9921" fill="url(#pattern4)" width="49.2095" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="411.0614" y="606.9921" fill="none" width="49.2095" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="411.0614" width="49.2095" stroke-width="0.0378" height="44.485" y="606.9921"
/><rect x="248.0504" y="661.304" fill="url(#pattern5)" width="45.6945" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="248.0504" y="661.304" fill="none" width="45.6945" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="248.0504" width="45.6945" stroke-width="0.0378" height="44.485" y="661.304"
/><rect x="929.6126" y="232.6299" fill="yellow" width="45.6945" height="45.6567" stroke="none" stroke-width="0.0378"
- /><rect x="929.6126" y="232.6299" fill="none" width="45.6945" height="45.6567" stroke-width="0.0378"
- /><line fill="none" x1="228.4724" x2="327.0425" y1="439.937" y2="439.937" stroke-width="4.5354"
- /><line fill="none" x1="227.1118" x2="325.6819" y1="402.2929" y2="402.2929" stroke-width="0.0378"
- /><line fill="none" x1="227.1118" x2="325.6819" y1="420.4346" y2="420.4346" stroke-width="2.2677"
- /><line fill="none" x1="228.4724" x2="327.0425" y1="458.0787" y2="458.0787" stroke-width="6.8031"
- /><line fill="none" x1="228.4724" x2="327.0425" y1="477.5811" y2="477.5811" stroke-width="9.0709"
- /><rect x="133.4929" y="606.9921" fill="none" width="44.485" height="44.485" stroke-width="0.0378"
- /><rect x="75.5906" y="606.9921" width="45.6945" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="75.5906" y="606.9921" fill="none" width="45.6945" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="929.6126" width="45.6945" stroke-width="0.0378" height="45.6567" y="232.6299"
+ /><line y2="439.937" fill="none" stroke-width="4.5354" x1="228.4724" x2="327.0425" y1="439.937"
+ /><line y2="402.2929" fill="none" stroke-width="0.0378" x1="227.1118" x2="325.6819" y1="402.2929"
+ /><line y2="420.4346" fill="none" stroke-width="2.2677" x1="227.1118" x2="325.6819" y1="420.4346"
+ /><line y2="458.0787" fill="none" stroke-width="6.8031" x1="228.4724" x2="327.0425" y1="458.0787"
+ /><line y2="477.5811" fill="none" stroke-width="9.0709" x1="228.4724" x2="327.0425" y1="477.5811"
+ /><rect fill="none" x="133.4929" width="44.485" stroke-width="0.0378" height="44.485" y="606.9921"
+ /><rect x="75.5906" width="45.6945" stroke-width="0.0378" height="44.485" y="606.9921" stroke="none"
+ /><rect fill="none" x="75.5906" width="45.6945" stroke-width="0.0378" height="44.485" y="606.9921"
/><rect x="191.3575" y="606.9921" fill="url(#pattern6)" width="44.485" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="191.3575" y="606.9921" fill="none" width="44.485" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="191.3575" width="44.485" stroke-width="0.0378" height="44.485" y="606.9921"
/><rect x="248.0504" y="606.9921" fill="url(#pattern7)" width="45.6945" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="248.0504" y="606.9921" fill="none" width="45.6945" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="248.0504" width="45.6945" stroke-width="0.0378" height="44.485" y="606.9921"
/><rect x="639.0425" y="232.6299" fill="white" width="44.485" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="639.0425" y="232.6299" fill="none" width="44.485" height="44.485" stroke-width="0.0378"
- /><rect x="581.1401" y="232.6299" width="45.6945" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="581.1401" y="232.6299" fill="none" width="45.6945" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="639.0425" width="44.485" stroke-width="0.0378" height="44.485" y="232.6299"
+ /><rect x="581.1401" width="45.6945" stroke-width="0.0378" height="44.485" y="232.6299" stroke="none"
+ /><rect fill="none" x="581.1401" width="45.6945" stroke-width="0.0378" height="44.485" y="232.6299"
/><rect x="696.9071" y="232.6299" fill="gray" width="44.5228" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="696.9071" y="232.6299" fill="none" width="44.5228" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="696.9071" width="44.5228" stroke-width="0.0378" height="44.485" y="232.6299"
/><rect x="753.6" y="232.6299" fill="red" width="45.6945" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="753.6" y="232.6299" fill="none" width="45.6945" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="753.6" width="45.6945" stroke-width="0.0378" height="44.485" y="232.6299"
/><rect x="75.5906" y="661.304" fill="url(#pattern8)" width="45.6945" height="44.485" stroke="none" stroke-width="0.0378"
- /><rect x="75.5906" y="661.304" fill="none" width="45.6945" height="44.485" stroke-width="0.0378"
+ /><rect fill="none" x="75.5906" width="45.6945" stroke-width="0.0378" height="44.485" y="661.304"
/><path fill="none" d="M123.4772 279.1559 L149.3291 250.5827 L166.2614 263.5843 L188.3339 232.4409"
/><path fill="none" d="M96.4157 254.1354 L96.5669 254.1354"
/><path fill="none" d="M352.8945 234.9354 L352.8945 257.1591 L374.6646 276.2079 L408.5291 276.2079 L404.7496 228.1323 L383.1307 248.3905 Z"
- /><rect x="47.2441" y="376.7055" fill="none" width="454.3748" height="153.1465" stroke-width="1.5118"
+ /><rect fill="none" x="47.2441" width="454.3748" stroke-width="1.5118" height="153.1465" y="376.7055"
/></g
><g font-size="26" stroke-linecap="butt" transform="translate(74.1165,386.5701)" fill="white" stroke-linejoin="round" stroke="white" font-weight="bold" stroke-width="1.5118"
- ><rect width="70" x="1" height="20" y="-19" stroke="none"
+ ><rect x="1" width="70" height="20" y="-19" stroke="none"
/></g
><g font-size="26" stroke-width="1.5118" font-weight="bold" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="74.1165" y="386.5701" stroke="none"
+ ><text x="74.1165" xml:space="preserve" y="386.5701" stroke="none"
>Lines</text
- ><rect fill="none" width="451.9937" x="549.2787" height="156.6614" y="376.7055"
+ ><rect fill="none" x="549.2787" width="451.9937" height="156.6614" y="376.7055"
/><rect x="1" y="-19" transform="translate(574.8284,387.9307)" fill="white" width="73" height="20" stroke="none"
/></g
><g font-size="26" stroke-width="1.5118" font-weight="bold" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="574.8284" y="387.9307" stroke="none"
+ ><text x="574.8284" xml:space="preserve" y="387.9307" stroke="none"
>Fonts</text
><rect x="1" y="-19" transform="translate(820.0441,434.3433)" fill="white" width="59" height="20" stroke="none"
/></g
><g font-size="26" stroke-width="1.5118" font-weight="bold" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="820.0441" y="434.3433" stroke="none"
+ ><text x="820.0441" xml:space="preserve" y="434.3433" stroke="none"
>Bold</text
></g
><g font-size="26" stroke-linecap="butt" transform="translate(822.6142,499.3512)" fill="white" font-family="'Courier New'" stroke-linejoin="round" stroke="white" stroke-width="1.5118"
- ><rect width="138" x="1" height="18" y="-17" stroke="none"
+ ><rect x="1" width="138" height="18" y="-17" stroke="none"
/></g
><g font-size="26" stroke-width="1.5118" font-family="'Courier New'" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="822.6142" y="499.3512" text-decoration="underline" stroke="none"
+ ><text x="822.6142" xml:space="preserve" y="499.3512" text-decoration="underline" stroke="none"
>Underline</text
></g
><g font-size="26" stroke-linecap="butt" transform="translate(821.2535,465.4866)" fill="white" font-family="'Times New Roman'" stroke-linejoin="round" font-style="italic" stroke="white" stroke-width="1.5118"
- ><rect width="58" x="-1" height="20" y="-19" stroke="none"
+ ><rect x="-1" width="58" height="20" y="-19" stroke="none"
/></g
- ><g font-size="26" stroke-linecap="butt" font-family="'Times New Roman'" stroke-linejoin="round" font-style="italic" stroke-width="1.5118"
- ><text xml:space="preserve" x="821.2535" y="465.4866" stroke="none"
+ ><g font-style="italic" font-size="26" stroke-width="1.5118" font-family="'Times New Roman'" stroke-linecap="butt" stroke-linejoin="round"
+ ><text x="821.2535" xml:space="preserve" y="465.4866" stroke="none"
>Italic</text
></g
><g font-size="26" stroke-linecap="butt" transform="translate(574.6772,433.1339)" fill="white" stroke-linejoin="round" stroke="white" stroke-width="1.5118"
- ><rect width="52" x="-1" height="20" y="-19" stroke="none"
+ ><rect x="-1" width="52" height="20" y="-19" stroke="none"
/></g
- ><g font-size="26" stroke-width="1.5118" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="574.6772" y="433.1339" stroke="none"
+ ><g font-size="26" stroke-width="1.5118" stroke-linejoin="round" stroke-linecap="butt"
+ ><text x="574.6772" xml:space="preserve" y="433.1339" stroke="none"
>Arial</text
><rect x="0" y="-19" transform="translate(573.3165,465.4866)" fill="white" width="203" height="20" stroke="none"
/></g
><g font-size="26" stroke-width="1.5118" font-family="'Times New Roman'" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="573.3165" y="465.4866" stroke="none"
+ ><text x="573.3165" xml:space="preserve" y="465.4866" stroke="none"
>Times New Roman</text
><rect x="1" y="-17" transform="translate(574.6772,499.3512)" fill="white" width="170" height="18" stroke="none"
/></g
><g font-size="26" stroke-width="1.5118" font-family="'Courier New'" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="574.6772" y="499.3512" stroke="none"
+ ><text x="574.6772" xml:space="preserve" y="499.3512" stroke="none"
>Courier New</text
><rect x="579.9685" y="628.2331" fill="url(#pattern9)" width="45.6945" height="45.6567" stroke="none" stroke-width="0.0378"
- /><rect x="579.9685" y="628.2331" fill="none" width="45.6945" height="45.6567" stroke-width="0.0378"
+ /><rect fill="none" x="579.9685" width="45.6945" stroke-width="0.0378" height="45.6567" y="628.2331"
/><rect x="675.6661" y="618.7842" fill="yellow" width="64.5543" height="45.6567" stroke="none" stroke-width="0.0378"
- /><rect x="675.6661" y="618.7842" fill="none" width="64.5543" height="45.6567" stroke-width="0.0378"
+ /><rect fill="none" x="675.6661" width="64.5543" stroke-width="0.0378" height="45.6567" y="618.7842"
/><rect x="656.7685" y="634.1292" fill="url(#pattern10)" width="48.0378" height="45.6945" stroke="none" stroke-width="0.0378"
- /><rect x="656.7685" y="634.1292" fill="none" width="48.0378" height="45.6945" stroke-width="0.0378"
+ /><rect fill="none" x="656.7685" width="48.0378" stroke-width="0.0378" height="45.6945" y="634.1292"
/><rect x="714.6331" y="634.1292" fill="url(#pattern10)" width="44.485" height="45.6945" stroke="none" stroke-width="0.0378"
- /><rect x="714.6331" y="634.1292" fill="none" width="44.485" height="45.6945" stroke-width="0.0378"
+ /><rect fill="none" x="714.6331" width="44.485" stroke-width="0.0378" height="45.6945" y="634.1292"
/><text font-size="15" x="933.7166" y="721.9653" font-family="'Times New Roman'" stroke="none" stroke-width="0.0378" xml:space="preserve"
>Text</text
><text font-size="15" x="921.7976" y="705.1843" font-family="'Times New Roman'" stroke="none" stroke-width="0.0378" xml:space="preserve"
@@ -239,10 +239,10 @@
>Basic Fill Patterns</text
></g
><g font-size="15" stroke-linecap="butt" fill="url(#pattern11)" font-family="'Times New Roman'" stroke-linejoin="round" stroke="url(#pattern11)" stroke-width="0.0378"
- ><rect width="44.485" x="354.3685" height="44.485" y="661.304" stroke="none"
- /><rect x="354.3685" y="661.304" fill="none" width="44.485" height="44.485" stroke="black"
- /><rect x="411.0614" y="661.304" fill="url(#pattern12)" width="49.2095" height="44.485" stroke="none"
- /><rect x="411.0614" y="661.304" fill="none" width="49.2095" height="44.485" stroke="black"
+ ><rect x="354.3685" width="44.485" height="44.485" y="661.304" stroke="none"
+ /><rect fill="none" x="354.3685" width="44.485" height="44.485" y="661.304" stroke="black"
+ /><rect fill="url(#pattern12)" x="411.0614" width="49.2095" height="44.485" y="661.304" stroke="none"
+ /><rect fill="none" x="411.0614" width="49.2095" height="44.485" y="661.304" stroke="black"
/></g
></g
></svg
Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/textGreek.svg
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/textGreek.svg?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/textGreek.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/textGreek.svg Sat Dec 9 07:10:34 2006
@@ -4,11 +4,11 @@
<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="'Arial'" width="960" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" viewBox="0 0 960 720" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="720" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1"
><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
/><g
- ><g fill="white" stroke-width="0.0756" stroke="white" stroke-linecap="butt" stroke-linejoin="round"
- ><rect width="960" x="0" height="720" y="0" stroke="none"
+ ><g fill="white" stroke-width="0.0756" stroke="white" stroke-linejoin="round" stroke-linecap="butt"
+ ><rect x="0" width="960" height="720" y="0" stroke="none"
/></g
><g font-size="32" stroke-width="0.1667" font-family="'Courier New'" stroke-linecap="butt" stroke-linejoin="round"
- ><text xml:space="preserve" x="224" y="248" stroke="none"
+ ><text x="224" xml:space="preserve" y="248" stroke="none"
>α</text
></g
></g
Modified: xmlgraphics/batik/trunk/test-references/samples/GVT.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/GVT.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/asf-logo.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/asf-logo.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/batik3D.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/batik3D.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/batikFX.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/batikFX.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/batikYin.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/batikYin.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/chessboard.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/chessboard.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/extensions/colorSwitch.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/extensions/colorSwitch.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/gradients.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/gradients.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/moonPhases.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/moonPhases.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/sizeOfSun.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/sizeOfSun.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/sunRise.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/sunRise.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/filters/feDisplacementMap.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/filters/feDisplacementMap.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/filters/feTile.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/filters/feTile.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/filters/feTileTarget.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/filters/feTileTarget.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/fonts/fontArabic.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/fonts/fontArabic.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/linking/anchor.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/linking/anchor.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/linking/pointerEvents2.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/linking/pointerEvents2.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/masking/clipTransform.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/masking/clipTransform.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/painting/bboxOnText.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/painting/bboxOnText.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/painting/markersShapes.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/painting/markersShapes.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/externalPaints.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/externalPaints.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/gradientLimit.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/gradientLimit.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/linearGradientLine.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/linearGradientLine.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/linearGradientOrientation.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/linearGradientOrientation.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/linearGradientRepeat.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/linearGradientRepeat.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradient.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradient.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradient2.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradient2.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradient3.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradient3.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradientLine.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradientLine.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradientOrientation.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/paints/radialGradientOrientation.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/rendering/paintOpacity.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/rendering/paintOpacity.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/display.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/display.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/image.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/image.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/imageRefUpdate.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/imageRefUpdate.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/imagesvg.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/imagesvg.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/paintType.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/paintType.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/relativeURI.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/relativeURI.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/setProperty.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/setProperty.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/transform.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/transform.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/visibility.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/visibility.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/visibilityOnClick.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/visibilityOnClick.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/zeroSize.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/scripting/zeroSize.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/externalUseCascading.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/externalUseCascading.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/image.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/image.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/useStylesheet.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/useStylesheet.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/useStyling.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/useStyling.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/useStylingURI.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/useStylingURI.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/xmlBaseStyling.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/structure/xmlBaseStyling.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/text/textEffect.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/text/textEffect.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/text/textEffect2.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/text/textEffect2.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec/text/textEffect3.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec/text/textEffect3.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec12/text/flowBidi.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec12/text/flowBidi.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/tests/spec12/text/flowText5.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/tests/spec12/text/flowText5.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/textRotate.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/textRotate.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/samples/textRotateShadows.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/samples/textRotateShadows.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/color-property-BE-02.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/color-property-BE-02.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/coords-unitsProc-BE-05.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/coords-unitsProc-BE-05.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/filters-blend-BE-02.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/filters-blend-BE-02.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/filters-colorMtrx-BE-03.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/filters-colorMtrx-BE-03.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/filters-transfer-BE-04.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/filters-transfer-BE-04.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-linearGr-BE-01.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-linearGr-BE-01.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-linearGr-BE-02.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-linearGr-BE-02.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-radialGr-BE-04.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-radialGr-BE-04.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-radialGr-BE-05.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-radialGr-BE-05.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-referenc-BE-08.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-referenc-BE-08.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-stop-BE-06.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-stop-BE-06.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-stop-BE-10.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-stop-BE-10.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-transfrm-BE-09.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/gradPatt-transfrm-BE-09.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-references/svgbe/masking-mask-BE-05.png
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/svgbe/masking-mask-BE-05.png?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/batik/trunk/test-resources/org/apache/batik/swing/unitTesting.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-resources/org/apache/batik/swing/unitTesting.xml?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
--- xmlgraphics/batik/trunk/test-resources/org/apache/batik/swing/unitTesting.xml (original)
+++ xmlgraphics/batik/trunk/test-resources/org/apache/batik/swing/unitTesting.xml Sat Dec 9 07:10:34 2006
@@ -28,11 +28,11 @@
<test id="samples/tests/spec/scripting/primaryDoc.svg"/>
</testGroup>
- <!--test id="NullURITest"
+ <test id="NullURITest"
class="org.apache.batik.swing.NullURITest" />
<test id="NullSetSVGDocumentTest"
- class="org.apache.batik.swing.NullSetSVGDocumentTest" /-->
+ class="org.apache.batik.swing.NullSetSVGDocumentTest" />
<test id="SetSVGDocumentTest"
class="org.apache.batik.swing.SetSVGDocumentTest" />
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGCanvasHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGCanvasHandler.java?view=diff&rev=484993&r1=484992&r2=484993
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGCanvasHandler.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/JSVGCanvasHandler.java Sat Dec 9 07:10:34 2006
@@ -44,6 +44,9 @@
import org.apache.batik.swing.JSVGCanvas;
import org.apache.batik.swing.svg.SVGDocumentLoaderAdapter;
import org.apache.batik.swing.svg.SVGDocumentLoaderEvent;
+import org.apache.batik.swing.svg.SVGLoadEventDispatcherAdapter;
+import org.apache.batik.swing.svg.SVGLoadEventDispatcherEvent;
+import org.apache.batik.swing.svg.SVGLoadEventDispatcher;
/**
* One line Class Desc
@@ -108,6 +111,7 @@
WindowListener wl = null;
InitialRenderListener irl = null;
LoadListener ll = null;
+ SVGLoadEventListener sll = null;
UpdateRenderListener url = null;
boolean failed;
@@ -152,29 +156,10 @@
checkRender();
if ( abort) return;
- try {
- EventQueue.invokeAndWait(new Runnable() {
- public void run() {
- updateManager = canvas.getUpdateManager();
- if (updateManager == null)
- return;
- url = new UpdateRenderListener();
- updateManager.addUpdateManagerListener(url);
- }});
- } catch (Throwable t) { t.printStackTrace(); }
-
- if ( abort) return;
-
+ System.err.println("UM: " + updateManager);
if (updateManager == null)
return;
- // Wait for Update Manager to Start.
- while (!updateManager.isRunning());
-
- bindHost();
-
- if ( abort) return;
-
while (!done) {
checkUpdate();
if ( abort) return;
@@ -216,6 +201,9 @@
canvas.addGVTTreeRendererListener(irl);
ll = new LoadListener();
canvas.addSVGDocumentLoaderListener(ll);
+ sll = new SVGLoadEventListener();
+ canvas.addSVGLoadEventDispatcherListener(sll);
+
}});
} catch (Throwable t) {
t.printStackTrace();
@@ -226,6 +214,8 @@
public void scriptDone() {
Runnable r = new Runnable() {
public void run() {
+ if (updateManager != null)
+ updateManager.forceRepaint();
synchronized(renderMonitor) {
done = true;
failed = false;
@@ -329,7 +319,10 @@
renderMonitor.notifyAll();
}
}
- public void managerStarted(UpdateManagerEvent e) { }
+ public void managerStarted(UpdateManagerEvent e) {
+ System.err.println("Binding Host: " + updateManager);
+ bindHost();
+ }
public void managerSuspended(UpdateManagerEvent e) { }
public void managerResumed(UpdateManagerEvent e) { }
public void managerStopped(UpdateManagerEvent e) { }
@@ -378,4 +371,15 @@
}
}
}
+
+ class SVGLoadEventListener extends SVGLoadEventDispatcherAdapter {
+ public void svgLoadEventDispatchStarted(SVGLoadEventDispatcherEvent e){
+ SVGLoadEventDispatcher dispatcher;
+ dispatcher = (SVGLoadEventDispatcher)e.getSource();
+ updateManager = dispatcher.getUpdateManager();
+ url = new UpdateRenderListener();
+ updateManager.addUpdateManagerListener(url);
+ }
+ }
+
}