You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by de...@apache.org on 2005/09/25 21:53:33 UTC

svn commit: r291468 [19/19] - in /xmlgraphics/batik/trunk: ./ samples/tests/resources/wmf/ sources/org/apache/batik/ext/awt/geom/ sources/org/apache/batik/svggen/ sources/org/apache/batik/transcoder/ sources/org/apache/batik/transcoder/wmf/ sources/org...

Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Paints.svg
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Paints.svg?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Paints.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Paints.svg Sun Sep 25 12:51:54 2005
@@ -1,32 +1,36 @@
 <?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 fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0">
-  <!--Generated by the Batik Graphics2D SVG Generator-->
-  <defs id="genericDefs" />
-  <g>
-    <defs id="defs1">
-      <linearGradient x1="10" gradientUnits="userSpaceOnUse" x2="110" y1="20" y2="80" id="linearGradient1" 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" patternUnits="userSpaceOnUse" id="pattern1" height="20">
-        <image x="0" y="0" width="20" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAJUlEQVR42mP8z4AP
-MOKVZWKgAIxqHhma8Schhv//RwNsVDNFmgGllgMlNsNEOAAAAABJRU5ErkJggg==" height="20" preserveAspectRatio="none" />
-      </pattern>
-    </defs>
-    <g text-rendering="optimizeLegibility" transform="translate(0,30)">
-      <text xml:space="preserve" x="10" y="10" stroke="none">Semi transparent black</text>
-      <text xml:space="preserve" x="40" y="60" stroke="none">Behind Rectangle</text>
-    </g>
-    <g transform="translate(0,30)" fill-opacity="0.501960813999" fill="rgb(255,255,0)" text-rendering="optimizeLegibility" stroke="rgb(255,255,0)" stroke-opacity="0.501960813999">
-      <rect width="100" x="10" height="60" y="20" stroke="none" />
-    </g>
-    <g text-rendering="optimizeLegibility" transform="translate(0,120)">
-      <text xml:space="preserve" x="10" y="10" stroke="none">Red to Yellow linear gradient</text>
-      <rect x="10" y="20" fill="url(#linearGradient1)" width="100" height="60" stroke="none" />
-      <text xml:space="preserve" x="10" y="10" transform="translate(0,90)" stroke="none">Texture Paint</text>
-      <rect x="10" y="20" transform="translate(0,90)" fill="url(#pattern1)" width="100" height="60" stroke="none" />
-    </g>
-  </g>
-</svg>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+          'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+  /><g
+  ><defs id="defs1"
+    ><linearGradient x1="10" gradientUnits="userSpaceOnUse" x2="110" y1="20" y2="80" id="linearGradient1" 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" patternUnits="userSpaceOnUse" id="pattern1" height="20"
+      ><image x="0" y="0" width="20" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAJUlEQVR42mP8z4AP
+MOKVZWKgAIxqHhma8Schhv//RwNsVDNFmgGllgMlNsNEOAAAAABJRU5ErkJggg==" height="20" preserveAspectRatio="none"
+      /></pattern
+    ></defs
+    ><g text-rendering="optimizeLegibility" transform="translate(0,30)"
+    ><text xml:space="preserve" x="10" y="10" stroke="none"
+      >Semi transparent black</text
+      ><text xml:space="preserve" x="40" y="60" stroke="none"
+      >Behind Rectangle</text
+    ></g
+    ><g transform="translate(0,30)" fill-opacity="0.501960813999" fill="rgb(255,255,0)" text-rendering="optimizeLegibility" stroke="rgb(255,255,0)" stroke-opacity="0.501960813999"
+    ><rect width="100" x="10" height="60" y="20" stroke="none"
+    /></g
+    ><g text-rendering="optimizeLegibility" transform="translate(0,120)"
+    ><text xml:space="preserve" x="10" y="10" stroke="none"
+      >Red to Yellow linear gradient</text
+      ><rect x="10" y="20" fill="url(#linearGradient1)" width="100" height="60" stroke="none"
+      /><text xml:space="preserve" x="10" y="10" transform="translate(0,90)" stroke="none"
+      >Texture Paint</text
+      ><rect x="10" y="20" transform="translate(0,90)" fill="url(#pattern1)" width="100" height="60" stroke="none"
+    /></g
+  ></g
+></svg
+>

Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/RHints.svg
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/RHints.svg?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/RHints.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/RHints.svg Sun Sep 25 12:51:54 2005
@@ -1,26 +1,31 @@
 <?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 fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0">
