deweese 2003/03/10 11:09:00
Modified: samples 3D.svg
samples/tests/spec/fonts batikFont.svg
sources/org/apache/batik/bridge SVGGlyphElementBridge.java
SVGSVGElementBridge.java SVGUseElementBridge.java
sources/org/apache/batik/gvt CanvasGraphicsNode.java
Log:
1) Fixed Squiggle in 3D.svg
2) Fixed a bug involving the 'use' element with width/height in
SVGFont's referenced from external documents (you know your 99% case).
Revision Changes Path
1.4 +3 -2 xml-batik/samples/3D.svg
Index: 3D.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/3D.svg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 3D.svg 7 Mar 2002 09:02:56 -0000 1.3
+++ 3D.svg 10 Mar 2003 19:08:57 -0000 1.4
@@ -488,6 +488,7 @@
<!-- ============================================================= -->
<!-- Batik sample mark -->
<!-- ============================================================= -->
- <use transform="translate(598,447) scale(0.5, 0.5)"
xlink:href="batikLogo.svg#Batik_Squiggle" />
+ <use transform="translate(598,447)" width="27" height="28"
+ xlink:href="batikLogo.svg#Batik_Squiggle" />
</svg>
1.5 +5 -5 xml-batik/samples/tests/spec/fonts/batikFont.svg
Index: batikFont.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/fonts/batikFont.svg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- batikFont.svg 10 Mar 2003 16:53:08 -0000 1.4
+++ batikFont.svg 10 Mar 2003 19:08:57 -0000 1.5
@@ -69,7 +69,10 @@
<glyph unicode=" " glyph-name=" " horiz-adv-x="100"/>
<glyph id="B" unicode="B" glyph-name="B" horiz-adv-x="130">
- <g transform="scale(1,-1)translate(0,-170)">
+ <g transform="scale(1,-1) translate(0,-170)">
+ <!-- Put the Squiggle in the B -->
+ <use xlink:href="#Batik_Squiggle"
+ x="45" y="103" width="54" height="57"/>
<path
d="M21.244,141.963V40.831c0-6.188-0.57-10.773-1.707-13.754c-1.137-2.977-3.066-5.461-5.793-7.449c-1.137-0.766-2.367-1.395-3.695-1.891s-3.012-0.938-5.055-1.32c-2.125-0.371-3.488-0.781-4.094-1.23s-0.906-1.121-0.906-2.02
c0-1.195,0.32-2.035,0.969-2.52c0.645-0.484,1.953-0.73,3.93-0.73c0.758,0,3.816,0.211,9.176,0.625c5.355,0.418,10.387,0.625,15.098,0.625c2.961,0,7.883-0.207,14.758-0.625c6.875-0.414,12.324-0.625,16.352-0.625c16.711,0,29.762,3.461,39.145,10.379
s14.074,16.574,14.074,28.965c0,7.148-1.793,13.418-5.375,18.816c-3.586,5.398-9,9.996-16.242,13.797v2.18c11.574,2.051,20.445,6.547,26.613,13.492s9.254,15.879,9.254,26.805c0,15.406-5.184,27.645-15.551,36.715s-24.473,13.602-42.316,13.602
@@ -78,9 +81,6 @@
c12.023,0,20.758-2.031,26.203-6.098c5.441-4.066,8.164-10.508,8.164-19.324c0-10.945-4.188-20.027-12.559-27.246c-8.375-7.219-18.914-10.832-31.625-10.832c-5.711,0-9.441,0.855-11.191,2.566s-2.625,5.148-2.625,10.316v42.41z
M39.244,150.737
c0,6.539,1.789,10.953,5.371,13.242c3.578,2.293,11.16,3.438,22.746,3.438c14.172,0,24.82-3.031,31.945-9.094s10.688-15.156,10.688-27.281c0-13.031-4.234-23.188-12.695-30.461s-20.316-10.914-35.563-10.914H47.463c-3.578,0-5.84,0.477-6.793,1.426
s-1.426,3.285-1.426,7.004v52.641z"/>
- <!-- Put the Squiggle in the B -->
- <use xlink:href="#Batik_Squiggle" width="54" height="57"
- transform="translate(45,103)" />
</g>
</glyph>
1.7 +2 -2
xml-batik/sources/org/apache/batik/bridge/SVGGlyphElementBridge.java
Index: SVGGlyphElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGGlyphElementBridge.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGGlyphElementBridge.java 8 Nov 2001 23:02:42 -0000 1.6
+++ SVGGlyphElementBridge.java 10 Mar 2003 19:08:57 -0000 1.7
@@ -170,7 +170,7 @@
Element childElement = (Element)childNode;
GraphicsNode childGraphicsNode =
builder.build(ctx, childElement);
- glyphChildrenNode.add(childGraphicsNode);
+ glyphChildrenNode.add(childGraphicsNode);
}
}
glyphContentNode.add(glyphChildrenNode);
1.32 +8 -2
xml-batik/sources/org/apache/batik/bridge/SVGSVGElementBridge.java
Index: SVGSVGElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGSVGElementBridge.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- SVGSVGElementBridge.java 24 Feb 2003 18:25:52 -0000 1.31
+++ SVGSVGElementBridge.java 10 Mar 2003 19:08:57 -0000 1.32
@@ -27,6 +27,7 @@
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
import org.w3c.dom.events.MutationEvent;
+import org.w3c.dom.svg.SVGDocument;
import org.w3c.dom.svg.SVGElement;
import org.w3c.dom.svg.SVGSVGElement;
@@ -75,7 +76,12 @@
UnitProcessor.Context uctx = UnitProcessor.createContext(ctx, e);
String s;
- boolean isOutermost = (((SVGElement)e).getOwnerSVGElement() == null);
+ // In some cases we converted document fragments which didn't
+ // have a parent SVG element, this check makes sure only the
+ // real root of the SVG Document tries to do negotiation with
+ // the UA.
+ SVGDocument doc = (SVGDocument)((SVGElement)e).getOwnerDocument();
+ boolean isOutermost = (doc.getRootElement() == e);
float x = 0;
float y = 0;
// x and y have no meaning on the outermost 'svg' element
1.29 +5 -5
xml-batik/sources/org/apache/batik/bridge/SVGUseElementBridge.java
Index: SVGUseElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGUseElementBridge.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SVGUseElementBridge.java 4 Mar 2003 12:11:57 -0000 1.28
+++ SVGUseElementBridge.java 10 Mar 2003 19:08:57 -0000 1.29
@@ -69,10 +69,10 @@
* @return a graphics node that represents the specified element
*/
public GraphicsNode createGraphicsNode(BridgeContext ctx, Element e) {
- // 'requiredFeatures', 'requiredExtensions' and 'systemLanguage'
- if (!SVGUtilities.matchUserAgent(e, ctx.getUserAgent())) {
- return null;
- }
+ // 'requiredFeatures', 'requiredExtensions' and 'systemLanguage'
+ if (!SVGUtilities.matchUserAgent(e, ctx.getUserAgent())) {
+ return null;
+ }
// get the referenced element
String uri = XLinkSupport.getXLinkHref(e);
1.7 +2 -1 xml-batik/sources/org/apache/batik/gvt/CanvasGraphicsNode.java
Index: CanvasGraphicsNode.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/CanvasGraphicsNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CanvasGraphicsNode.java 24 Feb 2003 18:25:53 -0000 1.6
+++ CanvasGraphicsNode.java 10 Mar 2003 19:09:00 -0000 1.7
@@ -133,6 +133,7 @@
public AffineTransform getViewingTransform() {
return viewingTransform;
}
+
//
// Drawing methods
//
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
