xmlgraphics-batik-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dewe...@apache.org
Subject cvs commit: xml-batik/test-resources/org/apache/batik/bridge JarCheckPermissionsDenied.jar
Date Tue, 03 Aug 2004 00:14:18 GMT
deweese     2004/08/02 17:14:17

  Modified:    sources/org/apache/batik/bridge SVGPatternElementBridge.java
               sources/org/apache/batik/dom/svg SVGOMAElement.java
                        SVGOMAltGlyphElement.java
                        SVGOMColorProfileElement.java
                        SVGOMCursorElement.java SVGOMFEImageElement.java
                        SVGOMFilterElement.java SVGOMGlyphRefElement.java
                        SVGOMGradientElement.java SVGOMImageElement.java
                        SVGOMMPathElement.java SVGOMPatternElement.java
                        SVGOMScriptElement.java SVGOMTextPathElement.java
                        SVGOMUseElement.java
               test-references/org/apache/batik/svggen ContextBug4389.svg
                        ContextClip.svg ContextDrawImage.svg
                        ContextGradient.svg ContextGraphicObjects.svg
                        ContextLookup.svg ContextPaints.svg
                        ContextRHints.svg ContextRescale.svg
                        ContextTexture.svg
               test-resources/org/apache/batik/bridge
                        JarCheckPermissionsDenied.jar
  Log:
  1) The pattern element now shares one rendering tree across all
     references.
  2) Fixed bug 23035 - Xlink attributes initialized with wrong values.
     Thanks Tonny
  PR: 28035
  Obtained from: Tonny Kohar
  
  Revision  Changes    Path
  1.26      +78 -16    xml-batik/sources/org/apache/batik/bridge/SVGPatternElementBridge.java
  
  Index: SVGPatternElementBridge.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGPatternElementBridge.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- SVGPatternElementBridge.java	5 Dec 2003 18:32:37 -0000	1.25
  +++ SVGPatternElementBridge.java	3 Aug 2004 00:14:16 -0000	1.26
  @@ -50,7 +50,9 @@
   
   package org.apache.batik.bridge;
   
  +import java.awt.Graphics2D;
   import java.awt.Paint;
  +import java.awt.Shape;
   import java.awt.geom.AffineTransform;
   import java.awt.geom.Rectangle2D;
   import java.util.Iterator;
  @@ -62,7 +64,8 @@
   import org.apache.batik.ext.awt.image.ConcreteComponentTransferFunction;
   import org.apache.batik.ext.awt.image.renderable.ComponentTransferRable8Bit;
   import org.apache.batik.ext.awt.image.renderable.Filter;
  -import org.apache.batik.gvt.CompositeGraphicsNode;
  +import org.apache.batik.gvt.AbstractGraphicsNode;
  +import org.apache.batik.gvt.RootGraphicsNode;
   import org.apache.batik.gvt.GraphicsNode;
   import org.apache.batik.gvt.PatternPaint;
   import org.apache.batik.util.ParsedURL;
  @@ -107,13 +110,20 @@
   
   
           // extract pattern content
  -        CompositeGraphicsNode patternContentNode
  -            = extractPatternContent(patternElement, ctx);
  +        RootGraphicsNode patternContentNode;
  +        patternContentNode = (RootGraphicsNode)
  +            ctx.getElementData(patternElement);
  +
  +        if (patternContentNode == null) {
  +            patternContentNode = extractPatternContent(patternElement, ctx);
  +            ctx.setElementData(patternElement, patternContentNode);
  +        }
           if (patternContentNode == null) {
               return null; // no content means no paint
           }
   
  -        // get pattern region using 'patternUnits'. Pattern region is in tile pace.
  +        // get pattern region using 'patternUnits'. Pattern region is
  +        // in tile pace.
           Rectangle2D patternRegion = SVGUtilities.convertPatternRegion
               (patternElement, paintedElement, paintedNode, ctx);
   
  @@ -222,11 +232,15 @@
           //
           // Apply transform
           //
  -        patternContentNode.setTransform(patternContentTransform);
  -
  +        // RootGraphicsNode gn = new RootGraphicsNode();
  +        // gn.getChildren().add(patternContentNode);
  +        GraphicsNode gn = new PatternGraphicsNode(patternContentNode);
  +        
  +        gn.setTransform(patternContentTransform);
  +        
           // take the opacity into account. opacity is implemented by a Filter
           if (opacity != 1) {
  -            Filter filter = patternContentNode.getGraphicsNodeRable(true);
  +            Filter filter = gn.getGraphicsNodeRable(true);
               filter = new ComponentTransferRable8Bit
                   (filter,
                    ConcreteComponentTransferFunction.getLinearTransfer
  @@ -234,10 +248,12 @@
                    ConcreteComponentTransferFunction.getIdentityTransfer(), //Red
                    ConcreteComponentTransferFunction.getIdentityTransfer(), //Grn
                    ConcreteComponentTransferFunction.getIdentityTransfer());//Blu
  -            patternContentNode.setFilter(filter);
  +            gn.setFilter(filter);
           }
   
  -        return new PatternPaint(patternContentNode,
  +        
  +
  +        return new PatternPaint(gn,
                                   patternRegion,
                                   !overflowIsHidden,
                                   patternTransform);
  @@ -254,12 +270,12 @@
        * @param ctx the bridge context to use
        */
       protected static
  -        CompositeGraphicsNode extractPatternContent(Element patternElement,
  +        RootGraphicsNode extractPatternContent(Element patternElement,
                                                       BridgeContext ctx) {
   
           List refs = new LinkedList();
           for (;;) {
  -            CompositeGraphicsNode content
  +            RootGraphicsNode content
                   = extractLocalPatternContent(patternElement, ctx);
               if (content != null) {
                   return content; // pattern content found, exit
  @@ -294,11 +310,11 @@
        * @param ctx the bridge context
        */
       protected static
  -        CompositeGraphicsNode extractLocalPatternContent(Element e,
  +        RootGraphicsNode extractLocalPatternContent(Element e,
                                                            BridgeContext ctx) {
   
           GVTBuilder builder = ctx.getGVTBuilder();
  -        CompositeGraphicsNode content = null;
  +        RootGraphicsNode content = null;
           for (Node n = e.getFirstChild(); n != null; n = n.getNextSibling()) {
               // check if the Node is valid
               if (n.getNodeType() != Node.ELEMENT_NODE) {
  @@ -308,9 +324,9 @@
               GraphicsNode gn = builder.build(ctx, (Element)n);
               // check if a GraphicsNode has been created
               if (gn != null) {
  -                // lazy instantation of the list of stop elements
  +                // lazy instantation of the grouping element.
                   if (content == null) {
  -                    content = new CompositeGraphicsNode();
  +                    content = new RootGraphicsNode();
                   }
                   content.getChildren().add(gn);
               }
  @@ -332,5 +348,51 @@
           }
           return false;
       }
  +
  +    public static class PatternGraphicsNode extends AbstractGraphicsNode {
  +        GraphicsNode pcn;
  +        Rectangle2D pBounds;
  +        Rectangle2D gBounds;
  +        Rectangle2D sBounds;
  +        Shape       oShape;
  +        public PatternGraphicsNode(GraphicsNode gn) {
  +            this.pcn = gn;
  +        }
  +        public void primitivePaint(Graphics2D g2d) {
  +            pcn.paint(g2d);
  +        }
  +        public Rectangle2D getPrimitiveBounds() {
  +            if (pBounds != null) return pBounds;
  +            pBounds = pcn.getTransformedBounds(IDENTITY);
  +            return pBounds;
  +        }
  +        public Rectangle2D getGeometryBounds() {
  +            if (gBounds != null) return gBounds;
  +            gBounds = pcn.getTransformedGeometryBounds(IDENTITY);
  +            return gBounds;
  +        }
  +        public Rectangle2D getSensitiveBounds() {
  +            if (sBounds != null) return sBounds;
  +            sBounds = pcn.getTransformedSensitiveBounds(IDENTITY);
  +            return sBounds;
  +        }
  +        public Shape getOutline() {
  +            if (oShape != null) return oShape;
  +            oShape = pcn.getOutline();
  +            AffineTransform tr = pcn.getTransform();
  +            if (tr != null)
  +                oShape = tr.createTransformedShape(oShape);
  +            return oShape;
  +        }
  +        protected void invalidateGeometryCache() {
  +            pBounds = null;
  +            gBounds = null;
  +            sBounds = null;
  +            oShape  = null;
  +            super.invalidateGeometryCache();
  +        }
  +
  +    }
  +
   }
   
  
  
  
  1.8       +5 -12     xml-batik/sources/org/apache/batik/dom/svg/SVGOMAElement.java
  
  Index: SVGOMAElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMAElement.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SVGOMAElement.java	8 Aug 2003 11:38:59 -0000	1.7
  +++ SVGOMAElement.java	3 Aug 2004 00:14:16 -0000	1.8
  @@ -74,21 +74,14 @@
       static {
           attributeInitializer = new AttributeInitializer(4);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "replace");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onRequest");
       }
   
       /**
  
  
  
  1.5       +5 -12     xml-batik/sources/org/apache/batik/dom/svg/SVGOMAltGlyphElement.java
  
  Index: SVGOMAltGlyphElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMAltGlyphElement.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SVGOMAltGlyphElement.java	8 Aug 2003 11:38:59 -0000	1.4
  +++ SVGOMAltGlyphElement.java	3 Aug 2004 00:14:16 -0000	1.5
  @@ -74,21 +74,14 @@
       static {
           attributeInitializer = new AttributeInitializer(4);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "other");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.6       +6 -14     xml-batik/sources/org/apache/batik/dom/svg/SVGOMColorProfileElement.java
  
  Index: SVGOMColorProfileElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMColorProfileElement.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SVGOMColorProfileElement.java	8 Aug 2003 11:38:59 -0000	1.5
  +++ SVGOMColorProfileElement.java	3 Aug 2004 00:14:16 -0000	1.6
  @@ -74,26 +74,18 @@
       protected final static AttributeInitializer attributeInitializer;
       static {
           attributeInitializer = new AttributeInitializer(5);
  -        attributeInitializer.addAttribute(null,
  -                                          null,
  +        attributeInitializer.addAttribute(null, null,
                                             SVG_RENDERING_INTENT_ATTRIBUTE,
                                             SVG_AUTO_VALUE);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "other");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.6       +5 -12     xml-batik/sources/org/apache/batik/dom/svg/SVGOMCursorElement.java
  
  Index: SVGOMCursorElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMCursorElement.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SVGOMCursorElement.java	8 Aug 2003 11:38:59 -0000	1.5
  +++ SVGOMCursorElement.java	3 Aug 2004 00:14:16 -0000	1.6
  @@ -76,21 +76,14 @@
       static {
           attributeInitializer = new AttributeInitializer(4);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "other");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.10      +5 -12     xml-batik/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java
  
  Index: SVGOMFEImageElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SVGOMFEImageElement.java	8 Aug 2003 11:39:00 -0000	1.9
  +++ SVGOMFEImageElement.java	3 Aug 2004 00:14:16 -0000	1.10
  @@ -75,21 +75,14 @@
       static {
           attributeInitializer = new AttributeInitializer(4);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "embed");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.15      +5 -12     xml-batik/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java
  
  Index: SVGOMFilterElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SVGOMFilterElement.java	8 Aug 2003 11:39:00 -0000	1.14
  +++ SVGOMFilterElement.java	3 Aug 2004 00:14:16 -0000	1.15
  @@ -78,21 +78,14 @@
       static {
           attributeInitializer = new AttributeInitializer(4);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "other");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.6       +5 -12     xml-batik/sources/org/apache/batik/dom/svg/SVGOMGlyphRefElement.java
  
  Index: SVGOMGlyphRefElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMGlyphRefElement.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SVGOMGlyphRefElement.java	8 Aug 2003 11:39:00 -0000	1.5
  +++ SVGOMGlyphRefElement.java	3 Aug 2004 00:14:16 -0000	1.6
  @@ -75,21 +75,14 @@
       static {
           attributeInitializer = new AttributeInitializer(4);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "other");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.8       +5 -12     xml-batik/sources/org/apache/batik/dom/svg/SVGOMGradientElement.java
  
  Index: SVGOMGradientElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMGradientElement.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SVGOMGradientElement.java	8 Aug 2003 11:39:00 -0000	1.7
  +++ SVGOMGradientElement.java	3 Aug 2004 00:14:16 -0000	1.8
  @@ -77,21 +77,14 @@
       static {
           attributeInitializer = new AttributeInitializer(4);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "other");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.10      +6 -14     xml-batik/sources/org/apache/batik/dom/svg/SVGOMImageElement.java
  
  Index: SVGOMImageElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMImageElement.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SVGOMImageElement.java	8 Aug 2003 11:39:00 -0000	1.9
  +++ SVGOMImageElement.java	3 Aug 2004 00:14:16 -0000	1.10
  @@ -74,26 +74,18 @@
       protected final static AttributeInitializer attributeInitializer;
       static {
           attributeInitializer = new AttributeInitializer(5);
  -        attributeInitializer.addAttribute(null,
  -                                          null,
  +        attributeInitializer.addAttribute(null, null,
                                             SVG_PRESERVE_ASPECT_RATIO_ATTRIBUTE,
                                             "xMidYMid meet");
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "embed");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.5       +5 -12     xml-batik/sources/org/apache/batik/dom/svg/SVGOMMPathElement.java
  
  Index: SVGOMMPathElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMMPathElement.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SVGOMMPathElement.java	8 Aug 2003 11:39:00 -0000	1.4
  +++ SVGOMMPathElement.java	3 Aug 2004 00:14:16 -0000	1.5
  @@ -74,21 +74,14 @@
       static {
           attributeInitializer = new AttributeInitializer(4);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "other");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.13      +6 -14     xml-batik/sources/org/apache/batik/dom/svg/SVGOMPatternElement.java
  
  Index: SVGOMPatternElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMPatternElement.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- SVGOMPatternElement.java	8 Aug 2003 11:39:00 -0000	1.12
  +++ SVGOMPatternElement.java	3 Aug 2004 00:14:16 -0000	1.13
  @@ -80,26 +80,18 @@
       protected final static AttributeInitializer attributeInitializer;
       static {
           attributeInitializer = new AttributeInitializer(5);
  -        attributeInitializer.addAttribute(null,
  -                                          null,
  +        attributeInitializer.addAttribute(null, null,
                                             SVG_PRESERVE_ASPECT_RATIO_ATTRIBUTE,
                                             "xMidYMid meet");
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "other");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.7       +5 -12     xml-batik/sources/org/apache/batik/dom/svg/SVGOMScriptElement.java
  
  Index: SVGOMScriptElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMScriptElement.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SVGOMScriptElement.java	8 Aug 2003 11:39:00 -0000	1.6
  +++ SVGOMScriptElement.java	3 Aug 2004 00:14:16 -0000	1.7
  @@ -75,21 +75,14 @@
       static {
           attributeInitializer = new AttributeInitializer(1);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "other");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.7       +5 -12     xml-batik/sources/org/apache/batik/dom/svg/SVGOMTextPathElement.java
  
  Index: SVGOMTextPathElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMTextPathElement.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SVGOMTextPathElement.java	8 Aug 2003 11:39:00 -0000	1.6
  +++ SVGOMTextPathElement.java	3 Aug 2004 00:14:16 -0000	1.7
  @@ -76,21 +76,14 @@
       static {
           attributeInitializer = new AttributeInitializer(4);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "other");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.9       +5 -12     xml-batik/sources/org/apache/batik/dom/svg/SVGOMUseElement.java
  
  Index: SVGOMUseElement.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMUseElement.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SVGOMUseElement.java	8 Aug 2003 11:39:00 -0000	1.8
  +++ SVGOMUseElement.java	3 Aug 2004 00:14:16 -0000	1.9
  @@ -78,21 +78,14 @@
       static {
           attributeInitializer = new AttributeInitializer(4);
           attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
  -                                          null,
  -                                          "xmlns:xlink",
  +                                          null, "xmlns:xlink",
                                             XLinkSupport.XLINK_NAMESPACE_URI);
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "type",
  -                                          "simple");
  +                                          "xlink", "type", "simple");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "show",
  -                                          "replace");
  +                                          "xlink", "show", "embed");
           attributeInitializer.addAttribute(XLinkSupport.XLINK_NAMESPACE_URI,
  -                                          "xlink",
  -                                          "actuate",
  -                                          "onRequest");
  +                                          "xlink", "actuate", "onLoad");
       }
   
       /**
  
  
  
  1.5       +5 -5      xml-batik/test-references/org/apache/batik/svggen/ContextBug4389.svg
  
  Index: ContextBug4389.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-references/org/apache/batik/svggen/ContextBug4389.svg,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContextBug4389.svg	22 Aug 2002 12:32:30 -0000	1.4
  +++ ContextBug4389.svg	3 Aug 2004 00:14:17 -0000	1.5
  @@ -6,9 +6,9 @@
     <defs id="genericDefs" />
     <g>
       <style type="text/css" xml:space="preserve">
  -      <![CDATA[.testC1 {}
  -.testC2 {}
  -.testC3 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
  +      <![CDATA[.testC1 {}
  +.testC2 {}
  +.testC3 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
   ]]>
       </style>
       <g>
  @@ -190,10 +190,10 @@
   I0NWlP50hV7LfYycr+M7gTujScPuFZ+wjrzMrNR8DdMDDH/p7vp2YN9BdwQMd5Wx
   iQBfbSAwQjZ0OjCKN6SiSG/SUh9N9BwiHBJJM0lzsjtAUthFtsMjFogUz16uHVGm
   3YFupUdXt1Y7vnOEGb59gIR/9+41Pf/iVM9ezHXNrguimj/++7c1newQjmudPBhr
  -0ENZp2arI3rHZFLl7ifblZIUJP3/xKLSFlvxD0QAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onRequest" height="63" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +0ENZp2arI3rHZFLl7ifblZIUJP3/xKLSFlvxD0QAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="63" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
         </defs>
         <g class="testC1" transform="translate(40,40)">
  -        <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC2" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC2" xlink:actuate="onLoad" xlink:show="embed" />
         </g>
       </g>
     </g>
  
  
  
  1.20      +28 -28    xml-batik/test-references/org/apache/batik/svggen/ContextClip.svg
  
  Index: ContextClip.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-references/org/apache/batik/svggen/ContextClip.svg,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ContextClip.svg	5 Jul 2003 14:18:29 -0000	1.19
  +++ ContextClip.svg	3 Aug 2004 00:14:17 -0000	1.20
  @@ -6,27 +6,27 @@
     <defs id="genericDefs" />
     <g>
       <style type="text/css" xml:space="preserve">
  -      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  -.testC2 {clip-path:url(#testclipPath1);}
  -.testC3 {stroke:none;}
  -.testC4 {stroke:none;}
  -.testC5 {clip-path:url(#testclipPath2);}
  -.testC6 {text-rendering:optimizeLegibility;}
  -.testC7 {stroke:none;}
  -.testC8 {stroke:none;}
  -.testC9 {clip-path:url(#testclipPath2);}
  -.testC10 {text-rendering:optimizeLegibility;}
  -.testC11 {stroke:none;}
  -.testC12 {clip-path:url(#testclipPath3);}
  -.testC13 {text-rendering:optimizeLegibility;}
  -.testC14 {stroke:none;}
  -.testC15 {stroke:none;}
  -.testC16 {clip-path:url(#testclipPath3);}
  -.testC17 {text-rendering:optimizeLegibility;}
  -.testC18 {stroke:none;}
  -.testC19 {stroke:none;}
  -.testC20 {clip-path:url(#testclipPath4);}
  -.testC21 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
  +      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  +.testC2 {clip-path:url(#testclipPath1);}
  +.testC3 {stroke:none;}
  +.testC4 {stroke:none;}
  +.testC5 {clip-path:url(#testclipPath2);}
  +.testC6 {text-rendering:optimizeLegibility;}
  +.testC7 {stroke:none;}
  +.testC8 {stroke:none;}
  +.testC9 {clip-path:url(#testclipPath2);}
  +.testC10 {text-rendering:optimizeLegibility;}
  +.testC11 {stroke:none;}
  +.testC12 {clip-path:url(#testclipPath3);}
  +.testC13 {text-rendering:optimizeLegibility;}
  +.testC14 {stroke:none;}
  +.testC15 {stroke:none;}
  +.testC16 {clip-path:url(#testclipPath3);}
  +.testC17 {text-rendering:optimizeLegibility;}
  +.testC18 {stroke:none;}
  +.testC19 {stroke:none;}
  +.testC20 {clip-path:url(#testclipPath4);}
  +.testC21 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
   ]]>
       </style>
       <g>
  @@ -76,32 +76,32 @@
           <image width="100" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAyCAYAAACqNX6+AAAAbklEQVR42u3asQ0A
   MAgEMYjYf+UkQ1C9fEyALDq67p+EOmKLOiUgAgJEQIAICBABASIgAgJEQIAICBAB
   ASIgAgJEQIBos0n5k0v5lHMhQAQEiIAAERAgAgJEQAQEiIAAERAgAgJEQAQEiIAA
  -0W4PbEgEZMeFA8QAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onRequest" height="50" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +0W4PbEgEZMeFA8QAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="50" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
         </defs>
         <g class="testC1">
  -        <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC2" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC2" xlink:actuate="onLoad" xlink:show="embed" />
           <text xml:space="preserve" x="110" y="25" class="testC3">Clip set to device bounds</text>
           <text xml:space="preserve" x="110" y="25" class="testC4" transform="translate(0,70)">Clip set to upper right quarter</text>
  -        <use transform="translate(0,70)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC5" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="translate(0,70)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC5" xlink:actuate="onLoad" xlink:show="embed" />
         </g>
         <g class="testC6" transform="translate(0,140)">
           <text xml:space="preserve" x="110" y="15" class="testC7">Clip set to upper right quarter</text>
           <text xml:space="preserve" x="110" y="30" class="testC8">after .5 scale</text>
  -        <use transform="scale(0.5,0.5)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC9" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="scale(0.5,0.5)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC9" xlink:actuate="onLoad" xlink:show="embed" />
         </g>
         <g class="testC10" transform="translate(0,210)">
           <text xml:space="preserve" x="110" y="25" class="testC11">Non-Rectagular clip</text>
  -        <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC12" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC12" xlink:actuate="onLoad" xlink:show="embed" />
         </g>
         <g class="testC13" transform="translate(0,280)">
           <text xml:space="preserve" x="110" y="15" class="testC14">Non-Rectagular clip after</text>
           <text xml:space="preserve" x="110" y="30" class="testC15">.5 scale</text>
  -        <use transform="scale(0.5,0.5)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC16" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="scale(0.5,0.5)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC16" xlink:actuate="onLoad" xlink:show="embed" />
         </g>
         <g class="testC17" transform="translate(0,350)">
           <text xml:space="preserve" x="110" y="15" class="testC18">Non-Rectagular clip before</text>
           <text xml:space="preserve" x="110" y="30" class="testC19">.5 scale</text>
  -        <use transform="scale(0.5,0.5)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC20" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="scale(0.5,0.5)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC20" xlink:actuate="onLoad" xlink:show="embed" />
         </g>
       </g>
     </g>
  
  
  
  1.11      +23 -23    xml-batik/test-references/org/apache/batik/svggen/ContextDrawImage.svg
  
  Index: ContextDrawImage.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-references/org/apache/batik/svggen/ContextDrawImage.svg,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ContextDrawImage.svg	5 Jul 2003 14:18:29 -0000	1.10
  +++ ContextDrawImage.svg	3 Aug 2004 00:14:17 -0000	1.11
  @@ -6,18 +6,18 @@
     <defs id="genericDefs" />
     <g>
       <style type="text/css" xml:space="preserve">
  -      <![CDATA[.testC1 {text-rendering:optimizeLegibility;stroke:gray;fill:gray;}
  -.testC2 {stroke:none;}
  -.testC3 {fill:black;stroke:black;}
  -.testC4 {fill:black;stroke:black;}
  -.testC5 {fill:black;stroke:black;}
  -.testC6 {stroke:none;}
  -.testC7 {fill:black;stroke:black;}
  -.testC8 {fill:black;stroke:black;}
  -.testC9 {fill:black;stroke:black;}
  -.testC10 {stroke:none;}
  -.testC11 {fill:black;stroke:black;}
  -.testC12 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
  +      <![CDATA[.testC1 {text-rendering:optimizeLegibility;stroke:gray;fill:gray;}
  +.testC2 {stroke:none;}
  +.testC3 {fill:black;stroke:black;}
  +.testC4 {fill:black;stroke:black;}
  +.testC5 {fill:black;stroke:black;}
  +.testC6 {stroke:none;}
  +.testC7 {fill:black;stroke:black;}
  +.testC8 {fill:black;stroke:black;}
  +.testC9 {fill:black;stroke:black;}
  +.testC10 {stroke:none;}
  +.testC11 {fill:black;stroke:black;}
  +.testC12 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
   ]]>
       </style>
       <g>
  @@ -26,30 +26,30 @@
   IAxA0dZ4KG8H3s5bYWB1cgPy/sDePGFqYkZEC03T2Y+6wSDlWX+GvCIO3+RcAQEi
   IEAEBIiAABEQIAIiIEAEBIiAABEQIAIiIED0v7GXVXZYlUs3RECACAgQAREQIAIC
   RECACAgQAREQIAICRECACAgQAdG3sSgXtSw/SMa9w6pcc0M8WQICRECACAgQAQEi
  -IAICRECACAgQAQEiIAICRECWr+8y+dPnRL0NfQiZFsn8oQAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onRequest" height="75" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +IAICRECACAgQAQEiIAICRECWr+8y+dPnRL0NfQiZFsn8oQAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="75" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
           <image width="50" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAZCAYAAABzVH1EAAAAO0lEQVR42u3PMREA
   IAwEsC+HKPxPuAILrPQSB6kkJw3Ms/9P1EpGmhAREREREREREREREREREREReXEB
  -Mj4DM5nvS3kAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onRequest" height="25" id="testimage2" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +Mj4DM5nvS3kAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="25" id="testimage2" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
           <image width="50" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAZCAYAAABzVH1EAAAAN0lEQVR42u3PQQ0A
   MAwDsWz8ObeDsHfkkw6Ak47mlkACAgICAgICAgICAgICAgICAvLTeU8DZAF1jQIu
  -ZhJ9hAAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onRequest" height="25" id="testimage3" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +ZhJ9hAAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="25" id="testimage3" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
           <image width="100" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABLCAYAAACGGCK3AAAAqUlEQVR42u3asQ2A
   MAwAQYPYKwzDHsh7MAyjodCShi6J7gv31sVdItRVSx37BIuUY/wd8opYvcm+AgJE
   QIAICBABASIgQAREQIAICBABASIgQAREQIDof1sd5Zxgk3QhAgJEQIAIiIAAERAg
   AgJEQIAIiIAAERAgAgJEQIAIiL69H+XiHn+RdCECAkRAgAiIgAARECACAkRAgAiI
  -gAARECACAkRAgEhq9ABtlAUWpLluEgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onRequest" height="75" id="testimage4" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +gAARECACAkRAgEhq9ABtlAUWpLluEgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="75" id="testimage4" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
         </defs>
         <g class="testC1">
           <rect width="100" x="5" height="75" y="10" class="testC2" />
  -        <use transform="matrix(1,0,0,1,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC3" xlink:actuate="onRequest" xlink:show="replace" />
  -        <use transform="translate(150,0) matrix(0.5,0,0,0.5333,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC4" xlink:actuate="onRequest" xlink:show="replace" />
  -        <use transform="translate(0,80) matrix(0.8,0,0,1.2,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" xlink:type="simple" class="testC5" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="matrix(1,0,0,1,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC3" xlink:actuate="onLoad" xlink:show="embed" />
  +        <use transform="translate(150,0) matrix(0.5,0,0,0.5333,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC4" xlink:actuate="onLoad" xlink:show="embed" />
  +        <use transform="translate(0,80) matrix(0.8,0,0,1.2,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" xlink:type="simple" class="testC5" xlink:actuate="onLoad" xlink:show="embed" />
           <rect x="5" y="10" transform="translate(150,80)" width="40" class="testC6" height="30" />
  -        <use transform="translate(150,80) matrix(0.8,0,0,1.2,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage3" xlink:type="simple" class="testC7" xlink:actuate="onRequest" xlink:show="replace" />
  -        <use transform="translate(0,160) matrix(0.5,0,0,0.3,2.5,3)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC8" xlink:actuate="onRequest" xlink:show="replace" />
  -        <use transform="translate(150,160) matrix(1,0,0,1,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage4" xlink:type="simple" class="testC9" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="translate(150,80) matrix(0.8,0,0,1.2,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage3" xlink:type="simple" class="testC7" xlink:actuate="onLoad" xlink:show="embed" />
  +        <use transform="translate(0,160) matrix(0.5,0,0,0.3,2.5,3)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC8" xlink:actuate="onLoad" xlink:show="embed" />
  +        <use transform="translate(150,160) matrix(1,0,0,1,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage4" xlink:type="simple" class="testC9" xlink:actuate="onLoad" xlink:show="embed" />
           <rect x="5" y="10" transform="translate(0,240)" width="50" class="testC10" height="40" />
  -        <use transform="translate(0,240) matrix(0.5,0,0,0.5333,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC11" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="translate(0,240) matrix(0.5,0,0,0.5333,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC11" xlink:actuate="onLoad" xlink:show="embed" />
         </g>
       </g>
     </g>
  
  
  
  1.16      +23 -23    xml-batik/test-references/org/apache/batik/svggen/ContextGradient.svg
  
  Index: ContextGradient.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-references/org/apache/batik/svggen/ContextGradient.svg,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ContextGradient.svg	5 Jul 2003 14:18:29 -0000	1.15
  +++ ContextGradient.svg	3 Aug 2004 00:14:17 -0000	1.16
  @@ -6,45 +6,45 @@
     <defs id="genericDefs" />
     <g>
       <style type="text/css" xml:space="preserve">
  -      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  -.testC2 {stroke:none;}
  -.testC3 {fill:url(#testlinearGradient1);stroke:none;}
  -.testC4 {fill:none;}
  -.testC5 {text-rendering:optimizeLegibility;}
  -.testC6 {fill:none;}
  -.testC7 {text-rendering:optimizeLegibility;}
  -.testC8 {stroke:none;}
  -.testC9 {fill:url(#testlinearGradient2);stroke:none;}
  -.testC10 {fill:url(#testlinearGradient3);stroke:none;}
  -.testC11 {fill:none;}
  -.testC12 {text-rendering:optimizeLegibility;}
  -.testC13 {stroke:none;}
  -.testC14 {fill:url(#testlinearGradient4);stroke:none;}
  -.testC15 {text-rendering:optimizeLegibility;}
  -.testC16 {stroke:none;}
  -.testC17 {fill:url(#testlinearGradient5);stroke:none;}
  -.testC18 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
  +      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  +.testC2 {stroke:none;}
  +.testC3 {fill:url(#testlinearGradient1);stroke:none;}
  +.testC4 {fill:none;}
  +.testC5 {text-rendering:optimizeLegibility;}
  +.testC6 {fill:none;}
  +.testC7 {text-rendering:optimizeLegibility;}
  +.testC8 {stroke:none;}
  +.testC9 {fill:url(#testlinearGradient2);stroke:none;}
  +.testC10 {fill:url(#testlinearGradient3);stroke:none;}
  +.testC11 {fill:none;}
  +.testC12 {text-rendering:optimizeLegibility;}
  +.testC13 {stroke:none;}
  +.testC14 {fill:url(#testlinearGradient4);stroke:none;}
  +.testC15 {text-rendering:optimizeLegibility;}
  +.testC16 {stroke:none;}
  +.testC17 {fill:url(#testlinearGradient5);stroke:none;}
  +.testC18 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
   ]]>
       </style>
       <g>
         <defs id="testdefs1">
  -        <linearGradient x1="30" xmlns:xlink="http://www.w3.org/1999/xlink" x2="30" y1="40" gradientUnits="userSpaceOnUse" y2="120" xlink:type="simple" xlink:actuate="onRequest" id="testlinearGradient1" xlink:show="replace" spreadMethod="pad">
  +        <linearGradient x1="30" xmlns:xlink="http://www.w3.org/1999/xlink" x2="30" y1="40" gradientUnits="userSpaceOnUse" y2="120" xlink:type="simple" xlink:actuate="onLoad" id="testlinearGradient1" xlink:show="other" spreadMethod="pad">
             <stop stop-opacity="1" stop-color="red" offset="0%" />
             <stop stop-opacity="1" stop-color="yellow" offset="100%" />
           </linearGradient>
  -        <linearGradient x1="0" xmlns:xlink="http://www.w3.org/1999/xlink" x2="20" y1="0" gradientUnits="userSpaceOnUse" y2="0" xlink:type="simple" xlink:actuate="onRequest" id="testlinearGradient2" xlink:show="replace" spreadMethod="pad">
  +        <linearGradient x1="0" xmlns:xlink="http://www.w3.org/1999/xlink" x2="20" y1="0" gradientUnits="userSpaceOnUse" y2="0" xlink:type="simple" xlink:actuate="onLoad" id="testlinearGradient2" xlink:show="other" spreadMethod="pad">
             <stop stop-opacity="1" stop-color="red" offset="0%" />
             <stop stop-opacity="1" stop-color="yellow" offset="100%" />
           </linearGradient>
  -        <linearGradient x1="0" xmlns:xlink="http://www.w3.org/1999/xlink" x2="20" y1="0" gradientUnits="userSpaceOnUse" y2="0" xlink:type="simple" xlink:actuate="onRequest" id="testlinearGradient3" xlink:show="replace" spreadMethod="reflect">
  +        <linearGradient x1="0" xmlns:xlink="http://www.w3.org/1999/xlink" x2="20" y1="0" gradientUnits="userSpaceOnUse" y2="0" xlink:type="simple" xlink:actuate="onLoad" id="testlinearGradient3" xlink:show="other" spreadMethod="reflect">
             <stop stop-opacity="1" stop-color="red" offset="0%" />
             <stop stop-opacity="1" stop-color="yellow" offset="100%" />
           </linearGradient>
  -        <linearGradient x1="0" xmlns:xlink="http://www.w3.org/1999/xlink" x2="100" y1="0" gradientUnits="userSpaceOnUse" y2="0" xlink:type="simple" xlink:actuate="onRequest" id="testlinearGradient4" xlink:show="replace" spreadMethod="pad">
  +        <linearGradient x1="0" xmlns:xlink="http://www.w3.org/1999/xlink" x2="100" y1="0" gradientUnits="userSpaceOnUse" y2="0" xlink:type="simple" xlink:actuate="onLoad" id="testlinearGradient4" xlink:show="other" spreadMethod="pad">
             <stop stop-opacity="1" stop-color="red" offset="0%" />
             <stop stop-opacity="1" stop-color="yellow" offset="100%" />
           </linearGradient>
  -        <linearGradient x1="10" xmlns:xlink="http://www.w3.org/1999/xlink" x2="110" y1="30" gradientUnits="userSpaceOnUse" y2="30" xlink:type="simple" xlink:actuate="onRequest" id="testlinearGradient5" xlink:show="replace" spreadMethod="pad">
  +        <linearGradient x1="10" xmlns:xlink="http://www.w3.org/1999/xlink" x2="110" y1="30" gradientUnits="userSpaceOnUse" y2="30" xlink:type="simple" xlink:actuate="onLoad" id="testlinearGradient5" xlink:show="other" spreadMethod="pad">
             <stop stop-opacity="0" stop-color="rgb(255,0,0)" offset="0%" />
             <stop stop-opacity="1" stop-color="yellow" offset="100%" />
           </linearGradient>
  
  
  
  1.20      +13 -13    xml-batik/test-references/org/apache/batik/svggen/ContextGraphicObjects.svg
  
  Index: ContextGraphicObjects.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-references/org/apache/batik/svggen/ContextGraphicObjects.svg,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ContextGraphicObjects.svg	5 Jul 2003 14:18:29 -0000	1.19
  +++ ContextGraphicObjects.svg	3 Aug 2004 00:14:17 -0000	1.20
  @@ -6,15 +6,15 @@
     <defs id="genericDefs" />
     <g>
       <style type="text/css" xml:space="preserve">
  -      <![CDATA[.testC1 {text-rendering:optimizeLegibility;font-family:'Times New Roman';font-size:20;}
  -.testC2 {stroke:none;}
  -.testC3 {fill:rgb(176,22,40);stroke:none;}
  -.testC4 {fill:rgb(208,170,119);stroke:none;}
  -.testC5 {fill:rgb(221,229,111);stroke:none;}
  -.testC6 {fill:rgb(240,165,0);stroke:none;}
  -.testC7 {fill:rgb(240,165,0);stroke:rgb(240,165,0);}
  -.testC8 {fill:rgb(240,165,0);stroke:rgb(240,165,0);}
  -.testC9 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
  +      <![CDATA[.testC1 {text-rendering:optimizeLegibility;font-family:'Times New Roman';font-size:20;}
  +.testC2 {stroke:none;}
  +.testC3 {fill:rgb(176,22,40);stroke:none;}
  +.testC4 {fill:rgb(208,170,119);stroke:none;}
  +.testC5 {fill:rgb(221,229,111);stroke:none;}
  +.testC6 {fill:rgb(240,165,0);stroke:none;}
  +.testC7 {fill:rgb(240,165,0);stroke:rgb(240,165,0);}
  +.testC8 {fill:rgb(240,165,0);stroke:rgb(240,165,0);}
  +.testC9 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
   ]]>
       </style>
       <g>
  @@ -54,7 +54,7 @@
   54KALxYoCCgITEe6ISYn1zkXBHyxQEFAQWA60g0xObnOuSDgiwUKAgoC05FuiMnJ
   dc4FAV8sUBBQEJiOdENMTq5zLgj4YoGCgILAdKQbYnJynXNBwBcLFAQUBKYj3RCT
   k+ucCwK+WKAgoCAwHemGmJxc51wQ8MUCBQEFgelIN8Tk5DrngoAvFigIKAgsfQCj
  -AQrLWU2b7gAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onRequest" height="150" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +AQrLWU2b7gAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="150" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
           <image width="200" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACWCAYAAACb3McZAAAMBUlEQVR42u3da4gk
   VxXA8eqanhmyEiF+WBMQURHRoEGIDwiICIIYH/gG8YUJu0skGkFIEMFkwRf6Rf3g
   6kQUHyi6wQeIqCAoiIIEEkWiG9HoF8OCGkgMm31Ml+d23dt17q1zq6pndkiy998w
  @@ -120,7 +120,7 @@
   p08/bWgOgjtwR5nuCMlx+eX/HZqD4A7cUaY7XHJMmoPgDtxRojvcyVWPK6540J6D
   4A7cUbI7QnIYcxDcgTtwR4ifOnVVOgfBHbgDd7jq4ZLj8OH7+nMQ3IE7SneHS47e
   HAR34A7c8eAq7qrHyZNXd0jHHbgDd7TuCMnhKwjuwB24Q7uju7Xjzf8BxjbJhW9v
  -vFkAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onRequest" height="150" id="testimage2" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +vFkAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="150" id="testimage2" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
         </defs>
         <g class="testC1">
           <text xml:space="preserve" x="20" y="40" class="testC2">Hello SVG drawString(...)</text>
  @@ -128,8 +128,8 @@
           <circle r="30" class="testC4" cx="50" transform="translate(60,70)" cy="30" />
           <circle r="30" class="testC5" cx="50" transform="translate(120,70)" cy="30" />
           <circle r="30" class="testC6" cx="50" transform="translate(180,70)" cy="30" />
  -        <use transform="translate(0,130) matrix(1,0,0,1,40,40)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC7" xlink:actuate="onRequest" xlink:show="replace" />
  -        <use transform="translate(0,130) matrix(1,0,0,1,40,40)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" xlink:type="simple" class="testC8" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="translate(0,130) matrix(1,0,0,1,40,40)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC7" xlink:actuate="onLoad" xlink:show="embed" />
  +        <use transform="translate(0,130) matrix(1,0,0,1,40,40)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" xlink:type="simple" class="testC8" xlink:actuate="onLoad" xlink:show="embed" />
         </g>
       </g>
     </g>
  
  
  
  1.20      +9 -9      xml-batik/test-references/org/apache/batik/svggen/ContextLookup.svg
  
  Index: ContextLookup.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-references/org/apache/batik/svggen/ContextLookup.svg,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ContextLookup.svg	5 Jul 2003 14:18:29 -0000	1.19
  +++ ContextLookup.svg	3 Aug 2004 00:14:17 -0000	1.20
  @@ -6,11 +6,11 @@
     <defs id="genericDefs" />
     <g>
       <style type="text/css" xml:space="preserve">
  -      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  -.testC2 {stroke:none;}
  -.testC3 {}
  -.testC4 {}
  -.testC5 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
  +      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  +.testC2 {stroke:none;}
  +.testC3 {}
  +.testC4 {}
  +.testC5 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
   ]]>
       </style>
       <g>
  @@ -210,7 +210,7 @@
   I0NWlP50hV7LfYycr+M7gTujScPuFZ+wjrzMrNR8DdMDDH/p7vp2YN9BdwQMd5Wx
   iQBfbSAwQjZ0OjCKN6SiSG/SUh9N9BwiHBJJM0lzsjtAUthFtsMjFogUz16uHVGm
   3YFupUdXt1Y7vnOEGb59gIR/9+41Pf/iVM9ezHXNrguimj/++7c1newQjmudPBhr
  -0ENZp2arI3rHZFLl7ifblZIUJP3/xKLSFlvxD0QAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onRequest" height="63" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +0ENZp2arI3rHZFLl7ifblZIUJP3/xKLSFlvxD0QAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="63" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
           <image width="50" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAYAAACioZtvAAAgAElEQVR42iWaSY8l
   15me35jjzmMONWQNZLE4iJS6RQ2thhttuCEY8sKAARv2zhv/EP0VL+2F4YUNGN1w
   2wsbbrUEURRFkWKRNVdlVU53jhs34kaEn+8khYIqs+6NOOcb3uE7x/sP/+LfNGW8
  @@ -388,12 +388,12 @@
   fn3NJ6wjiRC3hu/z7BLDH7m7vhvYd7GeAcNrpWyiwlcbCMyQDZsNjNLMqSjSm++0
   RBPdhQjnRNJM0pDsLpAUdpHt4pwFIsXTk64jSrv69DI7v761uqmdI0zx7Qsk/LfP
   3urux8e6d2eot3ZdENX82f95ofGkhXDs6vTxlZtAzjOz1Xa+bzIpdPeT7UpJBpL+
  -fybudeoweVphAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onRequest" height="63" id="testimage2" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +fybudeoweVphAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="63" id="testimage2" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
         </defs>
         <g class="testC1">
           <text xml:space="preserve" x="10" y="20" class="testC2">Normal / Inverted</text>
  -        <use transform="matrix(1,0,0,1,10,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC3" xlink:actuate="onRequest" xlink:show="replace" />
  -        <use transform="matrix(1,0,0,1,70,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" xlink:type="simple" class="testC4" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="matrix(1,0,0,1,10,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC3" xlink:actuate="onLoad" xlink:show="embed" />
  +        <use transform="matrix(1,0,0,1,70,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" xlink:type="simple" class="testC4" xlink:actuate="onLoad" xlink:show="embed" />
         </g>
       </g>
     </g>
  
  
  
  1.20      +15 -15    xml-batik/test-references/org/apache/batik/svggen/ContextPaints.svg
  
  Index: ContextPaints.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-references/org/apache/batik/svggen/ContextPaints.svg,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ContextPaints.svg	5 Jul 2003 14:18:29 -0000	1.19
  +++ ContextPaints.svg	3 Aug 2004 00:14:17 -0000	1.20
  @@ -6,27 +6,27 @@
     <defs id="genericDefs" />
     <g>
       <style type="text/css" xml:space="preserve">
  -      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  -.testC2 {stroke:none;}
  -.testC3 {stroke:none;}
  -.testC4 {fill-opacity:0.502;text-rendering:optimizeLegibility;stroke-opacity:0.502;stroke:rgb(255,255,0);fill:rgb(255,255,0);}
  -.testC5 {stroke:none;}
  -.testC6 {text-rendering:optimizeLegibility;}
  -.testC7 {stroke:none;}
  -.testC8 {fill:url(#testlinearGradient1);stroke:none;}
  -.testC9 {stroke:none;}
  -.testC10 {fill:url(#testpattern1);stroke:none;}
  -.testC11 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
  +      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  +.testC2 {stroke:none;}
  +.testC3 {stroke:none;}
  +.testC4 {fill-opacity:0.502;text-rendering:optimizeLegibility;stroke-opacity:0.502;stroke:rgb(255,255,0);fill:rgb(255,255,0);}
  +.testC5 {stroke:none;}
  +.testC6 {text-rendering:optimizeLegibility;}
  +.testC7 {stroke:none;}
  +.testC8 {fill:url(#testlinearGradient1);stroke:none;}
  +.testC9 {stroke:none;}
  +.testC10 {fill:url(#testpattern1);stroke:none;}
  +.testC11 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
   ]]>
       </style>
       <g>
         <defs id="testdefs1">
  -        <linearGradient x1="10" xmlns:xlink="http://www.w3.org/1999/xlink" x2="110" y1="20" gradientUnits="userSpaceOnUse" y2="80" xlink:type="simple" xlink:actuate="onRequest" id="testlinearGradient1" xlink:show="replace" spreadMethod="pad">
  +        <linearGradient x1="10" xmlns:xlink="http://www.w3.org/1999/xlink" x2="110" y1="20" gradientUnits="userSpaceOnUse" y2="80" xlink:type="simple" xlink:actuate="onLoad" id="testlinearGradient1" xlink:show="other" spreadMethod="pad">
             <stop stop-opacity="1" stop-color="red" offset="0%" />
             <stop stop-opacity="1" stop-color="yellow" offset="100%" />
           </linearGradient>
  -        <pattern x="10" y="20" width="20" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onRequest" id="testpattern1" height="20" preserveAspectRatio="xMidYMid meet" xlink:show="replace">
  -          <use xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" />
  +        <pattern x="10" y="20" width="20" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="testpattern1" height="20" preserveAspectRatio="xMidYMid meet" xlink:show="other">
  +          <use xlink:type="simple" xlink:actuate="onLoad" xlink:show="embed" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" />
           </pattern>
           <font horiz-adv-x="75.0" id="testfont1">
             <font-face ascent="92.163086" descent="19.555664" units-per-em="100" font-family="Arial" font-style="normal" font-weight="normal" />
  @@ -60,7 +60,7 @@
             <glyph unicode="T" horiz-adv-x="61.083984" d="M25.9219 0 L25.9219 63.1406 L2.3438 63.1406 L2.3438 71.5781 L59.0781 71.5781 L59.0781 63.1406 L35.4062 63.1406 L35.4062 0 L25.9219 0 Z" />
           </font>
           <image width="20" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAALklEQVR42mP8z8AA
  -RIQBIwNxgImBymDUwFEDB4OBoAxAVE75/380DEcNHMEGAgA9ZQUjAKh+SgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onRequest" height="20" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +RIQBIwNxgImBymDUwFEDB4OBoAxAVE75/380DEcNHMEGAgA9ZQUjAKh+SgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="20" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
         </defs>
         <g class="testC1" transform="translate(0,30)">
           <text xml:space="preserve" x="10" y="10" class="testC2">Semi transparent black</text>
  
  
  
  1.22      +16 -16    xml-batik/test-references/org/apache/batik/svggen/ContextRHints.svg
  
  Index: ContextRHints.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-references/org/apache/batik/svggen/ContextRHints.svg,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ContextRHints.svg	17 Oct 2003 18:10:22 -0000	1.21
  +++ ContextRHints.svg	3 Aug 2004 00:14:17 -0000	1.22
  @@ -6,19 +6,19 @@
     <defs id="genericDefs" />
     <g>
       <style type="text/css" xml:space="preserve">
  -      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  -.testC2 {stroke:none;}
  -.testC3 {shape-rendering:crispEdges;text-rendering:geometricPrecision;font-family:'Impact';font-size:25;}
  -.testC4 {stroke:none;}
  -.testC5 {text-rendering:optimizeSpeed;stroke:none;}
  -.testC6 {shape-rendering:auto;font-family:'Arial';stroke:none;font-size:12;}
  -.testC7 {font-family:'Arial';stroke:none;font-size:12;}
  -.testC8 {shape-rendering:auto;font-family:'Arial';stroke:none;font-size:12;}
  -.testC9 {image-rendering:optimizeSpeed;text-rendering:geometricPrecision;}
  -.testC10 {stroke:none;}
  -.testC11 {}
  -.testC12 {image-rendering:optimizeQuality;}
  -.testC13 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
  +      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  +.testC2 {stroke:none;}
  +.testC3 {shape-rendering:crispEdges;text-rendering:geometricPrecision;font-family:'Impact';font-size:25;}
  +.testC4 {stroke:none;}
  +.testC5 {text-rendering:optimizeSpeed;stroke:none;}
  +.testC6 {shape-rendering:auto;font-family:'Arial';stroke:none;font-size:12;}
  +.testC7 {font-family:'Arial';stroke:none;font-size:12;}
  +.testC8 {shape-rendering:auto;font-family:'Arial';stroke:none;font-size:12;}
  +.testC9 {image-rendering:optimizeSpeed;text-rendering:geometricPrecision;}
  +.testC10 {stroke:none;}
  +.testC11 {}
  +.testC12 {image-rendering:optimizeQuality;}
  +.testC13 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
   ]]>
       </style>
       <g>
  @@ -68,7 +68,7 @@
             <glyph unicode="H" horiz-adv-x="55.51758" d="M51.375 79.0469 L51.375 0 L30.8125 0 L30.8125 33.2031 L24.6562 33.2031 L24.6562 0 L4.1094 0 L4.1094 79.0469 L24.6562 79.0469 L24.6562 50.7812 L30.8125 50.7812 L30.8125 79.0469 L51.375 79.0469 Z" />
           </font>
           <image width="2" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVR42mP8/5/h
  -PwMjAwMTiAAyGQAyFwQCULgtXgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onRequest" height="2" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +PwMjAwMTiAAyGQAyFwQCULgtXgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="2" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
         </defs>
         <g class="testC1">
           <text xml:space="preserve" x="10" y="20" class="testC2">Text antialiasing</text>
  @@ -82,8 +82,8 @@
         </g>
         <g class="testC9" transform="translate(0,200)">
           <text xml:space="preserve" x="10" y="30" class="testC10">Interpolation Nearest Neighbor / Bicubic</text>
  -        <use transform="matrix(20,0,0,20,10,50)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC11" xlink:actuate="onRequest" xlink:show="replace" />
  -        <use transform="matrix(20,0,0,20,60,50)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC12" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="matrix(20,0,0,20,10,50)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC11" xlink:actuate="onLoad" xlink:show="embed" />
  +        <use transform="matrix(20,0,0,20,60,50)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC12" xlink:actuate="onLoad" xlink:show="embed" />
         </g>
       </g>
     </g>
  
  
  
  1.19      +22 -22    xml-batik/test-references/org/apache/batik/svggen/ContextRescale.svg
  
  Index: ContextRescale.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-references/org/apache/batik/svggen/ContextRescale.svg,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ContextRescale.svg	5 Jul 2003 14:18:29 -0000	1.18
  +++ ContextRescale.svg	3 Aug 2004 00:14:17 -0000	1.19
  @@ -6,16 +6,16 @@
     <defs id="genericDefs" />
     <g>
       <style type="text/css" xml:space="preserve">
  -      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  -.testC2 {stroke:none;}
  -.testC3 {}
  -.testC4 {}
  -.testC5 {}
  -.testC6 {stroke:none;}
  -.testC7 {}
  -.testC8 {}
  -.testC9 {}
  -.testC10 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
  +      <![CDATA[.testC1 {text-rendering:optimizeLegibility;}
  +.testC2 {stroke:none;}
  +.testC3 {}
  +.testC4 {}
  +.testC5 {}
  +.testC6 {stroke:none;}
  +.testC7 {}
  +.testC8 {}
  +.testC9 {}
  +.testC10 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
   ]]>
       </style>
       <g>
  @@ -166,7 +166,7 @@
   dAUnT0SD9jjN3RHKtH2PDEQT5QqsTSf7mDMWyU4NmFQizL7aZrwspFPIGGS+oRym
   OKCRjBNKOt67ehc5xs4803VJrzBmYuhWFBSWKCCpuPl+jYWyi7SRx9l0JnjL2xnx
   L36ZI4W/9PQTuH55He+9X2Y3ukAqY+IPvnUeW5tNFLdqePJiHvMJPege0xM8axAc
  -s/B/wE/81LZ3lbMAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onRequest" height="63" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +s/B/wE/81LZ3lbMAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="63" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
           <image width="50" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAYAAACioZtvAAAgAElEQVR42iWaWa8d
   15me3xp37Xk4A3k4kxJlyZNsp+3uiw6QAd0IMgBBGkiA3OQit/kR/T9ylbskCBAg
   SGAERhppuGHHbtvdtqSWRZGiSB6SZ9jzULvGXXm+RQkEDg/3rlrrG97hW8v7j//r
  @@ -344,7 +344,7 @@
   vkGv5b4bLZ3ee3dLtRP2HJ8AwvBbZiMlT6PuEYa/dHd9u7DvsEd2+GDGJgJ8tYHA
   uEP39Ex7jRCTpDdpaYAmevH0UiMiaSZpSXaHcINdZDs+YYFI8ezVFiS0o+6J7nRO
   3t1a7frOEWb49iES/v37N/Ti0ws8+Qo3OkbKZPr+H9/TfLZHOG519miiYR9l3TFb
  -TXObCLXBNWVmV0o6IOn/B5vb0uXxU9VwAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onRequest" height="63" id="testimage2" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +TXObCLXBNWVmV0o6IOn/B5vb0uXxU9VwAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="63" id="testimage2" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
           <image width="50" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAYAAACioZtvAAAdfklEQVR42j2a6Y5c
   W3Kd48xDZlZmTSQv79BXjbYkCJZhW/5j+Fn817/8EH47w7Bh2HCjJat1R5G8ZFUx
   q3I68+BvxSHMvg0mM8+wdwwr1orYwX/8z/9pjsbMomK2IAht6kZLVplV596CebY4
  @@ -503,7 +503,7 @@
   Qx7ouOzYB95aurqJfGSdih8KfFRN8GSsJCrTlfXEdgfnyhKdsS3dI32gplroIFAC
   q2k++Zlfjd4yLFqw+f3DEc3IZ+K4itXQxqp1gEZggVDxft96oUyzle3SzXJqNV06
   632nwzix3d9e2f7D0fZ7JKyOC7aDffeHG++tCUS2mn7hhTLNPKw0rB3mLy3dWT2N
  -0f4f4XkfuBFYPHcAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onRequest" height="63" id="testimage3" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +0f4f4XkfuBFYPHcAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="63" id="testimage3" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
           <image width="50" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAYAAACioZtvAAAbyElEQVR42k1aaY8k
   2VW9GZEZuS+1dlXvXdPT0+Mez9gDHoPwBsgWAiwZhIzEB/jKX+E7Ep+RLGQjJAtk
   ZGCQkBd5GDyLe5memZ7qruqu6uqqrNyXyMyIyAzOeScsaKk6t4j37nruufdFLv3X
  @@ -653,7 +653,7 @@
   eYSFMeaz8Yyx6oYeiERIbaP6Xqit6UJPz3vMYf29Cip8jdyrhe44Zzvs08GJ7u2f
   2XXkzlVY5RDe3UBtCEdgsHzooFS12dEEhTK2zRpYcmVLh0YcQvCpuGloV0Hh/+Da
   Bfvpg1N4dmivoXscgTV/8ytXbdGd2Sfoid7g6Ve9qIcz2Z+4GhJnAKBn7v8XO84B
  -pUKskyMAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onRequest" height="63" id="testimage4" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +pUKskyMAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="63" id="testimage4" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
           <image width="50" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAYAAACioZtvAAAZ70lEQVR42j2a2Y8c
   13XGT1VX9d7Ts5KiuFPUQluUpcCWDTsOnARI8pAAShAgj/mr8uQnvwnxgwMjhhEY
   MWLHkK3VthYrlEhRw3U4e+/d1VVd+c6vroghZ7qrbt26597vfOc7597oh+W/l6l1
  @@ -793,7 +793,7 @@
   CICrtk0fFdaIa7DfiKNVJYb4aM6EU6rtoA/LUDxNHDbrFOeWVPE8CPU1uJRt40qm
   Own4idxOVHA00oVFt9PgPPWuYLHuW6ppk2DZ51hSRKrrJDKPxkRkP0F3QYZXp1Zj
   WGnOUb6mXf+Ls7b75p7tvjWwMy9t2GJvbq99+xKHDFxvnKMu3wgVmmqf96tN0hKp
  -k9n/Aw+MgA/S8A29AAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onRequest" height="63" id="testimage5" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +k9n/Aw+MgA/S8A29AAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="63" id="testimage5" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
           <image width="50" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAYAAACioZtvAAAam0lEQVR42kWayY9c
   13XGT1W9mqurqkf2QDYpDpIoWqZlyY5j2BkMB7DhLIIsHCBBAG+dTXYJsgqSPyII
   ECOLAFkkyDKGAzsxPEWyDMmxTMqSOIhks7vZc9c8D/l+91xCBIpdw3v33XuG7/vO
  @@ -937,17 +937,17 @@
   /QgNds1jbdsbdpyyCyrAXMeFrTd6RBT87JjSxaPBDAzTfQc6yQn6ruFIR8rFZEUs
   yXnfJw+GVlfuUCQ19D05w0G2lVVHnsFTR0L6T+z4hlOr8YQoxFiThL9+WePcrYSa
   nGoUKfPal7y3hnDcuOpbbPWSl9XkDtt4SdwOKWlO/w+897qli3RcmQAAAABJRU5E
  -rkJggg==" xlink:type="simple" xlink:actuate="onRequest" height="63" id="testimage6" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +rkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="63" id="testimage6" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
         </defs>
         <g class="testC1">
           <text xml:space="preserve" x="10" y="20" class="testC2">Brighter / Normal / Darker</text>
  -        <use transform="matrix(1,0,0,1,10,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC3" xlink:actuate="onRequest" xlink:show="replace" />
  -        <use transform="matrix(1,0,0,1,70,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" xlink:type="simple" class="testC4" xlink:actuate="onRequest" xlink:show="replace" />
  -        <use transform="matrix(1,0,0,1,130,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage3" xlink:type="simple" class="testC5" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="matrix(1,0,0,1,10,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC3" xlink:actuate="onLoad" xlink:show="embed" />
  +        <use transform="matrix(1,0,0,1,70,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" xlink:type="simple" class="testC4" xlink:actuate="onLoad" xlink:show="embed" />
  +        <use transform="matrix(1,0,0,1,130,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage3" xlink:type="simple" class="testC5" xlink:actuate="onLoad" xlink:show="embed" />
           <text xml:space="preserve" x="10" y="20" class="testC6" transform="translate(0,113)">Rescale Red / Green / Blue</text>
  -        <use transform="translate(0,113) matrix(1,0,0,1,10,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage4" xlink:type="simple" class="testC7" xlink:actuate="onRequest" xlink:show="replace" />
  -        <use transform="translate(0,113) matrix(1,0,0,1,70,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage5" xlink:type="simple" class="testC8" xlink:actuate="onRequest" xlink:show="replace" />
  -        <use transform="translate(0,113) matrix(1,0,0,1,130,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage6" xlink:type="simple" class="testC9" xlink:actuate="onRequest" xlink:show="replace" />
  +        <use transform="translate(0,113) matrix(1,0,0,1,10,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage4" xlink:type="simple" class="testC7" xlink:actuate="onLoad" xlink:show="embed" />
  +        <use transform="translate(0,113) matrix(1,0,0,1,70,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage5" xlink:type="simple" class="testC8" xlink:actuate="onLoad" xlink:show="embed" />
  +        <use transform="translate(0,113) matrix(1,0,0,1,130,30)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage6" xlink:type="simple" class="testC9" xlink:actuate="onLoad" xlink:show="embed" />
         </g>
       </g>
     </g>
  
  
  
  1.19      +22 -22    xml-batik/test-references/org/apache/batik/svggen/ContextTexture.svg
  
  Index: ContextTexture.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-references/org/apache/batik/svggen/ContextTexture.svg,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ContextTexture.svg	5 Jul 2003 14:18:29 -0000	1.18
  +++ ContextTexture.svg	3 Aug 2004 00:14:17 -0000	1.19
  @@ -6,32 +6,32 @@
     <defs id="genericDefs" />
     <g>
       <style type="text/css" xml:space="preserve">
  -      <![CDATA[.testC1 {text-rendering:optimizeLegibility;stroke:url(#testpattern1);fill:url(#testpattern1);}
  -.testC2 {stroke:none;}
  -.testC3 {stroke:none;}
  -.testC4 {text-rendering:optimizeLegibility;}
  -.testC5 {stroke:none;}
  -.testC6 {fill:url(#testpattern2);stroke:none;}
  -.testC7 {fill:url(#testpattern2);stroke:none;}
  -.testC8 {text-rendering:optimizeLegibility;}
  -.testC9 {stroke:none;}
  -.testC10 {fill:url(#testpattern3);stroke:none;}
  -.testC11 {fill:url(#testpattern3);stroke:none;}
  -.testC12 {text-rendering:optimizeLegibility;}
  -.testC13 {stroke:none;}
  -.testC14 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
  +      <![CDATA[.testC1 {text-rendering:optimizeLegibility;stroke:url(#testpattern1);fill:url(#testpattern1);}
  +.testC2 {stroke:none;}
  +.testC3 {stroke:none;}
  +.testC4 {text-rendering:optimizeLegibility;}
  +.testC5 {stroke:none;}
  +.testC6 {fill:url(#testpattern2);stroke:none;}
  +.testC7 {fill:url(#testpattern2);stroke:none;}
  +.testC8 {text-rendering:optimizeLegibility;}
  +.testC9 {stroke:none;}
  +.testC10 {fill:url(#testpattern3);stroke:none;}
  +.testC11 {fill:url(#testpattern3);stroke:none;}
  +.testC12 {text-rendering:optimizeLegibility;}
  +.testC13 {stroke:none;}
  +.testC14 {stroke-dashoffset:0;text-rendering:auto;color-rendering:auto;stroke-linecap:square;fill:black;font-size:12;stroke-linejoin:miter;font-weight:normal;stroke:black;fill-opacity:1;font-style:normal;stroke-dasharray:none;stroke-miterlimit:10;color-interpolation:auto;image-rendering:auto;shape-rendering:auto;font-family:'Arial';stroke-width:1;stroke-opacity:1;}
   ]]>
       </style>
       <g>
         <defs id="testdefs1">
  -        <pattern x="0" y="0" width="20" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onRequest" id="testpattern1" height="20" preserveAspectRatio="xMidYMid meet" xlink:show="replace">
  -          <use xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" />
  +        <pattern x="0" y="0" width="20" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="testpattern1" height="20" preserveAspectRatio="xMidYMid meet" xlink:show="other">
  +          <use xlink:type="simple" xlink:actuate="onLoad" xlink:show="embed" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" />
           </pattern>
  -        <pattern x="10" y="10" width="20" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onRequest" id="testpattern2" height="20" preserveAspectRatio="xMidYMid meet" xlink:show="replace">
  -          <use xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" />
  +        <pattern x="10" y="10" width="20" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="testpattern2" height="20" preserveAspectRatio="xMidYMid meet" xlink:show="other">
  +          <use xlink:type="simple" xlink:actuate="onLoad" xlink:show="embed" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" />
           </pattern>
  -        <pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onRequest" id="testpattern3" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="replace">
  -          <use xlink:type="simple" xlink:actuate="onRequest" xlink:show="replace" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" />
  +        <pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="testpattern3" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other">
  +          <use xlink:type="simple" xlink:actuate="onLoad" xlink:show="embed" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" />
           </pattern>
           <font horiz-adv-x="75.0" id="testfont1">
             <font-face ascent="92.163086" descent="19.555664" units-per-em="100" font-family="Arial" font-style="normal" font-weight="normal" />
  @@ -57,9 +57,9 @@
             <glyph unicode="l" horiz-adv-x="22.216797" d="M6.3906 0 L6.3906 71.5781 L15.1875 71.5781 L15.1875 0 L6.3906 0 Z" />
           </font>
           <image width="20" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAALklEQVR42mP8z8AA
  -RIQBIwNxgImBymDUwFEDB4OBoAxAVE75/380DEcNHMEGAgA9ZQUjAKh+SgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onRequest" height="20" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +RIQBIwNxgImBymDUwFEDB4OBoAxAVE75/380DEcNHMEGAgA9ZQUjAKh+SgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="20" id="testimage1" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
           <image width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAI0lEQVR42mP8z8AA
  -RKiAkQETMDEQCQZQIcjdGJ75/39oegYAdDoFDw5zppEAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onRequest" height="10" id="testimage2" preserveAspectRatio="xMidYMid meet" xlink:show="replace" />
  +RKiAkQETMDEQCQZQIcjdGJ75/39oegYAdDoFDw5zppEAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="10" id="testimage2" preserveAspectRatio="xMidYMid meet" xlink:show="embed" />
         </defs>
         <g class="testC1" transform="translate(0,20)">
           <rect width="80" x="0" height="80" y="0" class="testC2" />
  
  
  
  1.8       +11 -11    xml-batik/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.jar
  
  	<<Binary file>>
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org


Mime
View raw message