vhardy 01/11/19 07:11:36
Modified: test-resources/org/apache/batik/svggen regsvggen.xml
Added: test-references/org/apache/batik/svggen
ContextTransformCollapse.svg TransformCollapse.svg
test-references/org/apache/batik/svggen/rendering
ContextTransformCollapse.png TransformCollapse.png
Log:
Regression test on transform concatenation (i.e., two successive translate should
collapse into one etc.).
Revision Changes Path
1.14 +2 -1 xml-batik/test-resources/org/apache/batik/svggen/regsvggen.xml
Index: regsvggen.xml
===================================================================
RCS file: /home/cvs/xml-batik/test-resources/org/apache/batik/svggen/regsvggen.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- regsvggen.xml 2001/11/19 13:47:43 1.13
+++ regsvggen.xml 2001/11/19 15:11:36 1.14
@@ -8,7 +8,7 @@
<!-- ========================================================================= -->
<!-- @author [EMAIL PROTECTED] -->
-<!-- @version $Id: regsvggen.xml,v 1.13 2001/11/19 13:47:43 vhardy Exp $ -->
+<!-- @version $Id: regsvggen.xml,v 1.14 2001/11/19 15:11:36 vhardy Exp $ -->
<!-- ========================================================================= -->
<testSuite id="svggen" name="SVGGraphics2D Accuracy Testing"
class="org.apache.batik.svggen.SVGGeneratorTests">
<test id="ATransform" />
@@ -36,4 +36,5 @@
<test id="ShearTest" />
<test id="Texture" />
<test id="TextSpacePreserve" />
+ <test id="TransformCollapse" />
</testSuite>
1.1
xml-batik/test-references/org/apache/batik/svggen/ContextTransformCollapse.svg
Index: ContextTransformCollapse.svg
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
<svg contentScriptType="text/ecmascript" width="300" zoomAndPan="magnify"
class="testC6" contentStyleType="text/css" height="400" preserveAspectRatio="xMidYMid
meet" xmlns="http://www.w3.org/2000/svg"; version="1.0">
<!--Generated by the Batik Test Framework. Test:éj-->
<defs id="genericDefs" />
<g>
<style type="text/css" xml:space="preserve">
<![CDATA[.testC1 {}
.testC2 {stroke:none;}
.testC3 {stroke:none;}
.testC4 {stroke:none;}
.testC5 {stroke:none;}
.testC6
{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">
<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" />
<missing-glyph horiz-adv-x="75.0" d="M12.5 0 L12.5 62.5 L62.5 62.5 L62.5 0
L12.5 0 ZM14.0625 1.5625 L60.9375 1.5625 L60.9375 60.9375 L14.0625 60.9375 L14.0625
1.5625 Z" />
<glyph unicode="p" horiz-adv-x="55.615234" d="M6.59375 -19.859375 L6.59375
51.859375 L14.59375 51.859375 L14.59375 45.125 Q17.4375 49.078125 21 51.0546875
Q24.5625 53.03125 29.640625 53.03125 Q36.28125 53.03125 41.359375 49.609375 Q46.4375
46.1875 49.0234375 39.9609375 Q51.609375 33.734375 51.609375 26.3125 Q51.609375
18.359375 48.7578125 11.984375 Q45.90625 5.609375 40.4609375 2.2265625 Q35.015625
-1.15625 29 -1.15625 Q24.609375 -1.15625 21.1171875 0.6953125 Q17.625 2.546875 15.375
5.375 L15.375 -19.859375 L6.59375 -19.859375 ZM14.546875 25.640625 Q14.546875 15.625
18.6015625 10.84375 Q22.65625 6.0625 28.421875 6.0625 Q34.28125 6.0625 38.453125
11.015625 Q42.625 15.96875 42.625 26.375 Q42.625 36.28125 38.546875 41.2109375
Q34.46875 46.140625 28.8125 46.140625 Q23.1875 46.140625 18.8671875 40.890625
Q14.546875 35.640625 14.546875 25.640625 Z" />
<glyph unicode="o" horiz-adv-x="55.615234" d="M3.328125 25.921875
Q3.328125 40.328125 11.328125 47.265625 Q18.015625 53.03125 27.640625 53.03125
Q38.328125 53.03125 45.1171875 46.0234375 Q51.90625 39.015625 51.90625 26.65625
Q51.90625 16.65625 48.90625 10.9140625 Q45.90625 5.171875 40.1640625 2.0078125
Q34.421875 -1.15625 27.640625 -1.15625 Q16.75 -1.15625 10.0390625 5.8203125 Q3.328125
12.796875 3.328125 25.921875 ZM12.359375 25.921875 Q12.359375 15.96875 16.703125
11.015625 Q21.046875 6.0625 27.640625 6.0625 Q34.1875 6.0625 38.53125 11.0390625
Q42.875 16.015625 42.875 26.21875 Q42.875 35.84375 38.5 40.796875 Q34.125 45.75
27.640625 45.75 Q21.046875 45.75 16.703125 40.8203125 Q12.359375 35.890625 12.359375
25.921875 Z" />
<glyph unicode="c" horiz-adv-x="50.0" d="M40.4375 19 L49.078125 17.875
Q47.65625 8.9375 41.8203125 3.890625 Q35.984375 -1.15625 27.484375 -1.15625 Q16.84375
-1.15625 10.375 5.796875 Q3.90625 12.75 3.90625 25.734375 Q3.90625 34.125 6.6875
40.4296875 Q9.46875 46.734375 15.15625 49.8828125 Q20.84375 53.03125 27.546875
53.03125 Q35.984375 53.03125 41.359375 48.7578125 Q46.734375 44.484375 48.25 36.625
L39.703125 35.296875 Q38.484375 40.53125 35.3828125 43.1640625 Q32.28125 45.796875
27.875 45.796875 Q21.234375 45.796875 17.0859375 41.0390625 Q12.9375 36.28125 12.9375
25.984375 Q12.9375 15.53125 16.9453125 10.796875 Q20.953125 6.0625 27.390625 6.0625
Q32.5625 6.0625 36.03125 9.234375 Q39.5 12.40625 40.4375 19 Z" />
<glyph unicode=" " horiz-adv-x="27.783203" d="" />
<glyph unicode="e" horiz-adv-x="55.615234" d="M42.09375 16.703125
L51.171875 15.578125 Q49.03125 7.625 43.21875 3.234375 Q37.40625 -1.15625 28.375
-1.15625 Q17 -1.15625 10.328125 5.84375 Q3.65625 12.84375 3.65625 25.484375 Q3.65625
38.578125 10.3984375 45.8046875 Q17.140625 53.03125 27.875 53.03125 Q38.28125 53.03125
44.875 45.953125 Q51.46875 38.875 51.46875 26.03125 Q51.46875 25.25 51.421875 23.6875
L12.75 23.6875 Q13.234375 15.140625 17.578125 10.6015625 Q21.921875 6.0625 28.421875
6.0625 Q33.25 6.0625 36.671875 8.6015625 Q40.09375 11.140625 42.09375 16.703125
ZM13.234375 30.90625 L42.1875 30.90625 Q41.609375 37.453125 38.875 40.71875 Q34.671875
45.796875 27.984375 45.796875 Q21.921875 45.796875 17.796875 41.75 Q13.671875
37.703125 13.234375 30.90625 Z" />
<glyph unicode="l" horiz-adv-x="22.216797" d="M6.390625 0 L6.390625
71.578125 L15.1875 71.578125 L15.1875 0 L6.390625 0 Z" />
<glyph unicode="s" horiz-adv-x="50.0" d="M3.078125 15.484375 L11.765625
16.84375 Q12.5 11.625 15.84375 8.84375 Q19.1875 6.0625 25.203125 6.0625 Q31.25 6.0625
34.1796875 8.5234375 Q37.109375 10.984375 37.109375 14.3125 Q37.109375 17.28125
34.515625 19 Q32.71875 20.171875 25.53125 21.96875 Q15.875 24.421875 12.140625
26.203125 Q8.40625 27.984375 6.4765625 31.1328125 Q4.546875 34.28125 4.546875 38.09375
Q4.546875 41.546875 6.1328125 44.5078125 Q7.71875 47.46875 10.453125 49.421875 Q12.5
50.921875 16.0390625 51.9765625 Q19.578125 53.03125 23.640625 53.03125 Q29.734375
53.03125 34.3515625 51.2734375 Q38.96875 49.515625 41.1640625 46.5078125 Q43.359375
43.5 44.1875 38.484375 L35.59375 37.3125 Q35.015625 41.3125 32.203125 43.5546875
Q29.390625 45.796875 24.265625 45.796875 Q18.21875 45.796875 15.625 43.796875
Q13.03125 41.796875 13.03125 39.109375 Q13.03125 37.40625 14.109375 36.03125 Q15.1875
34.625 17.484375 33.6875 Q18.796875 33.203125 25.25 31.453125 Q34.578125 28.953125
38.2578125 27.3671875 Q41.9375 25.78125 44.0390625 22.7578125 Q46.140625 19.734375
46.140625 15.234375 Q46.140625 10.84375 43.578125 6.9609375 Q41.015625 3.078125
36.1796875 0.9609375 Q31.34375 -1.15625 25.25 -1.15625 Q15.140625 -1.15625 9.84375
3.0390625 Q4.546875 7.234375 3.078125 15.484375 Z" />
<glyph unicode="n" horiz-adv-x="55.615234" d="M6.59375 0 L6.59375
51.859375 L14.5 51.859375 L14.5 44.484375 Q20.21875 53.03125 31 53.03125 Q35.6875
53.03125 39.625 51.34375 Q43.5625 49.65625 45.515625 46.921875 Q47.46875 44.1875 48.25
40.4375 Q48.734375 37.984375 48.734375 31.890625 L48.734375 0 L39.9375 0 L39.9375
31.546875 Q39.9375 36.921875 38.9140625 39.578125 Q37.890625 42.234375 35.28125
43.8203125 Q32.671875 45.40625 29.15625 45.40625 Q23.53125 45.40625 19.453125 41.84375
Q15.375 38.28125 15.375 28.328125 L15.375 0 L6.59375 0 Z" />
<glyph unicode="a" horiz-adv-x="55.615234" d="M40.4375 6.390625 Q35.546875
2.25 31.03125 0.546875 Q26.515625 -1.15625 21.34375 -1.15625 Q12.796875 -1.15625
8.203125 3.0078125 Q3.609375 7.171875 3.609375 13.671875 Q3.609375 17.484375 5.34375
20.6328125 Q7.078125 23.78125 9.890625 25.6875 Q12.703125 27.59375 16.21875 28.5625
Q18.796875 29.25 24.03125 29.890625 Q34.671875 31.15625 39.703125 32.90625 Q39.75
34.71875 39.75 35.203125 Q39.75 40.578125 37.25 42.78125 Q33.890625 45.75 27.25 45.75
Q21.046875 45.75 18.09375 43.578125 Q15.140625 41.40625 13.71875 35.890625 L5.125
37.0625 Q6.296875 42.578125 8.984375 45.96875 Q11.671875 49.359375 16.75 51.1953125
Q21.828125 53.03125 28.515625 53.03125 Q35.15625 53.03125 39.3046875 51.46875
Q43.453125 49.90625 45.40625 47.5390625 Q47.359375 45.171875 48.140625 41.546875
Q48.578125 39.3125 48.578125 33.453125 L48.578125 21.734375 Q48.578125 9.46875
49.140625 6.2265625 Q49.703125 2.984375 51.375 0 L42.1875 0 Q40.828125 2.734375
40.4375 6.390625 ZM39.703125 26.03125 Q34.90625 24.078125 25.34375 22.703125
Q19.921875 21.921875 17.6796875 20.9453125 Q15.4375 19.96875 14.2109375 18.09375
Q12.984375 16.21875 12.984375 13.921875 Q12.984375 10.40625 15.6484375 8.0625 Q18.3125
5.71875 23.4375 5.71875 Q28.515625 5.71875 32.46875 7.9375 Q36.421875 10.15625
38.28125 14.015625 Q39.703125 17 39.703125 22.796875 L39.703125 26.03125 Z" />
<glyph unicode="r" horiz-adv-x="33.30078" d="M6.5 0 L6.5 51.859375
L14.40625 51.859375 L14.40625 44 Q17.4375 49.515625 20 51.2734375 Q22.5625 53.03125
25.640625 53.03125 Q30.078125 53.03125 34.671875 50.203125 L31.640625 42.046875
Q28.421875 43.953125 25.203125 43.953125 Q22.3125 43.953125 20.015625 42.21875
Q17.71875 40.484375 16.75 37.40625 Q15.28125 32.71875 15.28125 27.15625 L15.28125 0
L6.5 0 Z" />
<glyph unicode="t" horiz-adv-x="27.783203" d="M25.78125 7.859375
L27.046875 0.09375 Q23.34375 -0.671875 20.40625 -0.671875 Q15.625 -0.671875 12.9921875
0.8359375 Q10.359375 2.34375 9.28125 4.8125 Q8.203125 7.28125 8.203125 15.1875
L8.203125 45.015625 L1.765625 45.015625 L1.765625 51.859375 L8.203125 51.859375
L8.203125 64.703125 L16.9375 69.96875 L16.9375 51.859375 L25.78125 51.859375 L25.78125
45.015625 L16.9375 45.015625 L16.9375 14.703125 Q16.9375 10.9375 17.40625 9.8671875
Q17.875 8.796875 18.921875 8.15625 Q19.96875 7.515625 21.921875 7.515625 Q23.390625
7.515625 25.78125 7.859375 Z" />
<glyph unicode="y" horiz-adv-x="50.0" d="M6.203125 -19.953125 L5.21875
-11.703125 Q8.109375 -12.484375 10.25 -12.484375 Q13.1875 -12.484375 14.9453125
-11.5078125 Q16.703125 -10.53125 17.828125 -8.78125 Q18.65625 -7.453125 20.515625
-2.234375 Q20.75 -1.5 21.296875 -0.078125 L1.609375 51.859375 L11.078125 51.859375
L21.875 21.828125 Q23.96875 16.109375 25.640625 9.8125 Q27.15625 15.875 29.25 21.625
L40.328125 51.859375 L49.125 51.859375 L29.390625 -0.859375 Q26.21875 -9.40625
24.46875 -12.625 Q22.125 -16.984375 19.09375 -19.0078125 Q16.0625 -21.03125 11.859375
-21.03125 Q9.328125 -21.03125 6.203125 -19.953125 Z" />
<glyph unicode="d" horiz-adv-x="55.615234" d="M40.234375 0 L40.234375
6.546875 Q35.296875 -1.15625 25.734375 -1.15625 Q19.53125 -1.15625 14.328125 2.2578125
Q9.125 5.671875 6.2734375 11.796875 Q3.421875 17.921875 3.421875 25.875 Q3.421875
33.640625 6.0078125 39.96875 Q8.59375 46.296875 13.7734375 49.6640625 Q18.953125
53.03125 25.34375 53.03125 Q30.03125 53.03125 33.6953125 51.0546875 Q37.359375
49.078125 39.65625 45.90625 L39.65625 71.578125 L48.390625 71.578125 L48.390625 0
L40.234375 0 ZM12.453125 25.875 Q12.453125 15.921875 16.6484375 10.9921875 Q20.84375
6.0625 26.5625 6.0625 Q32.328125 6.0625 36.3515625 10.7734375 Q40.375 15.484375 40.375
25.140625 Q40.375 35.796875 36.2734375 40.7734375 Q32.171875 45.75 26.171875 45.75
Q20.3125 45.75 16.3828125 40.96875 Q12.453125 36.1875 12.453125 25.875 Z" />
<glyph unicode="i" horiz-adv-x="22.216797" d="M6.640625 61.46875 L6.640625
71.578125 L15.4375 71.578125 L15.4375 61.46875 L6.640625 61.46875 ZM6.640625 0
L6.640625 51.859375 L15.4375 51.859375 L15.4375 0 L6.640625 0 Z" />
</font>
</defs>
<g class="testC1" transform="translate(30,40)">
<text xml:space="preserve" x="0" y="0" class="testC2">translate collapse
</text>
<text xml:space="preserve" x="10" y="10" class="testC3"
transform="scale(4,8)">scale collapse
</text>
<text xml:space="preserve" x="0" y="40" class="testC4"
transform="rotate(30.000000000000004)">rotate collapse
</text>
<text xml:space="preserve" x="0" y="80" class="testC5">identity
</text>
</g>
</g>
</g>
</svg>
1.1
xml-batik/test-references/org/apache/batik/svggen/TransformCollapse.svg
Index: TransformCollapse.svg
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
<svg stroke-dasharray="none" shape-rendering="auto"
xmlns="http://www.w3.org/2000/svg"; font-family="'Arial'" width="300"
text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript"
color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet"
font-size="12" fill="black" stroke="black" image-rendering="auto"
stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square"
stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="400"
stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">
<!--Generated by the Batik Graphics2D SVG Generator-->
<defs id="genericDefs" />
<g>
<g transform="translate(30,40)">
<text xml:space="preserve" x="0" y="0" stroke="none">translate collapse
</text>
<text xml:space="preserve" x="10" y="10" transform="scale(4,8)"
stroke="none">scale collapse
</text>
<text xml:space="preserve" x="0" y="40" transform="rotate(30.000000000000004)"
stroke="none">rotate collapse
</text>
<text xml:space="preserve" x="0" y="80" stroke="none">identity
</text>
</g>
</g>
</svg>
1.1
xml-batik/test-references/org/apache/batik/svggen/rendering/ContextTransformCollapse.png
<<Binary file>>
1.1
xml-batik/test-references/org/apache/batik/svggen/rendering/TransformCollapse.png
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