-  <!--Generated by the Batik Graphics2D SVG Generator-->
-  <defs id="genericDefs" />
-  <g>
-    <g text-rendering="optimizeLegibility">
-      <text xml:space="preserve" x="10" y="20" stroke="none">Text antialiasing</text>
-    </g>
-    <g text-rendering="geometricPrecision" font-size="25" shape-rendering="crispEdges" font-family="&apos;Impact&apos;">
-      <text xml:space="preserve" x="30" y="60" stroke="none">HELLO antialiased</text>
-      <text text-rendering="optimizeSpeed" xml:space="preserve" x="30" y="90" stroke="none">HELLO aliased</text>
-      <text font-size="12" x="10" y="20" transform="translate(0,100)" font-family="&apos;Arial&apos;" shape-rendering="auto" stroke="none" xml:space="preserve">Shape antialiasing</text>
-      <ellipse transform="translate(30,100)" rx="50" cx="60" ry="15" cy="45" stroke="none" />
-      <ellipse transform="translate(30,140)" shape-rendering="auto" rx="50" cx="60" ry="15" cy="45" stroke="none" />
-    </g>
-    <g text-rendering="geometricPrecision" transform="translate(0,200)" image-rendering="optimizeSpeed">
-      <text xml:space="preserve" x="10" y="30" stroke="none">Interpolation Nearest Neighbor / Bicubic</text>
-      <image x="10" y="50" width="40" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAAE0lEQVR42mP4/5/h
-PwMDIxADaQAq6gT93tAyKwAAAABJRU5ErkJggg==" height="40" preserveAspectRatio="none" />
-      <image x="60" y="50" width="40" image-rendering="optimizeQuality" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAAE0lEQVR42mP4/5/h
-PwMDIxADaQAq6gT93tAyKwAAAABJRU5ErkJggg==" height="40" preserveAspectRatio="none" />
-    </g>
-  </g>
-</svg>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+          'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+  /><g
+  ><g text-rendering="optimizeLegibility"
+    ><text xml:space="preserve" x="10" y="20" stroke="none"
+      >Text antialiasing</text
+    ></g
+    ><g text-rendering="geometricPrecision" font-size="25" shape-rendering="crispEdges" font-family="&apos;Impact&apos;"
+    ><text xml:space="preserve" x="30" y="60" stroke="none"
+      >HELLO antialiased</text
+      ><text text-rendering="optimizeSpeed" xml:space="preserve" x="30" y="90" stroke="none"
+      >HELLO aliased</text
+      ><text font-size="12" x="10" y="20" transform="translate(0,100)" font-family="&apos;Arial&apos;" shape-rendering="auto" stroke="none" xml:space="preserve"
+      >Shape antialiasing</text
+      ><ellipse transform="translate(30,100)" rx="50" cx="60" ry="15" cy="45" stroke="none"
+      /><ellipse transform="translate(30,140)" shape-rendering="auto" rx="50" cx="60" ry="15" cy="45" stroke="none"
+    /></g
+    ><g text-rendering="geometricPrecision" transform="translate(0,200)" image-rendering="optimizeSpeed"
+    ><text xml:space="preserve" x="10" y="30" stroke="none"
+      >Interpolation Nearest Neighbor / Bicubic</text
+      ><image x="10" y="50" width="40" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAAE0lEQVR42mP4/5/h
+PwMDIxADaQAq6gT93tAyKwAAAABJRU5ErkJggg==" height="40" preserveAspectRatio="none"
+      /><image x="60" y="50" width="40" image-rendering="optimizeQuality" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAAE0lEQVR42mP4/5/h
+PwMDIxADaQAq6gT93tAyKwAAAABJRU5ErkJggg==" height="40" preserveAspectRatio="none"
+    /></g
+  ></g
+></svg
+>

Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Rescale.svg
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Rescale.svg?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Rescale.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Rescale.svg Sun Sep 25 12:51:54 2005
@@ -1,13 +1,13 @@
 <?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 fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0">
