tkormann 02/02/07 04:44:53 Modified: samples mathMetal.svg sunRise.svg test-references/samples mathMetal.png test-references/samples/tests/spec/structure useTargets.png test-resources/org/apache/batik/test samplesRendering.xml Added: samples/tests/spec/structure useTargets2.svg test-references/samples/tests/spec/structure useTargets2.png Log: - update sunRise.svg and mathMetal.svg according to the use fix - add a new test useTargets2 and its reference image - add this test to regard Revision Changes Path 1.3 +3 -3 xml-batik/samples/mathMetal.svg Index: mathMetal.svg =================================================================== RCS file: /home/cvs/xml-batik/samples/mathMetal.svg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mathMetal.svg 2 Jan 2002 21:21:16 -0000 1.2 +++ mathMetal.svg 7 Feb 2002 12:44:52 -0000 1.3 @@ -16,7 +16,7 @@ <!-- --> <!-- @author [EMAIL PROTECTED] for the MathML formula --> <!-- @author [EMAIL PROTECTED] for the filter effects --> -<!-- @version $Id: mathMetal.svg,v 1.2 2002/01/02 21:21:16 deweese Exp $ --> +<!-- @version $Id: mathMetal.svg,v 1.3 2002/02/07 12:44:52 tkormann Exp $ --> <!-- ========================================================================= --> <?xml-stylesheet type="text/css" href="tests/resources/style/test.css" ?> @@ -280,7 +280,7 @@ <rect x="-5%" width="110%" height="185" /> <circle cx="50%" cy="140" r="85" /> <use xlink:href="#arrow" x="225" y="260"/> - <use xlink:href="#arrow" x="225" y="460" transform="rotate(180)"/> + <use xlink:href="#arrow" transform="translate(225 460) rotate(180)"/> <use xlink:href="#plate" x="225" y="360" /> <!-- <circle cx="55" cy="328" r="10" fill="white" /> <circle cx="55" cy="395" r="10" fill="white" /> @@ -399,6 +399,6 @@ <use xlink:href="#graphics" fill="gray" filter="url(#shadow)"/> <text text-anchor="middle" font-size="80" font-family="embedZeroHour" x="50%" y="120" fill="black" filter="url(#recessed)">MATH</text> - <use xlink:href="#formula" x="225" y="360" transform="scale(.7)" fill="black" color="black" filter="url(#carved)"/> + <use xlink:href="#formula" transform="translate(225 360) scale(.7)" fill="black" color="black" filter="url(#carved)"/> </svg> 1.5 +3 -3 xml-batik/samples/sunRise.svg Index: sunRise.svg =================================================================== RCS file: /home/cvs/xml-batik/samples/sunRise.svg,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sunRise.svg 3 Dec 2001 19:50:15 -0000 1.4 +++ sunRise.svg 7 Feb 2002 12:44:52 -0000 1.5 @@ -12,7 +12,7 @@ <!-- ========================================================================= --> <!-- @author [EMAIL PROTECTED] --> -<!-- @version $Id: sunRise.svg,v 1.4 2001/12/03 19:50:15 vhardy Exp $ --> +<!-- @version $Id: sunRise.svg,v 1.5 2002/02/07 12:44:52 tkormann Exp $ --> <!-- ========================================================================= --> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="body" width="450" height="500" viewBox="0 0 450 500"> @@ -391,8 +391,8 @@ <g id="sun" filter="url(#blur)"> <circle cx="140" cy="620" r="50" fill="white" /> </g> - <use x="140" y="620" xlink:href="#boomingStar" transform="scale(2, 2)"/> - <use x="140" y="620" xlink:href="#boomingStar" transform="scale(3, 3) rotate(30)" opacity=".5"/> + <use xlink:href="#boomingStar" transform="translate(140 620) scale(2, 2)"/> + <use xlink:href="#boomingStar" transform="translate(140 620) scale(3, 3) rotate(30)" opacity=".5"/> <circle cx="-450" cy="1000" r="700" fill="url(#planetGradient)" fill-opacity="1"/> </g> 1.1 xml-batik/samples/tests/spec/structure/useTargets2.svg Index: useTargets2.svg =================================================================== <?xml version="1.0" standalone="no"?> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> <!-- ========================================================================= --> <!-- Copyright (C) The Apache Software Foundation. All rights reserved. --> <!-- --> <!-- This software is published under the terms of the Apache Software License --> <!-- version 1.1, a copy of which has been included with this distribution in --> <!-- the LICENSE file. --> <!-- ========================================================================= --> <!-- ========================================================================= --> <!-- use targets --> <!-- --> <!-- @author [EMAIL PROTECTED] --> <!-- @version $Id: useTargets2.svg,v 1.1 2002/02/07 12:44:52 tkormann Exp $ --> <!-- ========================================================================= --> <?xml-stylesheet type="text/css" href="../../resources/style/test.css" ?> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="450" height="500" viewBox="0 0 450 500"> <title><use> Targets2</title> <!-- ============================================================= --> <!-- Test content --> <!-- ============================================================= --> <text x="225" y="50" class="title"><use> Targets 2</text> <g id="testContent" transform="translate(0 40)"> <defs> <symbol id="symbol" viewBox="-100 -100 200 200" style="stroke:crimson; stroke-width:8"> <rect x="-100" y="-100" width="100%" height="100%" style="fill:crimson; stroke:none"/> <circle cx="0" cy="0" r="25%" style="fill:orange; stroke:gold"/> </symbol> <svg id="svg" viewBox="-100 -100 200 200" style="stroke:crimson; stroke-width:8"> <rect x="-100" y="-100" width="100%" height="100%" style="fill:crimson; stroke:none"/> <circle cx="0" cy="0" r="25%" style="fill:orange; stroke:gold"/> </svg> </defs> <g id="board"> <rect x="10" y="60" width="430" height="20" style="fill:#aaa; stroke:black" /> <rect x="10" y="80" width="430" height="100" style="fill:#eee; stroke:black" /> <text x="20" y="74"><use> references a <symbol></text> <g transform="translate(0 150)"> <rect x="10" y="60" width="430" height="20" style="fill:#aaa; stroke:black" /> <rect x="10" y="80" width="430" height="100" style="fill:#eee; stroke:black" /> <text x="20" y="74"><use> references a <svg></text> </g> </g> <!-- ################################################### --> <!-- use references symbol --> <!-- ################################################### --> <!-- svg width x,y and transform --> <use x="1000" y="1000" width="100" height="100" xlink:href="#symbol" transform="translate(50 100) scale(.5) translate(-1000 -1000)"/> <rect x="48" y="98" width="4" height="4" style="fill:blue" /> <text x="75" y="170" style="text-anchor:middle">x, y, w, h, transform</text> <!-- svg width transform --> <g transform="translate(150 0)"> <use width="100" height="100" xlink:href="#symbol" transform="translate(50 100) scale(.5)"/> <rect x="48" y="98" width="4" height="4" style="fill:blue" /> <text x="75" y="170" style="text-anchor:middle">w, h, transform</text> </g> <!-- equivalent svg --> <g transform="translate(300 0)"> <g transform="translate(50 100) scale(.5) translate(-1000 -1000) translate(1000 1000)"> <svg width="100" height="100" viewBox="-100 -100 200 200" style="stroke:crimson; stroke-width:8"> <rect x="-100" y="-100" width="100%" height="100%" style="fill:crimson; stroke:none"/> <circle cx="0" cy="0" r="25%" style="fill:orange; stroke:gold"/> </svg> </g> <rect x="48" y="98" width="4" height="4" style="fill:blue" /> <text x="75" y="170" style="text-anchor:middle">equivalent svg</text> </g> <!-- ################################################### --> <!-- use references svg --> <!-- ################################################### --> <!-- svg width x,y and transform --> <g transform="translate(0 150)"> <use x="1000" y="1000" width="100" height="100" xlink:href="#svg" transform="translate(50 100) scale(.5) translate(-1000 -1000)"/> <rect x="48" y="98" width="4" height="4" style="fill:blue" /> <text x="75" y="170" style="text-anchor:middle">x, y, w, h, transform</text> </g> <!-- svg width transform --> <g transform="translate(150 150)"> <use width="100" height="100" xlink:href="#svg" transform="translate(50 100) scale(.5)"/> <rect x="48" y="98" width="4" height="4" style="fill:blue" /> <text x="75" y="170" style="text-anchor:middle">w, h, transform</text> </g> <!-- equivalent svg --> <g transform="translate(300 150)"> <g transform="translate(50 100) scale(.5) translate(-1000 -1000) translate(1000 1000)"> <svg width="100" height="100" viewBox="-100 -100 200 200" style="stroke:crimson; stroke-width:8"> <rect x="-100" y="-100" width="100%" height="100%" style="fill:crimson; stroke:none"/> <circle cx="0" cy="0" r="25%" style="fill:orange; stroke:gold"/> </svg> </g> <rect x="48" y="98" width="4" height="4" style="fill:blue" /> <text x="75" y="170" style="text-anchor:middle">equivalent svg</text> </g> </g> <!-- ============================================================= --> <!-- Batik sample mark --> <!-- ============================================================= --> <use xlink:href="../../../batikLogo.svg#Batik_Tag_Box" /> </svg> 1.3 +812 -819 xml-batik/test-references/samples/mathMetal.png <<Binary file>> 1.3 +64 -54 xml-batik/test-references/samples/tests/spec/structure/useTargets.png <<Binary file>> 1.1 xml-batik/test-references/samples/tests/spec/structure/useTargets2.png <<Binary file>> 1.60 +2 -1 xml-batik/test-resources/org/apache/batik/test/samplesRendering.xml Index: samplesRendering.xml =================================================================== RCS file: /home/cvs/xml-batik/test-resources/org/apache/batik/test/samplesRendering.xml,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- samplesRendering.xml 19 Dec 2001 16:20:16 -0000 1.59 +++ samplesRendering.xml 7 Feb 2002 12:44:53 -0000 1.60 @@ -8,7 +8,7 @@ <!-- ========================================================================= --> <!-- @author [EMAIL PROTECTED] --> -<!-- @version $Id: samplesRendering.xml,v 1.59 2001/12/19 16:20:16 tkormann Exp $ --> +<!-- @version $Id: samplesRendering.xml,v 1.60 2002/02/07 12:44:53 tkormann Exp $ --> <!-- ========================================================================= --> <testSuite id="samplesRendering" name="samples and samples/test Rendering" class="org.apache.batik.test.svg.SamplesRenderingTest"> @@ -189,6 +189,7 @@ <test id="samples/tests/spec/structure/useStyling.svg" /> <test id="samples/tests/spec/structure/useStylingURI.svg" /> <test id="samples/tests/spec/structure/useTargets.svg" /> + <test id="samples/tests/spec/structure/useTargets2.svg" /> <test id="samples/tests/spec/structure/xmlBase.svg" /> <test id="samples/tests/spec/structure/xmlBaseStyling.svg" /> <test id="samples/tests/spec/structure/requiredFeatures.svg" />
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]