tkormann 02/02/06 09:26:29
Modified: samples/tests/spec/structure useTargets.svg xmlBase.svg
sources/org/apache/batik/bridge SVGUseElementBridge.java
Log:
fix bug 6172.
combined x,y and trasform on <use> now works as supposed to.
2 tests changed due to the modification.
2 tests need to be changed (mathMetal and sunRise).
Revision Changes Path
1.5 +5 -5 xml-batik/samples/tests/spec/structure/useTargets.svg
Index: useTargets.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/structure/useTargets.svg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- useTargets.svg 20 Nov 2001 15:08:26 -0000 1.4
+++ useTargets.svg 6 Feb 2002 17:26:29 -0000 1.5
@@ -14,7 +14,7 @@
<!-- Alternate stylesheets -->
<!-- -->
<!-- @author [EMAIL PROTECTED] -->
-<!-- @version $Id: useTargets.svg,v 1.4 2001/11/20 15:08:26 hillion Exp $ -->
+<!-- @version $Id: useTargets.svg,v 1.5 2002/02/06 17:26:29 tkormann Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="../../resources/style/test.css" ?>
@@ -81,8 +81,8 @@
<use xlink:href="#svg" x="115" y="230" width="75" height="75" style="fill:orange" />
<rect x="115" y="230" width="75" height="75" style="stroke:black; fill:none;" />
-<use xlink:href="#other" x="115" y="330" width="75" height="75" style="fill:orange"
- transform="translate(38 38) scale(.75)"/>
+<use xlink:href="#other" x="115" y="330" style="fill:orange"
+ transform="translate(152.5, 367.5) scale(.75) translate(-115 -330)"/>
<rect x="115" y="330" width="75" height="75" style="stroke:black; fill:none;" />
@@ -93,8 +93,8 @@
<use xlink:href="../../resources/svg/defs.svg#extSvg" x="265" y="230" width="75"
height="75" style="fill:orange" />
<rect x="265" y="230" width="75" height="75" style="stroke:black; fill:none;" />
-<use xlink:href="../../resources/svg/defs.svg#extOther" x="265" y="330" width="75"
height="75" style="fill:orange"
- transform="translate(38 38) scale(.75)"/>
+<use xlink:href="../../resources/svg/defs.svg#extOther" x="265" y="330"
style="fill:orange"
+ transform="translate(302.5, 367.5) scale(.75) translate(-265, -330)"/>
<rect x="265" y="330" width="75" height="75" style="stroke:black; fill:none;" />
</g>
1.5 +4 -3 xml-batik/samples/tests/spec/structure/xmlBase.svg
Index: xmlBase.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/structure/xmlBase.svg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmlBase.svg 20 Nov 2001 15:08:26 -0000 1.4
+++ xmlBase.svg 6 Feb 2002 17:26:29 -0000 1.5
@@ -15,7 +15,7 @@
<!-- xml:base processing test. -->
<!-- -->
<!-- @author [EMAIL PROTECTED] -->
-<!-- @version $Id: xmlBase.svg,v 1.4 2001/11/20 15:08:26 hillion Exp $ -->
+<!-- @version $Id: xmlBase.svg,v 1.5 2002/02/06 17:26:29 tkormann Exp $ -->
<!-- ====================================================================== -->
<?xml-stylesheet type="text/css" href="../../resources/style/test.css" ?>
@@ -33,7 +33,7 @@
Test of xml:base, use and SVG fonts
</text>
- <use transform="scale(.5)" x="25" y="200"
+ <use transform="translate(25, 200) scale(.5)"
xlink:href="#Batik_Logo_Shadow" />
@@ -49,9 +49,10 @@
</g> <!-- End Batik_Logo_Shadow -->
<g xml:base="tests/">
- <use x="250" y="350" transform="scale(.5)"
+ <use transform="translate(250 350) scale(.5)"
xlink:href="../batikLogo.svg#Batik_Logo_Shadow" />
</g>
</g>
+
<use xlink:href="../../../batikLogo.svg#Batik_Tag_Box" />
</svg>
1.16 +2 -2
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SVGUseElementBridge.java 23 Jan 2002 14:14:07 -0000 1.15
+++ SVGUseElementBridge.java 6 Feb 2002 17:26:29 -0000 1.16
@@ -33,7 +33,7 @@
* Bridge class for the <use> element.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: SVGUseElementBridge.java,v 1.15 2002/01/23 14:14:07 deweese Exp $
+ * @version $Id: SVGUseElementBridge.java,v 1.16 2002/02/06 17:26:29 tkormann Exp $
*/
public class SVGUseElementBridge extends AbstractSVGBridge
implements GraphicsNodeBridge, ErrorConstants {
@@ -168,7 +168,7 @@
// 'transform'
if (s.length() != 0) {
- at.concatenate
+ at.preConcatenate
(SVGUtilities.convertTransform(e, SVG_TRANSFORM_ATTRIBUTE, s));
}
gn.setTransform(at);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