-  <!--Generated by the Batik Graphics2D SVG Generator-->
-  <defs id="genericDefs" />
-  <g>
-    <g text-rendering="optimizeLegibility">
-      <text xml:space="preserve" x="10" y="20" stroke="none">Brighter / Normal / Darker</text>
-      <image x="10" y="30" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAIAAAAtwww4AAATsUlEQVR42p1a348b
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+          'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+  /><g
+  ><g text-rendering="optimizeLegibility"
+    ><text xml:space="preserve" x="10" y="20" stroke="none"
+      >Brighter / Normal / Darker</text
+      ><image x="10" y="30" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAIAAAAtwww4AAATsUlEQVR42p1a348b
 x33/cmd3uUPucck9kscjJZ7Od5YUWbJlCZHtxvlhJK7TBmibIkCBoEXRh/Y1KFD0
 sQ/tn9CXtA9FiwIpEjSxESRFEwdKGti+RLZsy5JP1vkknnjmHXkkl1xyl7vc3dnt
 7CznwtNJitsRQfBmZ77z/fH5/pjvKtWOIgUgDYAAAgAM0GW/Mfv4AFMAFWAEkGOP
@@ -113,8 +113,8 @@
 j6Y2UrCweipNa2uNvVKJ4sRKxIjVfYRZNK8GZb2qyLpF/T0SvdBc1nIF3UepygIW
 dDVTUvAH1+5VBLwkq23cLdcUtyvUV4pEzVsfGkPT1fTaOa2AcVwpEXa5LtfVK08/
 cePq9gcfdlbry7Zh/f43L7R2R82W8eTl2lIWV+be+smMLQ2c/wVz1vvVTY3RmAAA
-AABJRU5ErkJggg==" height="63" preserveAspectRatio="none" />
-      <image x="70" y="30" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAYAAACioZtvAAAgAElEQVR42iWaWa8d
+AABJRU5ErkJggg==" height="63" preserveAspectRatio="none"
+      /><image x="70" y="30" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAYAAACioZtvAAAgAElEQVR42iWaWa8d
 15me3xp37Xk4A3k4kxJlyZNsp+3uiw6QAd0IMgBBGkiA3OQit/kR/T9ylbskCBAg
 SGAERhppuGHHbtvdtqSWRZGiSB6SZ9jzULvGXXm+RQkEDg/3rlrrG97hW8v7j//r
 vzZR0VM0Osj3Q9Vpqfa4p8V0L785KG6N1W6VKrxcZRUriX3tN4E6rbZW26UUHzQY
@@ -291,8 +291,8 @@
 vkGv5b4bLZ3ee3dLtRP2HJ8AwvBbZiMlT6PuEYa/dHd9u7DvsEd2+GDGJgJ8tYHA
 uEP39Ex7jRCTpDdpaYAmevH0UiMiaSZpSXaHcINdZDs+YYFI8ezVFiS0o+6J7nRO
 3t1a7frOEWb49iES/v37N/Ti0ws8+Qo3OkbKZPr+H9/TfLZHOG519miiYR9l3TFb
-TXObCLXBNWVmV0o6IOn/B5vb0uXxU9VwAAAAAElFTkSuQmCC" height="63" preserveAspectRatio="none" />
-      <image x="130" y="30" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAIAAAAtwww4AAAY3klEQVR42i16WY8m
+TXObCLXBNWVmV0o6IOn/B5vb0uXxU9VwAAAAAElFTkSuQmCC" height="63" preserveAspectRatio="none"
+      /><image x="130" y="30" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAIAAAAtwww4AAAY3klEQVR42i16WY8m
 SZaV7ebm7t8SW2ZWZlV1zTBiRq0eBANqhEBCwwP/glee+J88MEIgWj1LT1VX5eQe
 kd/qi+3GuQGVlYrUt7ib3XvuWcyD/5f/9l9lsdI1zkWNRQ92mRJvTaleq1J4LlVq
 yaMXRpvVL0w150ytXEtZ8LGqU2S1RalFxadZcaZTisdaWxEs4dtJCCZErk2WXKVh
@@ -425,9 +425,10 @@
 eCIND7txkry54PDEyPIQ2rvNALrGdoehg7f6+af36AxvBsoAtwik+yJmFCTB/PHt
 LWKIMJBmQaE/l2fQ9WaAHQTIrW7OghFswrzTcUjs6ewfH3aAL/bvrDp8ucAvOaEW
 5d0gy8rHTQdFSAc0BB0c9mbzLGl0FAM6c6N6uNsePlwOh3Uz9jnk7//sFlEUQ7O7
-R3hVvYEDogfquT0fMjRklPJ/AZxwEDt45/8SAAAAAElFTkSuQmCC" height="63" preserveAspectRatio="none" />
-      <text xml:space="preserve" x="10" y="20" transform="translate(0,113)" stroke="none">Rescale Red / Green / Blue</text>
-      <image x="10" y="30" transform="translate(0,113)" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAIAAAAtwww4AAAY7UlEQVR42jV6WY9k
+R3hVvYEDogfquT0fMjRklPJ/AZxwEDt45/8SAAAAAElFTkSuQmCC" height="63" preserveAspectRatio="none"
+      /><text xml:space="preserve" x="10" y="20" transform="translate(0,113)" stroke="none"
+      >Rescale Red / Green / Blue</text
+      ><image x="10" y="30" transform="translate(0,113)" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAIAAAAtwww4AAAY7UlEQVR42jV6WY9k
 6Vnmc/YTESfWjNxqyarKrq5uu9tu22BzMR5gQLYQizSLBBIXcMENF/wIbrlH4hoJ
 IUBIiBEjZjACYSP3eNrdTe/d5arKrMqlMiNjjzj7xvMcM9ml6sisiHO+732f7f1O
 GvX/+itkAQYVTBtRjmGAaYy6gjeEl8NIUbhwTWwseC1sl3Ar9NsoTdgO6hqlj7BG
@@ -561,8 +562,8 @@
 /CaAHahaFNU8aX71pbPTHEhs9/xyPxjqn3XKZSV1dNxu7QX0x0HHNQ4Y4bvuh0+u
 7xvuke2fuuudkROtjbu7Xfid+Gw7ifJxMEJ7V+d1GvXaCKOjsf8r9/a///HV989W
 b46H623ynW8fpbP48/n2reMRup4eoTN7SbTyhgH6LZ1/B8KWDKQ56gV+AAAAAElF
-TkSuQmCC" height="63" preserveAspectRatio="none" />
-      <image x="70" y="30" transform="translate(0,113)" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAIAAAAtwww4AAAYP0lEQVR42i1aSW9k
+TkSuQmCC" height="63" preserveAspectRatio="none"
+      /><image x="70" y="30" transform="translate(0,113)" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAIAAAAtwww4AAAYP0lEQVR42i1aSW9k
 53U9b656r+Yqks1mz4OlttWypHiCnQQZgCAIEsBJFllkkUW2/hH+E1l55Z0QLxwE
 CYzAiBEnhmxJlmypW1Z6Fntgk6wq1lxvfi/nfJ0G0SCLb/i+e88959z70fpB/c8e
 Wh4qG26JvInWDLGNyke/iTxDmsNvwI7hhGguMAeqDsIKdgAvRx2gkaAuEPtwClgp
@@ -692,8 +693,8 @@
 gTc4aFeF/cE/3YnHvl2F26MysOmk/ZXOAzWGoKLvmr8ECI0015rqJBQfq6felXRK
 gim76HsaWcvAsAj6pAyLy+81KVVR0IF/iJOe7Xe9Bjm2q4NPayTWjRJrvdHcdXAB
 O+avAsjXYaJD3saNP9w7fPf48L3F7uv99Dh5+5uXzhBPsN7HoEsbIhdOmNevhry1
-JCv7P3aveGSmbtdGAAAAAElFTkSuQmCC" height="63" preserveAspectRatio="none" />
-      <image x="130" y="30" transform="translate(0,113)" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAIAAAAtwww4AAAYTElEQVR42i1aWY9l
+JCv7P3aveGSmbtdGAAAAAElFTkSuQmCC" height="63" preserveAspectRatio="none"
+      /><image x="130" y="30" transform="translate(0,113)" width="50" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAA/CAIAAAAtwww4AAAYTElEQVR42i1aWY9l
 Z3XdZx7uufOtubp6tttuTGNjCEFBCAQJhDxEQSISKFIknnjJY6I8xcofyFsUKSgP
 kfKQKI9BRGQQxBHGyCbg7rbd1VU91Fx3ns65Zz5Z62uXSnbXrXvP2d/ea6+19j6l
 /f2PKisVqyW6LkUkXlsmQ9ErsR3xHEk1yXJxbVktxHdkthSxpdGUshDHlKwSp5A4
@@ -823,7 +824,8 @@
 RBQTsB/6br1JxSxN/p0MrBX8z7U1OiV0ZQc+pzR++YsF3B/aPlrQh0EKUfHxQu1j
 bFnf4wrNN5UMCIWVS0oMaHD+IeyRK82ANBHr7Hbgqe2rBy0axTtwG406qCtpaQH8
 3dQW4CybS2+NzRUfs5Ex5e366q8C1GN6kGqzJ7euyvMHATw77C6k6fXf4SgKtd66
-wZVky6cLB9qSkpoInPma/D/ANrpV0GNSbQAAAABJRU5ErkJggg==" height="63" preserveAspectRatio="none" />
-    </g>
-  </g>
-</svg>
+wZVky6cLB9qSkpoInPma/D/ANrpV0GNSbQAAAABJRU5ErkJggg==" height="63" preserveAspectRatio="none"
+    /></g
+  ></g
+></svg
+>

Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ShearTest.svg
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ShearTest.svg?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ShearTest.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ShearTest.svg Sun Sep 25 12:51:54 2005
@@ -1,15 +1,15 @@
 <?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 fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0">
-  <!--Generated by the Batik Graphics2D SVG Generator-->
-  <defs id="genericDefs" />
-  <g>
-    <g fill="gray" text-rendering="optimizeLegibility" stroke-width="15" transform="matrix(1,1,0,1,0,0) translate(100,100)" stroke="gray">
-      <ellipse rx="25" fill="none" ry="30" cx="25" cy="30" />
-    </g>
-    <g fill="gray" text-rendering="optimizeLegibility" stroke-width="15" transform="translate(0,-150)" stroke="gray">
-      <path fill="none" d="M150 280 C150 296.568542480469 138.807113647461 298.80712890625 125 285 C111.192878723145 271.19287109375 100 246.568542480469 100 230 C100 213.431457519531 111.192878723145 211.192886352539 125 225 C138.807113647461 238.807113647461 150 263.431457519531 150 280 Z" />
-    </g>
-  </g>
-</svg>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+          'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+  /><g
+  ><g fill="gray" text-rendering="optimizeLegibility" stroke-width="15" transform="matrix(1,1,0,1,0,0) translate(100,100)" stroke="gray"
+    ><ellipse rx="25" fill="none" ry="30" cx="25" cy="30"
+    /></g
+    ><g fill="gray" text-rendering="optimizeLegibility" stroke-width="15" transform="translate(0,-150)" stroke="gray"
+    ><path fill="none" d="M150 280 C150 296.568542480469 138.807113647461 298.80712890625 125 285 C111.192878723145 271.19287109375 100 246.568542480469 100 230 C100 213.431457519531 111.192878723145 211.192886352539 125 225 C138.807113647461 238.807113647461 150 263.431457519531 150 280 Z"
+    /></g
+  ></g
+></svg
+>

Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/TextSpacePreserve.svg
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/TextSpacePreserve.svg?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/TextSpacePreserve.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/TextSpacePreserve.svg Sun Sep 25 12:51:54 2005
@@ -1,16 +1,20 @@
 <?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 fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0">
-  <!--Generated by the Batik Graphics2D SVG Generator-->
-  <defs id="genericDefs" />
-  <g>
-    <g text-rendering="optimizeLegibility" transform="translate(0,30)">
-      <text xml:space="preserve" x="10" y="12" stroke="none">     space before.</text>
-      <text xml:space="preserve" x="10" y="32" stroke="none">Multiple spaces between A and B: A    B</text>
-      <text xml:space="preserve" x="10" y="52" stroke="none">This is a first line
-     and this is a second line starting with spaces</text>
-      <text xml:space="preserve" x="10" y="72" stroke="none">Should have no trailing spaces</text>
-    </g>
-  </g>
-</svg>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+          'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+  /><g
+  ><g text-rendering="optimizeLegibility" transform="translate(0,30)"
+    ><text xml:space="preserve" x="10" y="12" stroke="none"
+      >     space before.</text
+      ><text xml:space="preserve" x="10" y="32" stroke="none"
+      >Multiple spaces between A and B: A    B</text
+      ><text xml:space="preserve" x="10" y="52" stroke="none"
+      >This is a first line
+     and this is a second line starting with spaces</text
+      ><text xml:space="preserve" x="10" y="72" stroke="none"
+      >Should have no trailing spaces</text
+    ></g
+  ></g
+></svg
+>

Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Texture.svg
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Texture.svg?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Texture.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/Texture.svg Sun Sep 25 12:51:54 2005
@@ -1,40 +1,43 @@
 <?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 fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0">
-  <!--Generated by the Batik Graphics2D SVG Generator-->
-  <defs id="genericDefs" />
-  <g>
-    <defs id="defs1">
-      <pattern x="0" y="0" width="20" patternUnits="userSpaceOnUse" id="pattern1" height="20">
-        <image x="0" y="0" width="20" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAJUlEQVR42mP8z4AP
-MOKVZWKgAIxqHhma8Schhv//RwNsVDNFmgGllgMlNsNEOAAAAABJRU5ErkJggg==" height="20" preserveAspectRatio="none" />
-      </pattern>
-      <pattern x="10" y="10" width="20" patternUnits="userSpaceOnUse" id="pattern2" height="20">
-        <image x="0" y="0" width="20" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAJUlEQVR42mP8z4AP
-MOKVZWKgAIxqHhma8Schhv//RwNsVDNFmgGllgMlNsNEOAAAAABJRU5ErkJggg==" height="20" preserveAspectRatio="none" />
-      </pattern>
-      <pattern x="0" y="0" width="10" patternUnits="userSpaceOnUse" id="pattern3" height="10">
-        <image x="0" y="0" width="10" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAI0lEQVR42mP8z8AA
-RKiAkQETMDEQCQZQIcjdGJ75/39oegYAdDoFDw5zppEAAAAASUVORK5CYII=" height="10" preserveAspectRatio="none" />
-      </pattern>
-    </defs>
-    <g fill="url(#pattern1)" text-rendering="optimizeLegibility" transform="translate(0,20)" stroke="url(#pattern1)">
-      <rect width="80" x="0" height="80" y="0" stroke="none" />
-      <rect x="0" y="0" transform="translate(150,0) matrix(1,0,0.5,1,0,0)" width="80" height="80" stroke="none" />
-    </g>
-    <g text-rendering="optimizeLegibility" transform="matrix(1,0,0,1,0,20)">
-      <text xml:space="preserve" x="10" y="100" stroke="none">Anchor matches texture image</text>
-      <rect x="0" y="0" transform="translate(0,120)" fill="url(#pattern2)" width="80" height="80" stroke="none" />
-      <rect x="0" y="0" transform="translate(150,120) matrix(1,0,0.5,1,0,0)" fill="url(#pattern2)" width="80" height="80" stroke="none" />
-    </g>
-    <g text-rendering="optimizeLegibility" transform="matrix(1,0,0,1,0,140)">
-      <text xml:space="preserve" x="10" y="100" stroke="none">Anchor offset to texture image center</text>
-      <rect x="0" y="0" transform="translate(0,120)" fill="url(#pattern3)" width="80" height="80" stroke="none" />
-      <rect x="0" y="0" transform="translate(150,120) matrix(1,0,0.5,1,0,0)" fill="url(#pattern3)" width="80" height="80" stroke="none" />
-    </g>
-    <g text-rendering="optimizeLegibility" transform="matrix(1,0,0,1,0,260)">
-      <text xml:space="preserve" x="10" y="100" stroke="none">Anchor half the size of texture</text>
-    </g>
-  </g>
-</svg>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+          'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0"
+><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
+  /><g
+  ><defs id="defs1"
+    ><pattern x="0" y="0" width="20" patternUnits="userSpaceOnUse" id="pattern1" height="20"
+      ><image x="0" y="0" width="20" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAJUlEQVR42mP8z4AP
+MOKVZWKgAIxqHhma8Schhv//RwNsVDNFmgGllgMlNsNEOAAAAABJRU5ErkJggg==" height="20" preserveAspectRatio="none"
+      /></pattern
+      ><pattern x="10" y="10" width="20" patternUnits="userSpaceOnUse" id="pattern2" height="20"
+      ><image x="0" y="0" width="20" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAJUlEQVR42mP8z4AP
+MOKVZWKgAIxqHhma8Schhv//RwNsVDNFmgGllgMlNsNEOAAAAABJRU5ErkJggg==" height="20" preserveAspectRatio="none"
+      /></pattern
+      ><pattern x="0" y="0" width="10" patternUnits="userSpaceOnUse" id="pattern3" height="10"
+      ><image x="0" y="0" width="10" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAI0lEQVR42mP8z8AA
+RKiAkQETMDEQCQZQIcjdGJ75/39oegYAdDoFDw5zppEAAAAASUVORK5CYII=" height="10" preserveAspectRatio="none"
+      /></pattern
+    ></defs
+    ><g fill="url(#pattern1)" text-rendering="optimizeLegibility" transform="translate(0,20)" stroke="url(#pattern1)"
+    ><rect width="80" x="0" height="80" y="0" stroke="none"
+      /><rect x="0" y="0" transform="translate(150,0) matrix(1,0,0.5,1,0,0)" width="80" height="80" stroke="none"
+    /></g
+    ><g text-rendering="optimizeLegibility" transform="matrix(1,0,0,1,0,20)"
+    ><text xml:space="preserve" x="10" y="100" stroke="none"
+      >Anchor matches texture image</text
+      ><rect x="0" y="0" transform="translate(0,120)" fill="url(#pattern2)" width="80" height="80" stroke="none"
+      /><rect x="0" y="0" transform="translate(150,120) matrix(1,0,0.5,1,0,0)" fill="url(#pattern2)" width="80" height="80" stroke="none"
+    /></g
+    ><g text-rendering="optimizeLegibility" transform="matrix(1,0,0,1,0,140)"
+    ><text xml:space="preserve" x="10" y="100" stroke="none"
+      >Anchor offset to texture image center</text
+      ><rect x="0" y="0" transform="translate(0,120)" fill="url(#pattern3)" width="80" height="80" stroke="none"
+      /><rect x="0" y="0" transform="translate(150,120) matrix(1,0,0.5,1,0,0)" fill="url(#pattern3)" width="80" height="80" stroke="none"
+    /></g
+    ><g text-rendering="optimizeLegibility" transform="matrix(1,0,0,1,0,260)"
+    ><text xml:space="preserve" x="10" y="100" stroke="none"
+      >Anchor half the size of texture</text
+    ></g
+  ></g
+></svg
+>

Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/TransformCollapse.svg
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/TransformCollapse.svg?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/TransformCollapse.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/TransformCollapse.svg Sun Sep 25 12:51:54 2005
@@ -1,15 +1,19 @@
 <?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 fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0">
-  <!--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)" stroke="none">rotate collapse</text>
-      <text xml:space="preserve" x="0" y="80" stroke="none">identity</text>
-    </g>
-  </g>
-</svg>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
+          'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
+<svg fill-opacity="1" xmlns:xlink="http://www.w3.org/1999/xlink" color-interpolation="auto" color-rendering="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="300" stroke-miterlimit="10" stroke-opacity="1" shape-rendering="auto" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="400" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Arial&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" image-rendering="auto" stroke-dashoffset="0"
+><!--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)" stroke="none"
+      >rotate collapse</text
+      ><text xml:space="preserve" x="0" y="80" stroke="none"
+      >identity</text
+    ></g
+  ></g
+></svg
+>

Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/rendering/AttributedCharacterIterator.png
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/rendering/AttributedCharacterIterator.png?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
Binary files - no diff available.

Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/rendering/ContextAttributedCharacterIterator.png
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/rendering/ContextAttributedCharacterIterator.png?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
Binary files - no diff available.

Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/rendering/ContextBug4945.png
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/rendering/ContextBug4945.png?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
Binary files - no diff available.

Propchange: xmlgraphics/batik/trunk/test-references/org/apache/batik/transcoder/wmf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 25 12:51:54 2005
@@ -0,0 +1 @@
+candidate

Modified: xmlgraphics/batik/trunk/test-resources/org/apache/batik/transcoder/unitTesting.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-resources/org/apache/batik/transcoder/unitTesting.xml?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-resources/org/apache/batik/transcoder/unitTesting.xml (original)
+++ xmlgraphics/batik/trunk/test-resources/org/apache/batik/transcoder/unitTesting.xml Sun Sep 25 12:51:54 2005
@@ -25,6 +25,15 @@
 <!--                         TranscoderInput Test                       -->
 <!-- ================================================================== -->
 
-<test id="TranscoderInput" class="org.apache.batik.transcoder.TranscoderInputTest" />
+   <test id="TranscoderInput" 
+         class="org.apache.batik.transcoder.TranscoderInputTest" />
+
+   <testGroup id="transcoder.WMFTranscoder" 
+              class="org.apache.batik.transcoder.wmf.WMFAccuracyTest">
+      <test id="samples/tests/resources/wmf/black_shapes.wmf"/>
+      <test id="samples/tests/resources/wmf/imageWMF.wmf"/>
+      <test id="samples/tests/resources/wmf/testChart.wmf"/>
+      <test id="samples/tests/resources/wmf/textGreek.wmf"/>
+   </testGroup>
 
 </testSuite>

Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java Sun Sep 25 12:51:54 2005
@@ -53,21 +53,28 @@
         //
 
         // "Attributed" is in Bold
-        styledText.addAttribute(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD, 0, 10);
+        styledText.addAttribute(TextAttribute.WEIGHT, 
+                                TextAttribute.WEIGHT_BOLD, 0, 10);
 
         // "String" is italic
-        // styledText.addAttribute(TextAttribute.POSTURE, TextAttribute.POSTURE_OBLIQUE, 11, 18);
+        styledText.addAttribute(TextAttribute.POSTURE, 
+                                TextAttribute.POSTURE_OBLIQUE, 11, 18);
 
-        // fun is Bold and underlined
-        styledText.addAttribute(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON, 23, 28);
-        // styledText.addAttribute(TextAttribute.SWAP_COLORS, TextAttribute.SWAP_COLORS_ON);
-        // styledText.addAttribute(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON, 23, 28);
+        // fun is Bold and underlined and strike through
+        styledText.addAttribute(TextAttribute.UNDERLINE, 
+                                TextAttribute.UNDERLINE_ON, 23, 28);
+        styledText.addAttribute(TextAttribute.STRIKETHROUGH, 
+                                TextAttribute.STRIKETHROUGH_ON, 23, 28);
+
+        // styledText.addAttribute(TextAttribute.SWAP_COLORS, 
+        //                         TextAttribute.SWAP_COLORS_ON);
 
         /*TextLayout aLayout = new TextLayout("A", font, frc);
           Shape aShape = aLayout.getOutline(null);
 
           ShapeGraphicAttribute aReplacement = new ShapeGraphicAttribute(aShape, GraphicAttribute.ROMAN_BASELINE, true);
-          styledText.addAttribute(TextAttribute.CHAR_REPLACEMENT, aReplacement, 0, 1);
+          styledText.addAttribute(TextAttribute.CHAR_REPLACEMENT, 
+                                  aReplacement, 0, 1);
 
 
           // Create a BufferedImage to decorate the Shape
@@ -113,16 +120,26 @@
         //
 
         // "Attributed" is in dard red
-        styledText.addAttribute(TextAttribute.FOREGROUND, new Color(128, 0, 0), 0, 10);
+        styledText.addAttribute(TextAttribute.FOREGROUND, 
+                                new Color(128, 0, 0), 0, 10);
 
         // "String" is blue
-        styledText.addAttribute(TextAttribute.FOREGROUND, new Color(70, 107, 132), 11, 18);
+        styledText.addAttribute(TextAttribute.FOREGROUND, 
+                                new Color(70, 107, 132), 11, 18);
 
-        // "fun" is yellow on blue background
-        styledText.addAttribute(TextAttribute.FOREGROUND, new Color(236, 214, 70), 23, 28);
-        styledText.addAttribute(TextAttribute.BACKGROUND, new Color(70, 107, 132), 23, 28);
+        // "fun" is yellow
+        styledText.addAttribute(TextAttribute.FOREGROUND, 
+                                new Color(236, 214, 70), 23, 28);
 
         java.text.AttributedCharacterIterator iter = styledText.getIterator();
+        g.drawString(iter, 10, 100);
+
+
+        // "fun" is now yellow on a blue background
+        styledText.addAttribute(TextAttribute.BACKGROUND, 
+                                new Color(70, 107, 132), 23, 28);
+
+        iter = styledText.getIterator();
         /*TextLayout layout = new TextLayout(iter, frc);
 
         Rectangle bounds = layout.getBounds().getBounds();
@@ -130,6 +147,6 @@
         bounds.height += 50;
 
         layout.draw(g, 25, layout.getAscent() + 25);*/
-        g.drawString(iter, 10, 100);
+        g.drawString(iter, 10, 130);
     }
 }

Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java?rev=291468&r1=291467&r2=291468&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java Sun Sep 25 12:51:54 2005
@@ -50,7 +50,7 @@
 /**
  * This test validates that a given rendering sequence, modeled
  * by a <tt>Painter</tt> is properly converted to an SVG document
- * by comparing the generated SVG document to a know, valid
+ * by comparing the generated SVG document to a known, valid
  * SVG reference.
  *
  * @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>