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 2006/09/10 13:41:59 UTC
svn commit: r441943 [3/5] - in /xmlgraphics/batik/trunk:
sources/org/apache/batik/svggen/
sources/org/apache/batik/transcoder/wmf/tosvg/
test-references/org/apache/batik/svggen/
test-references/org/apache/batik/transcoder/wmf/ test-resources/org/apache...
Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextColor1.svg
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextColor1.svg?view=diff&rev=441943&r1=441942&r2=441943
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextColor1.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextColor1.svg Sun Sep 10 04:41:57 2006
@@ -132,7 +132,7 @@
><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"
+ ><font-face ascent="92.163086" font-style="normal" descent="19.555664" units-per-em="100" font-family="Arial" 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="a" horiz-adv-x="55.615234" d="M40.4375 6.3906 Q35.5469 2.25 31.0312 0.5469 Q26.5156 -1.1562 21.3438 -1.1562 Q12.7969 -1.1562 8.2031 3.0078 Q3.6094 7.1719 3.6094 13.6719 Q3.6094 17.4844 5.3438 20.6328 Q7.0781 23.7812 9.8906 25.6875 Q12.7031 27.5938 16.2188 28.5625 Q18.7969 29.25 24.0312 29.8906 Q34.6719 31.1562 39.7031 32.9062 Q39.75 34.7188 39.75 35.2031 Q39.75 40.5781 37.25 42.7812 Q33.8906 45.75 27.25 45.75 Q21.0469 45.75 18.0938 43.5781 Q15.1406 41.4062 13.7188 35.8906 L5.125 37.0625 Q6.2969 42.5781 8.9844 45.9688 Q11.6719 49.3594 16.75 51.1953 Q21.8281 53.0312 28.5156 53.0312 Q35.1562 53.0312 39.3047 51.4688 Q43.4531 49.9062 45.4062 47.5391 Q47.3594 45.1719 48.1406 41.5469 Q48.5781 39.3125 48.5781 33.4531 L48.5781 21.7344 Q48.5781 9.4688 49.1406 6.2266 Q49.7031 2.9844 51.375 0 L42.1875 0 Q40.8281 2.7344 40.4375 6.3906 ZM39.7031 26.0312 Q34.9062 24.0781 25.3438 22.7031 Q19.9219 21.9219 17.6797 20.9453 Q15.4375 19.9688 14.2109 18.0938 Q12.9844
16.2188 12.9844 13.9219 Q12.9844 10.4062 15.6484 8.0625 Q18.3125 5.7188 23.4375 5.7188 Q28.5156 5.7188 32.4688 7.9375 Q36.4219 10.1562 38.2812 14.0156 Q39.7031 17 39.7031 22.7969 L39.7031 26.0312 Z"
/><glyph unicode="t" horiz-adv-x="27.783203" d="M25.7812 7.8594 L27.0469 0.0938 Q23.3438 -0.6719 20.4062 -0.6719 Q15.625 -0.6719 12.9922 0.8359 Q10.3594 2.3438 9.2812 4.8125 Q8.2031 7.2812 8.2031 15.1875 L8.2031 45.0156 L1.7656 45.0156 L1.7656 51.8594 L8.2031 51.8594 L8.2031 64.7031 L16.9375 69.9688 L16.9375 51.8594 L25.7812 51.8594 L25.7812 45.0156 L16.9375 45.0156 L16.9375 14.7031 Q16.9375 10.9375 17.4062 9.8672 Q17.875 8.7969 18.9219 8.1562 Q19.9688 7.5156 21.9219 7.5156 Q23.3906 7.5156 25.7812 7.8594 Z"
@@ -171,200 +171,200 @@
/></font
></defs
><g class="testC1" transform="translate(20,20)"
- ><text xml:space="preserve" x="-5" y="0" class="testC2"
+ ><text x="-5" xml:space="preserve" y="0" class="testC2"
>Color Constants</text
- ><text xml:space="preserve" x="10" y="3" class="testC3" transform="translate(0,20)"
+ ><text x="10" xml:space="preserve" y="3" class="testC3" transform="translate(0,20)"
>black</text
- ><rect x="-5" y="-5" transform="translate(0,20)" width="10" class="testC4" height="10"
- /><rect x="-5" y="-5" transform="translate(0,20)" width="10" class="testC5" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC6" transform="translate(0,40)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC4" transform="translate(0,20)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC5" transform="translate(0,20)"
+ /><text x="10" xml:space="preserve" y="3" class="testC6" transform="translate(0,40)"
>blue</text
- ><rect x="-5" y="-5" transform="translate(0,40)" width="10" class="testC7" height="10"
- /><rect x="-5" y="-5" transform="translate(0,40)" width="10" class="testC8" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC9" transform="translate(0,60)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC7" transform="translate(0,40)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC8" transform="translate(0,40)"
+ /><text x="10" xml:space="preserve" y="3" class="testC9" transform="translate(0,60)"
>cyan</text
- ><rect x="-5" y="-5" transform="translate(0,60)" width="10" class="testC10" height="10"
- /><rect x="-5" y="-5" transform="translate(0,60)" width="10" class="testC11" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC12" transform="translate(0,80)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC10" transform="translate(0,60)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC11" transform="translate(0,60)"
+ /><text x="10" xml:space="preserve" y="3" class="testC12" transform="translate(0,80)"
>darkGray</text
- ><rect x="-5" y="-5" transform="translate(0,80)" width="10" class="testC13" height="10"
- /><rect x="-5" y="-5" transform="translate(0,80)" width="10" class="testC14" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC15" transform="translate(0,100)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC13" transform="translate(0,80)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC14" transform="translate(0,80)"
+ /><text x="10" xml:space="preserve" y="3" class="testC15" transform="translate(0,100)"
>gray</text
- ><rect x="-5" y="-5" transform="translate(0,100)" width="10" class="testC16" height="10"
- /><rect x="-5" y="-5" transform="translate(0,100)" width="10" class="testC17" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC18" transform="translate(0,120)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC16" transform="translate(0,100)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC17" transform="translate(0,100)"
+ /><text x="10" xml:space="preserve" y="3" class="testC18" transform="translate(0,120)"
>green</text
- ><rect x="-5" y="-5" transform="translate(0,120)" width="10" class="testC19" height="10"
- /><rect x="-5" y="-5" transform="translate(0,120)" width="10" class="testC20" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC21" transform="translate(0,140)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC19" transform="translate(0,120)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC20" transform="translate(0,120)"
+ /><text x="10" xml:space="preserve" y="3" class="testC21" transform="translate(0,140)"
>lightGray</text
- ><rect x="-5" y="-5" transform="translate(0,140)" width="10" class="testC22" height="10"
- /><rect x="-5" y="-5" transform="translate(0,140)" width="10" class="testC23" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC24" transform="translate(0,160)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC22" transform="translate(0,140)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC23" transform="translate(0,140)"
+ /><text x="10" xml:space="preserve" y="3" class="testC24" transform="translate(0,160)"
>magenta</text
- ><rect x="-5" y="-5" transform="translate(0,160)" width="10" class="testC25" height="10"
- /><rect x="-5" y="-5" transform="translate(0,160)" width="10" class="testC26" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC27" transform="translate(0,180)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC25" transform="translate(0,160)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC26" transform="translate(0,160)"
+ /><text x="10" xml:space="preserve" y="3" class="testC27" transform="translate(0,180)"
>orange</text
- ><rect x="-5" y="-5" transform="translate(0,180)" width="10" class="testC28" height="10"
- /><rect x="-5" y="-5" transform="translate(0,180)" width="10" class="testC29" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC30" transform="translate(0,200)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC28" transform="translate(0,180)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC29" transform="translate(0,180)"
+ /><text x="10" xml:space="preserve" y="3" class="testC30" transform="translate(0,200)"
>pink</text
- ><rect x="-5" y="-5" transform="translate(0,200)" width="10" class="testC31" height="10"
- /><rect x="-5" y="-5" transform="translate(0,200)" width="10" class="testC32" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC33" transform="translate(0,220)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC31" transform="translate(0,200)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC32" transform="translate(0,200)"
+ /><text x="10" xml:space="preserve" y="3" class="testC33" transform="translate(0,220)"
>red</text
- ><rect x="-5" y="-5" transform="translate(0,220)" width="10" class="testC34" height="10"
- /><rect x="-5" y="-5" transform="translate(0,220)" width="10" class="testC35" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC36" transform="translate(0,240)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC34" transform="translate(0,220)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC35" transform="translate(0,220)"
+ /><text x="10" xml:space="preserve" y="3" class="testC36" transform="translate(0,240)"
>white</text
- ><rect x="-5" y="-5" transform="translate(0,240)" width="10" class="testC37" height="10"
- /><rect x="-5" y="-5" transform="translate(0,240)" width="10" class="testC38" height="10"
- /><text xml:space="preserve" x="10" y="3" class="testC39" transform="translate(0,260)"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC37" transform="translate(0,240)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC38" transform="translate(0,240)"
+ /><text x="10" xml:space="preserve" y="3" class="testC39" transform="translate(0,260)"
>yellow</text
- ><rect x="-5" y="-5" transform="translate(0,260)" width="10" class="testC40" height="10"
- /><rect x="-5" y="-5" transform="translate(0,260)" width="10" class="testC41" height="10"
+ ><rect x="-5" width="10" height="10" y="-5" class="testC40" transform="translate(0,260)"
+ /><rect x="-5" width="10" height="10" y="-5" class="testC41" transform="translate(0,260)"
/></g
><g class="testC42" transform="translate(150,20)"
- ><text xml:space="preserve" x="0" y="0" class="testC43"
+ ><text x="0" xml:space="preserve" y="0" class="testC43"
>Various opacities</text
- ><rect x="0" y="0" transform="translate(0,10)" width="40" class="testC44" height="260"
+ ><rect x="0" width="40" height="260" y="0" class="testC44" transform="translate(0,10)"
/></g
><g class="testC45" transform="translate(150,30)"
- ><rect width="40" x="0" height="13" y="0" class="testC46"
+ ><rect x="0" width="40" height="13" y="0" class="testC46"
/></g
><g class="testC47" transform="translate(150,30)"
- ><text xml:space="preserve" x="50" y="6" class="testC48"
+ ><text x="50" xml:space="preserve" y="6" class="testC48"
>12</text
></g
><g class="testC49" transform="translate(150,43)"
- ><rect width="40" x="0" height="13" y="0" class="testC50"
+ ><rect x="0" width="40" height="13" y="0" class="testC50"
/></g
><g class="testC51" transform="translate(150,43)"
- ><text xml:space="preserve" x="50" y="6" class="testC52"
+ ><text x="50" xml:space="preserve" y="6" class="testC52"
>25</text
></g
><g class="testC53" transform="translate(150,56)"
- ><rect width="40" x="0" height="13" y="0" class="testC54"
+ ><rect x="0" width="40" height="13" y="0" class="testC54"
/></g
><g class="testC55" transform="translate(150,56)"
- ><text xml:space="preserve" x="50" y="6" class="testC56"
+ ><text x="50" xml:space="preserve" y="6" class="testC56"
>38</text
></g
><g class="testC57" transform="translate(150,69)"
- ><rect width="40" x="0" height="13" y="0" class="testC58"
+ ><rect x="0" width="40" height="13" y="0" class="testC58"
/></g
><g class="testC59" transform="translate(150,69)"
- ><text xml:space="preserve" x="50" y="6" class="testC60"
+ ><text x="50" xml:space="preserve" y="6" class="testC60"
>51</text
></g
><g class="testC61" transform="translate(150,82)"
- ><rect width="40" x="0" height="13" y="0" class="testC62"
+ ><rect x="0" width="40" height="13" y="0" class="testC62"
/></g
><g class="testC63" transform="translate(150,82)"
- ><text xml:space="preserve" x="50" y="6" class="testC64"
+ ><text x="50" xml:space="preserve" y="6" class="testC64"
>63</text
></g
><g class="testC65" transform="translate(150,95)"
- ><rect width="40" x="0" height="13" y="0" class="testC66"
+ ><rect x="0" width="40" height="13" y="0" class="testC66"
/></g
><g class="testC67" transform="translate(150,95)"
- ><text xml:space="preserve" x="50" y="6" class="testC68"
+ ><text x="50" xml:space="preserve" y="6" class="testC68"
>76</text
></g
><g class="testC69" transform="translate(150,108)"
- ><rect width="40" x="0" height="13" y="0" class="testC70"
+ ><rect x="0" width="40" height="13" y="0" class="testC70"
/></g
><g class="testC71" transform="translate(150,108)"
- ><text xml:space="preserve" x="50" y="6" class="testC72"
+ ><text x="50" xml:space="preserve" y="6" class="testC72"
>89</text
></g
><g class="testC73" transform="translate(150,121)"
- ><rect width="40" x="0" height="13" y="0" class="testC74"
+ ><rect x="0" width="40" height="13" y="0" class="testC74"
/></g
><g class="testC75" transform="translate(150,121)"
- ><text xml:space="preserve" x="50" y="6" class="testC76"
+ ><text x="50" xml:space="preserve" y="6" class="testC76"
>102</text
></g
><g class="testC77" transform="translate(150,134)"
- ><rect width="40" x="0" height="13" y="0" class="testC78"
+ ><rect x="0" width="40" height="13" y="0" class="testC78"
/></g
><g class="testC79" transform="translate(150,134)"
- ><text xml:space="preserve" x="50" y="6" class="testC80"
+ ><text x="50" xml:space="preserve" y="6" class="testC80"
>114</text
></g
><g class="testC81" transform="translate(150,147)"
- ><rect width="40" x="0" height="13" y="0" class="testC82"
+ ><rect x="0" width="40" height="13" y="0" class="testC82"
/></g
><g class="testC83" transform="translate(150,147)"
- ><text xml:space="preserve" x="50" y="6" class="testC84"
+ ><text x="50" xml:space="preserve" y="6" class="testC84"
>127</text
></g
><g class="testC85" transform="translate(150,160)"
- ><rect width="40" x="0" height="13" y="0" class="testC86"
+ ><rect x="0" width="40" height="13" y="0" class="testC86"
/></g
><g class="testC87" transform="translate(150,160)"
- ><text xml:space="preserve" x="50" y="6" class="testC88"
+ ><text x="50" xml:space="preserve" y="6" class="testC88"
>140</text
></g
><g class="testC89" transform="translate(150,173)"
- ><rect width="40" x="0" height="13" y="0" class="testC90"
+ ><rect x="0" width="40" height="13" y="0" class="testC90"
/></g
><g class="testC91" transform="translate(150,173)"
- ><text xml:space="preserve" x="50" y="6" class="testC92"
+ ><text x="50" xml:space="preserve" y="6" class="testC92"
>153</text
></g
><g class="testC93" transform="translate(150,186)"
- ><rect width="40" x="0" height="13" y="0" class="testC94"
+ ><rect x="0" width="40" height="13" y="0" class="testC94"
/></g
><g class="testC95" transform="translate(150,186)"
- ><text xml:space="preserve" x="50" y="6" class="testC96"
+ ><text x="50" xml:space="preserve" y="6" class="testC96"
>165</text
></g
><g class="testC97" transform="translate(150,199)"
- ><rect width="40" x="0" height="13" y="0" class="testC98"
+ ><rect x="0" width="40" height="13" y="0" class="testC98"
/></g
><g class="testC99" transform="translate(150,199)"
- ><text xml:space="preserve" x="50" y="6" class="testC100"
+ ><text x="50" xml:space="preserve" y="6" class="testC100"
>178</text
></g
><g class="testC101" transform="translate(150,212)"
- ><rect width="40" x="0" height="13" y="0" class="testC102"
+ ><rect x="0" width="40" height="13" y="0" class="testC102"
/></g
><g class="testC103" transform="translate(150,212)"
- ><text xml:space="preserve" x="50" y="6" class="testC104"
+ ><text x="50" xml:space="preserve" y="6" class="testC104"
>191</text
></g
><g class="testC105" transform="translate(150,225)"
- ><rect width="40" x="0" height="13" y="0" class="testC106"
+ ><rect x="0" width="40" height="13" y="0" class="testC106"
/></g
><g class="testC107" transform="translate(150,225)"
- ><text xml:space="preserve" x="50" y="6" class="testC108"
+ ><text x="50" xml:space="preserve" y="6" class="testC108"
>204</text
></g
><g class="testC109" transform="translate(150,238)"
- ><rect width="40" x="0" height="13" y="0" class="testC110"
+ ><rect x="0" width="40" height="13" y="0" class="testC110"
/></g
><g class="testC111" transform="translate(150,238)"
- ><text xml:space="preserve" x="50" y="6" class="testC112"
+ ><text x="50" xml:space="preserve" y="6" class="testC112"
>216</text
></g
><g class="testC113" transform="translate(150,251)"
- ><rect width="40" x="0" height="13" y="0" class="testC114"
+ ><rect x="0" width="40" height="13" y="0" class="testC114"
/></g
><g class="testC115" transform="translate(150,251)"
- ><text xml:space="preserve" x="50" y="6" class="testC116"
+ ><text x="50" xml:space="preserve" y="6" class="testC116"
>229</text
></g
><g class="testC117" transform="translate(150,264)"
- ><rect width="40" x="0" height="13" y="0" class="testC118"
+ ><rect x="0" width="40" height="13" y="0" class="testC118"
/></g
><g class="testC119" transform="translate(150,264)"
- ><text xml:space="preserve" x="50" y="6" class="testC120"
+ ><text x="50" xml:space="preserve" y="6" class="testC120"
>242</text
- ><rect x="0" y="0" transform="translate(0,13)" width="40" class="testC121" height="13"
- /><text xml:space="preserve" x="50" y="6" class="testC122" transform="translate(0,13)"
+ ><rect x="0" width="40" height="13" y="0" class="testC121" transform="translate(0,13)"
+ /><text x="50" xml:space="preserve" y="6" class="testC122" transform="translate(0,13)"
>255</text
></g
></g
Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextColor2.svg
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextColor2.svg?view=diff&rev=441943&r1=441942&r2=441943
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextColor2.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextColor2.svg Sun Sep 10 04:41:57 2006
@@ -19,7 +19,7 @@
><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"
+ ><font-face ascent="92.163086" font-style="normal" descent="19.555664" units-per-em="100" font-family="Arial" 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="i" horiz-adv-x="22.216797" d="M6.6406 61.4688 L6.6406 71.5781 L15.4375 71.5781 L15.4375 61.4688 L6.6406 61.4688 ZM6.6406 0 L6.6406 51.8594 L15.4375 51.8594 L15.4375 0 L6.6406 0 Z"
/><glyph unicode="m" horiz-adv-x="83.30078" d="M6.5938 0 L6.5938 51.8594 L14.4531 51.8594 L14.4531 44.5781 Q16.8906 48.3906 20.9453 50.7109 Q25 53.0312 30.1719 53.0312 Q35.9375 53.0312 39.625 50.6406 Q43.3125 48.25 44.8281 43.9531 Q50.9844 53.0312 60.8438 53.0312 Q68.5625 53.0312 72.7109 48.7578 Q76.8594 44.4844 76.8594 35.5938 L76.8594 0 L68.1094 0 L68.1094 32.6719 Q68.1094 37.9375 67.2578 40.2578 Q66.4062 42.5781 64.1641 43.9922 Q61.9219 45.4062 58.8906 45.4062 Q53.4219 45.4062 49.8047 41.7734 Q46.1875 38.1406 46.1875 30.125 L46.1875 0 L37.4062 0 L37.4062 33.6875 Q37.4062 39.5469 35.2578 42.4766 Q33.1094 45.4062 28.2188 45.4062 Q24.5156 45.4062 21.3672 43.4531 Q18.2188 41.5 16.7969 37.7422 Q15.375 33.9844 15.375 26.9062 L15.375 0 L6.5938 0 Z"
@@ -49,17 +49,17 @@
/></font
></defs
><g class="testC1"
- ><text xml:space="preserve" x="10" y="30" class="testC2"
+ ><text x="10" xml:space="preserve" y="30" class="testC2"
>Opaque Colors, Half Transparent AlphaComposite</text
- ><rect width="100" x="10" height="50" y="40" class="testC3"
- /><rect width="100" x="10" height="50" y="40" class="testC4"
- /><rect width="100" x="10" height="50" y="40" class="testC5"
- /><text xml:space="preserve" x="10" y="30" class="testC6" transform="translate(0,90)"
+ ><rect x="10" width="100" height="50" y="40" class="testC3"
+ /><rect x="10" width="100" height="50" y="40" class="testC4"
+ /><rect x="10" width="100" height="50" y="40" class="testC5"
+ /><text x="10" xml:space="preserve" y="30" class="testC6" transform="translate(0,90)"
>Transparent Colors, Opaque AlphaComposite SrcOver</text
></g
><g class="testC7" transform="translate(0,90)"
- ><rect width="100" x="10" height="50" y="40" class="testC8"
- /><rect width="100" x="10" height="50" y="40" class="testC9"
+ ><rect x="10" width="100" height="50" y="40" class="testC8"
+ /><rect x="10" width="100" height="50" y="40" class="testC9"
/></g
></g
></g
Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextDrawImage.svg
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextDrawImage.svg?view=diff&rev=441943&r1=441942&r2=441943
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextDrawImage.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextDrawImage.svg Sun Sep 10 04:41:57 2006
@@ -38,16 +38,16 @@
gAARECACAkRAgEhq9ABtlAUWpLluEgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="75" id="testimage4" preserveAspectRatio="xMidYMid meet" xlink:show="embed"
/></defs
><g class="testC1"
- ><rect width="100" x="5" height="75" y="10" class="testC2"
- /><use transform="matrix(1,0,0,1,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC3" xlink:actuate="onLoad" xlink:show="embed"
- /><use transform="translate(150,0) matrix(0.5,0,0,0.5333,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC4" xlink:actuate="onLoad" xlink:show="embed"
- /><use transform="translate(0,80) matrix(0.8,0,0,1.2,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" xlink:type="simple" class="testC5" xlink:actuate="onLoad" xlink:show="embed"
- /><rect x="5" y="10" transform="translate(150,80)" width="40" class="testC6" height="30"
- /><use transform="translate(150,80) matrix(0.8,0,0,1.2,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage3" xlink:type="simple" class="testC7" xlink:actuate="onLoad" xlink:show="embed"
- /><use transform="translate(0,160) matrix(0.5,0,0,0.3,2.5,3)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC8" xlink:actuate="onLoad" xlink:show="embed"
- /><use transform="translate(150,160) matrix(1,0,0,1,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage4" xlink:type="simple" class="testC9" xlink:actuate="onLoad" xlink:show="embed"
- /><rect x="5" y="10" transform="translate(0,240)" width="50" class="testC10" height="40"
- /><use transform="translate(0,240) matrix(0.5,0,0,0.5333,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" class="testC11" xlink:actuate="onLoad" xlink:show="embed"
+ ><rect x="5" width="100" height="75" y="10" class="testC2"
+ /><use transform="matrix(1,0,0,1,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" xlink:actuate="onLoad" class="testC3" xlink:show="embed"
+ /><use transform="translate(150,0) matrix(0.5,0,0,0.5333,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" xlink:actuate="onLoad" class="testC4" xlink:show="embed"
+ /><use transform="translate(0,80) matrix(0.8,0,0,1.2,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage2" xlink:type="simple" xlink:actuate="onLoad" class="testC5" xlink:show="embed"
+ /><rect x="5" width="40" height="30" y="10" class="testC6" transform="translate(150,80)"
+ /><use transform="translate(150,80) matrix(0.8,0,0,1.2,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage3" xlink:type="simple" xlink:actuate="onLoad" class="testC7" xlink:show="embed"
+ /><use transform="translate(0,160) matrix(0.5,0,0,0.3,2.5,3)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" xlink:actuate="onLoad" class="testC8" xlink:show="embed"
+ /><use transform="translate(150,160) matrix(1,0,0,1,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage4" xlink:type="simple" xlink:actuate="onLoad" class="testC9" xlink:show="embed"
+ /><rect x="5" width="50" height="40" y="10" class="testC10" transform="translate(0,240)"
+ /><use transform="translate(0,240) matrix(0.5,0,0,0.5333,5,10)" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#testimage1" xlink:type="simple" xlink:actuate="onLoad" class="testC11" xlink:show="embed"
/></g
></g
></g
Modified: xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextFont1.svg
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextFont1.svg?view=diff&rev=441943&r1=441942&r2=441943
==============================================================================
--- xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextFont1.svg (original)
+++ xmlgraphics/batik/trunk/test-references/org/apache/batik/svggen/ContextFont1.svg Sun Sep 10 04:41:57 2006
@@ -42,7 +42,7 @@
><g
><defs id="testdefs1"
><font horiz-adv-x="78.22266" id="testfont1"
- ><font-face ascent="92.163086" descent="19.555664" units-per-em="100" font-family="Arial" font-style="normal" font-weight="bold"
+ ><font-face ascent="92.163086" font-style="normal" descent="19.555664" units-per-em="100" font-family="Arial" font-weight="bold"
/><missing-glyph horiz-adv-x="78.22266" d="M10.8906 0 L10.8906 62.5 L64.1094 62.5 L64.1094 0 L10.8906 0 ZM15.625 1.5625 L59.3281 1.5625 L59.3281 60.9375 L15.625 60.9375 L15.625 1.5625 Z"
/><glyph unicode="e" horiz-adv-x="58.83789" d="M35.7969 17 L52.4844 14.2031 Q49.8594 6.6875 44.1406 2.7656 Q38.4219 -1.1562 28.3281 -1.1562 Q13.1875 -1.1562 6.6875 7.6719 Q1.5625 14.75 1.5625 25.5312 Q1.5625 38.4219 8.3281 45.7266 Q15.0938 53.0312 26.9531 53.0312 Q40.1406 53.0312 46.8281 45.3906 Q53.5156 37.75 53.2188 21.9688 L18.8438 21.9688 Q19 15.875 22.1484 12.4766 Q25.2969 9.0781 28.4688 9.0781 Q30.0781 9.0781 32.2734 10.8359 Q34.4688 12.5938 35.7969 17 ZM36.375 30.375 Q36.2344 36.3281 33.3281 39.4297 Q30.4219 42.5312 27.7812 42.5312 Q24.9062 42.5312 21.9688 39.2656 Q19.0469 35.9844 19.0469 30.375 L36.375 30.375 Z"
/><glyph unicode="z" horiz-adv-x="53.222656" d="M0.0469 0 L0.0469 10.6875 L19.4844 33.0156 Q24.2656 38.4844 26.375 40.5781 Q26.375 40.5781 23.4844 40.5781 L1.9531 40.4844 L1.9531 51.8594 L48.0469 51.8594 L48.0469 42.1406 L28.2188 19.2812 L21.3906 11.9219 Q23.7812 12.0625 26.7031 12.0625 L49.5625 12.0625 L49.5156 0 L0.0469 0 Z"
@@ -65,7 +65,7 @@
/><glyph unicode="L" horiz-adv-x="64.30664" d="M6.0625 0 L6.0625 71 L23.6875 71 L23.6875 12.0625 L59.6719 12.0625 L59.625 0 L6.0625 0 Z"
/></font
><font horiz-adv-x="75.0" id="testfont2"
- ><font-face ascent="92.163086" descent="19.555664" units-per-em="100" font-family="Arial" font-style="normal" font-weight="normal"
+ ><font-face ascent="92.163086" font-style="normal" descent="19.555664" units-per-em="100" font-family="Arial" 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="A" horiz-adv-x="66.69922" d="M-0.125 0 L27.3438 71.5781 L37.5469 71.5781 L66.8438 0 L56.0625 0 L47.7031 21.6875 L17.7812 21.6875 L9.9062 0 L-0.125 0 ZM20.5156 29.3906 L44.7812 29.3906 L37.3125 49.2188 Q33.8906 58.25 32.2344 64.0625 Q30.8594 57.1719 28.375 50.3906 L20.5156 29.3906 Z"
/><glyph unicode="a" horiz-adv-x="55.615234" d="M40.4375 6.3906 Q35.5469 2.25 31.0312 0.5469 Q26.5156 -1.1562 21.3438 -1.1562 Q12.7969 -1.1562 8.2031 3.0078 Q3.6094 7.1719 3.6094 13.6719 Q3.6094 17.4844 5.3438 20.6328 Q7.0781 23.7812 9.8906 25.6875 Q12.7031 27.5938 16.2188 28.5625 Q18.7969 29.25 24.0312 29.8906 Q34.6719 31.1562 39.7031 32.9062 Q39.75 34.7188 39.75 35.2031 Q39.75 40.5781 37.25 42.7812 Q33.8906 45.75 27.25 45.75 Q21.0469 45.75 18.0938 43.5781 Q15.1406 41.4062 13.7188 35.8906 L5.125 37.0625 Q6.2969 42.5781 8.9844 45.9688 Q11.6719 49.3594 16.75 51.1953 Q21.8281 53.0312 28.5156 53.0312 Q35.1562 53.0312 39.3047 51.4688 Q43.4531 49.9062 45.4062 47.5391 Q47.3594 45.1719 48.1406 41.5469 Q48.5781 39.3125 48.5781 33.4531 L48.5781 21.7344 Q48.5781 9.4688 49.1406 6.2266 Q49.7031 2.9844 51.375 0 L42.1875 0 Q40.8281 2.7344 40.4375 6.3906 ZM39.7031 26.0312 Q34.9062 24.0781 25.3438 22.7031 Q19.9219 21.9219 17.6797 20.9453 Q15.4375 19.9688 14.2109 18.0938 Q12.9844
16.2188 12.9844 13.9219 Q12.9844 10.4062 15.6484 8.0625 Q18.3125 5.7188 23.4375 5.7188 Q28.5156 5.7188 32.4688 7.9375 Q36.4219 10.1562 38.2812 14.0156 Q39.7031 17 39.7031 22.7969 L39.7031 26.0312 Z"
@@ -76,7 +76,7 @@
/><glyph unicode="r" horiz-adv-x="33.30078" d="M6.5 0 L6.5 51.8594 L14.4062 51.8594 L14.4062 44 Q17.4375 49.5156 20 51.2734 Q22.5625 53.0312 25.6406 53.0312 Q30.0781 53.0312 34.6719 50.2031 L31.6406 42.0469 Q28.4219 43.9531 25.2031 43.9531 Q22.3125 43.9531 20.0156 42.2188 Q17.7188 40.4844 16.75 37.4062 Q15.2812 32.7188 15.2812 27.1562 L15.2812 0 L6.5 0 Z"
/></font
><font horiz-adv-x="75.0" id="testfont3"
- ><font-face ascent="92.1535" descent="19.553635" units-per-em="100" font-family="Arial" font-style="italic" font-weight="normal"
+ ><font-face ascent="92.1535" font-style="italic" descent="19.553635" units-per-em="100" font-family="Arial" font-weight="normal"
/><missing-glyph horiz-adv-x="75.0" d="M12.5 0 L25 62.5 L75 62.5 L62.5 0 L12.5 0 ZM14.375 1.5625 L61.25 1.5625 L73.125 60.9375 L26.25 60.9375 L14.375 1.5625 Z"
/><glyph unicode="c" horiz-adv-x="50.0" d="M42.875 18.9062 L51.5469 17.9688 Q46.2656 8.25 39.2109 3.5469 Q32.1562 -1.1562 24.3438 -1.1562 Q15.8906 -1.1562 11.7266 4.3047 Q7.5625 9.7656 9.5156 19.5781 Q11.2188 28.0781 16.2344 36.2812 Q21.25 44.4844 28.375 48.7578 Q35.5 53.0312 43.5469 53.0312 Q51.9062 53.0312 55.8516 48.3125 Q59.7969 43.5938 58.2344 35.8438 L49.4375 35.25 Q50.3594 40.1875 48.1094 42.9766 Q45.8594 45.7656 41.2656 45.7656 Q35.9531 45.7656 31.375 42.3906 Q26.7969 39.0156 23.1953 32.1484 Q19.5938 25.2812 18.3281 18.9375 Q17 12.2969 19.2656 8.9766 Q21.5312 5.6562 25.8281 5.6562 Q30.125 5.6562 34.7109 8.9297 Q39.2969 12.2031 42.875 18.9062 Z"
/><glyph unicode="i" horiz-adv-x="22.216797" d="M28.1875 61.5625 L32.2812 71.5938 L41.0781 71.5938 L36.9688 61.5625 L28.1875 61.5625 ZM2.9844 0 L24.1719 51.8594 L33.0156 51.8594 L11.8125 0 L2.9844 0 Z"
@@ -86,7 +86,7 @@
/><glyph unicode="I" horiz-adv-x="27.783203" d="M5.7188 0 L35.0156 71.5938 L44.5312 71.5938 L15.2812 0 L5.7188 0 Z"
/></font
><font horiz-adv-x="78.22266" id="testfont4"
- ><font-face ascent="92.1535" descent="19.553635" units-per-em="100" font-family="Arial" font-style="italic" font-weight="bold"
+ ><font-face ascent="92.1535" font-style="italic" descent="19.553635" units-per-em="100" font-family="Arial" font-weight="bold"
/><missing-glyph horiz-adv-x="78.22266" d="M10.8906 0 L23.3906 62.5 L76.6094 62.5 L64.1094 0 L10.8906 0 ZM15.9375 1.5625 L59.6406 1.5625 L71.5156 60.9375 L27.8125 60.9375 L15.9375 1.5625 Z"
/><glyph unicode="c" horiz-adv-x="58.83789" d="M41.75 20.0156 L57.8438 17.3438 Q52.6719 8.25 45.1172 3.5234 Q37.5625 -1.2031 27.3125 -1.2031 Q15.7812 -1.2031 11.1406 4.6953 Q6.5 10.5938 8.5781 20.9375 Q10.2656 29.3906 15.2812 36.9141 Q20.2969 44.4375 28.2734 48.7578 Q36.25 53.0781 46.25 53.0781 Q57.0469 53.0781 61.5547 48.2891 Q66.0625 43.5 65.1875 35.6875 L48.2969 33.9844 Q48.7344 38.625 46.9922 40.6719 Q45.25 42.7188 43.2969 42.7188 Q40.8594 42.7188 36.7422 39.6953 Q32.625 36.6719 29.5391 30.6406 Q26.4531 24.6094 25.3906 19.3281 Q24.4688 14.75 26.2031 12.2578 Q27.9375 9.7656 29.7344 9.7656 Q31.5 9.7656 35.1094 12.2031 Q38.7188 14.6406 41.75 20.0156 Z"
/><glyph unicode="i" horiz-adv-x="31.00586" d="M31.7031 71.5938 L48.8906 71.5938 L43.6562 58.8906 L26.4688 58.8906 L31.7031 71.5938 ZM23.6406 51.8594 L40.8281 51.8594 L19.5781 0 L2.3906 0 L23.6406 51.8594 Z"
@@ -100,7 +100,7 @@
/><glyph unicode="B" horiz-adv-x="75.43945" d="M2.3906 0 L31.75 71.5938 L57.7656 71.5938 Q67.3438 71.5938 70.4219 71.0938 Q75.5312 70.3594 78.7578 68.1641 Q81.9844 65.9688 83.1562 62.3047 Q84.3281 58.6406 83.4375 54.2031 Q82.25 48.2344 78.0547 43.8672 Q73.8594 39.5 66.4688 37.25 Q71.6875 35.7344 74.0156 31.8516 Q76.3438 27.9688 75.3594 23.0938 Q74.0781 16.6406 69.2578 10.8594 Q64.4375 5.0781 57.4609 2.5391 Q50.4844 0 37.75 0 L2.3906 0 ZM37.7344 42.6719 L47.4062 42.6719 Q53.3594 42.6719 56.8906 43.75 Q60.4219 44.8281 62.5703 47.2734 Q64.7188 49.7188 65.2812 52.5 Q65.8125 55.2344 64.6094 56.9922 Q63.4062 58.75 60.6406 59.3281 Q59.1406 59.625 54.5469 59.625 L44.7344 59.625 L37.7344 42.6719 ZM25 11.5156 L37.6562 11.5156 Q44.9688 11.5156 48.25 12.6641 Q51.5312 13.8125 53.8906 16.4453 Q56.25 19.0781 56.8438 22.0312 Q57.5469 25.5781 55.3984 27.8984 Q53.25 30.2188 48.6562 30.2188 L32.6875 30.2188 L25 11.5156 Z"
/></font
><font horiz-adv-x="77.7832" id="testfont5"
- ><font-face ascent="91.23535" descent="19.506836" units-per-em="100" font-family="Times New Roman" font-style="normal" font-weight="normal"
+ ><font-face ascent="91.23535" font-style="normal" descent="19.506836" units-per-em="100" font-family="Times New Roman" font-weight="normal"
/><missing-glyph horiz-adv-x="77.7832" d="M13.875 0 L13.875 62.5 L63.875 62.5 L63.875 0 L13.875 0 ZM15.4375 1.5625 L62.3125 1.5625 L62.3125 60.9375 L15.4375 60.9375 L15.4375 1.5625 Z"
/><glyph unicode="n" horiz-adv-x="50.0" d="M16.1562 36.5781 Q24.0312 46.0469 31.1562 46.0469 Q34.8125 46.0469 37.4531 44.2188 Q40.0938 42.3906 41.6562 38.1875 Q42.7188 35.25 42.7188 29.2031 L42.7188 10.1094 Q42.7188 5.8594 43.4062 4.3438 Q43.9531 3.125 45.1484 2.4453 Q46.3438 1.7656 49.5625 1.7656 L49.5625 0 L27.4375 0 L27.4375 1.7656 L28.375 1.7656 Q31.5 1.7656 32.7422 2.7109 Q33.9844 3.6562 34.4688 5.5156 Q34.6719 6.25 34.6719 10.1094 L34.6719 28.4219 Q34.6719 34.5156 33.0859 37.2812 Q31.5 40.0469 27.7344 40.0469 Q21.9219 40.0469 16.1562 33.6875 L16.1562 10.1094 Q16.1562 5.5625 16.7031 4.5 Q17.3906 3.0781 18.5859 2.4219 Q19.7812 1.7656 23.4375 1.7656 L23.4375 0 L1.3125 0 L1.3125 1.7656 L2.2969 1.7656 Q5.7188 1.7656 6.9141 3.4922 Q8.1094 5.2188 8.1094 10.1094 L8.1094 26.7031 Q8.1094 34.7656 7.7422 36.5234 Q7.375 38.2812 6.6172 38.9141 Q5.8594 39.5469 4.5938 39.5469 Q3.2188 39.5469 1.3125 38.8125 L0.5938 40.5781 L14.0625 46.0469 L16.1562 46.0469 L16.1562 36.5781
Z"
/><glyph unicode="a" horiz-adv-x="44.384766" d="M28.4688 6.4531 Q21.5781 1.125 19.8281 0.2969 Q17.1875 -0.9062 14.2031 -0.9062 Q9.5781 -0.9062 6.5703 2.2578 Q3.5625 5.4219 3.5625 10.5938 Q3.5625 13.875 5.0312 16.2656 Q7.0312 19.5781 11.9844 22.5078 Q16.9375 25.4375 28.4688 29.6406 L28.4688 31.3906 Q28.4688 38.0938 26.3438 40.5781 Q24.2188 43.0625 20.1719 43.0625 Q17.0938 43.0625 15.2812 41.4062 Q13.4219 39.75 13.4219 37.5938 L13.5312 34.7656 Q13.5312 32.5156 12.3828 31.2969 Q11.2344 30.0781 9.375 30.0781 Q7.5625 30.0781 6.4219 31.3516 Q5.2812 32.625 5.2812 34.8125 Q5.2812 39.0156 9.5781 42.5312 Q13.875 46.0469 21.625 46.0469 Q27.5938 46.0469 31.3906 44.0469 Q34.2812 42.5312 35.6406 39.3125 Q36.5312 37.2031 36.5312 30.7188 L36.5312 15.5312 Q36.5312 9.125 36.7734 7.6875 Q37.0156 6.25 37.5781 5.7656 Q38.1406 5.2812 38.875 5.2812 Q39.6562 5.2812 40.2344 5.6094 Q41.2656 6.25 44.1875 9.1875 L44.1875 6.4531 Q38.7188 -0.8594 33.7344 -0.8594 Q31.3438 -0.8594 29.9297 0.789
1 Q28.5156 2.4375 28.4688 6.4531 ZM28.4688 9.625 L28.4688 26.6562 Q21.0938 23.7344 18.9531 22.5156 Q15.0938 20.3594 13.4297 18.0156 Q11.7656 15.6719 11.7656 12.8906 Q11.7656 9.375 13.8672 7.0547 Q15.9688 4.7344 18.7031 4.7344 Q22.4062 4.7344 28.4688 9.625 Z"
@@ -116,7 +116,7 @@
/><glyph unicode="T" horiz-adv-x="61.083984" d="M57.8594 66.2188 L58.5938 50.6875 L56.7344 50.6875 Q56.2031 54.7812 55.2812 56.5469 Q53.7656 59.375 51.25 60.7188 Q48.7344 62.0625 44.625 62.0625 L35.2969 62.0625 L35.2969 11.4688 Q35.2969 5.375 36.625 3.8594 Q38.4844 1.8125 42.3281 1.8125 L44.625 1.8125 L44.625 0 L16.5469 0 L16.5469 1.8125 L18.8906 1.8125 Q23.0938 1.8125 24.8594 4.3438 Q25.9219 5.9062 25.9219 11.4688 L25.9219 62.0625 L17.9688 62.0625 Q13.3281 62.0625 11.375 61.375 Q8.8438 60.4531 7.0312 57.8125 Q5.2188 55.1719 4.8906 50.6875 L3.0312 50.6875 L3.8125 66.2188 L57.8594 66.2188 Z"
/></font
><font horiz-adv-x="60.009766" id="testfont6"
- ><font-face ascent="83.25195" descent="30.029297" units-per-em="100" font-family="Courier New" font-style="normal" font-weight="normal"
+ ><font-face ascent="83.25195" font-style="normal" descent="30.029297" units-per-em="100" font-family="Courier New" font-weight="normal"
/><missing-glyph horiz-adv-x="60.009766" d="M5.0312 0 L5.0312 62.5 L55.0312 62.5 L55.0312 0 L5.0312 0 ZM6.5938 1.5625 L53.4688 1.5625 L53.4688 60.9375 L6.5938 60.9375 L6.5938 1.5625 Z"
/><glyph unicode="w" horiz-adv-x="60.009766" d="M44.1406 0 L39.0625 -0.0312 L30.0312 26.3125 L21.0469 -0.0312 L15.9688 0 L7.4688 38.1406 L5.4688 38.1406 Q4 38.1406 3.3672 38.7266 Q2.7344 39.3125 2.7344 40.2344 Q2.7344 41.1094 3.3672 41.6953 Q4 42.2812 5.4688 42.2812 L16.75 42.2812 Q18.2188 42.2812 18.8516 41.6953 Q19.4844 41.1094 19.4844 40.1875 Q19.4844 39.3125 18.8516 38.7266 Q18.2188 38.1406 16.75 38.1406 L11.5312 38.1406 L18.7969 5.6094 L27.5469 31.5938 L32.4219 31.5938 L41.4062 5.6094 L48.3906 38.1406 L43.2188 38.1406 Q41.75 38.1406 41.0938 38.7266 Q40.4375 39.3125 40.4375 40.2344 Q40.4375 41.1094 41.0703 41.6953 Q41.7031 42.2812 43.2188 42.2812 L54.4375 42.2812 Q55.9531 42.2812 56.5938 41.6953 Q57.2344 41.1094 57.2344 40.1875 Q57.2344 39.3125 56.5938 38.7266 Q55.9531 38.1406 54.4375 38.1406 L52.4844 38.1406 L44.1406 0 Z"
/><glyph unicode="N" horiz-adv-x="60.009766" d="M50.0938 0 L44.8281 0 L14.5938 51.125 L14.5938 4.1094 L22.1719 4.1094 Q23.6875 4.1094 24.3203 3.5469 Q24.9531 2.9844 24.9531 2.0469 Q24.9531 1.1719 24.3203 0.5859 Q23.6875 0 22.1719 0 L7.0781 0 Q5.5625 0 4.9297 0.5859 Q4.2969 1.1719 4.2969 2.0469 Q4.2969 2.9844 4.9297 3.5469 Q5.5625 4.1094 7.0781 4.1094 L10.5 4.1094 L10.5 53.0312 L4.9844 53.0312 Q3.5156 53.0312 2.8828 53.5938 Q2.25 54.1562 2.25 55.0781 Q2.25 56 2.8828 56.5625 Q3.5156 57.125 4.9844 57.125 L15.7188 57.125 L46 5.9062 L46 53.0312 L38.4219 53.0312 Q36.9688 53.0312 36.3281 53.5938 Q35.6875 54.1562 35.6875 55.0781 Q35.6875 56 36.3047 56.5625 Q36.9219 57.125 38.4219 57.125 L53.5625 57.125 Q55.0312 57.125 55.6641 56.5625 Q56.2969 56 56.2969 55.0781 Q56.2969 54.1562 55.6641 53.5938 Q55.0312 53.0312 53.5625 53.0312 L50.0938 53.0312 L50.0938 0 Z"
@@ -129,7 +129,7 @@
/><glyph unicode="C" horiz-adv-x="60.009766" d="M48.0469 51.5156 L48.0469 54.3906 Q48.0469 55.8594 48.6094 56.4922 Q49.1719 57.125 50.0938 57.125 Q51.0312 57.125 51.5938 56.4922 Q52.1562 55.8594 52.1562 54.3906 L52.1562 43.0156 Q52.1562 41.5 51.5938 40.8672 Q51.0312 40.2344 50.0938 40.2344 Q49.2656 40.2344 48.7031 40.8203 Q48.1406 41.4062 48.0469 42.7188 Q47.7969 46.8281 43.6094 50 Q37.9375 54.3438 30.7188 54.3438 Q25.9844 54.3438 21.7812 52.25 Q18.6562 50.7344 16.7969 48.5312 Q13.5781 44.7344 11.6719 40.0938 Q10.2969 36.6719 10.2969 32.375 L10.2969 25.2031 Q10.2969 16.0156 16.9375 9.25 Q23.5781 2.4844 32.375 2.4844 Q37.6406 2.4844 41.8203 4.7812 Q46 7.0781 49.9062 11.7188 Q50.7344 12.75 51.7656 12.75 Q52.6406 12.75 53.1797 12.2109 Q53.7188 11.6719 53.7188 10.8438 Q53.7188 9.7188 51.6094 7.4219 Q47.6094 2.9375 42.6016 0.6719 Q37.5938 -1.5938 32.4688 -1.5938 Q28.0312 -1.5938 23.4375 0.0938 Q19.9219 1.4219 17.625 3.1797 Q15.3281 4.9375 11.9844 9.1094 Q8.6406 13.281
2 7.4219 16.8203 Q6.2031 20.3594 6.2031 24.6094 L6.2031 32.9531 Q6.2031 39.0156 9.4531 45.3359 Q12.7031 51.6562 18.3359 55.0547 Q23.9688 58.4531 30.5625 58.4531 Q40.7188 58.4531 48.0469 51.5156 Z"
/></font
><font horiz-adv-x="100.0" id="testfont7"
- ><font-face ascent="100.53711" descent="20.996094" units-per-em="100" font-family="Verdana" font-style="normal" font-weight="normal"
+ ><font-face ascent="100.53711" font-style="normal" descent="20.996094" units-per-em="100" font-family="Verdana" font-weight="normal"
/><missing-glyph horiz-adv-x="100.0" d="M12.5 0 L12.5 75 L87.5 75 L87.5 0 L12.5 0 ZM18.75 6.25 L81.25 6.25 L81.25 68.75 L18.75 68.75 L18.75 6.25 Z"
/><glyph unicode="n" horiz-adv-x="63.28125" d="M54.6406 0 L45.4531 0 L45.4531 31.0625 Q45.4531 34.8125 45.0156 38.1094 Q44.5781 41.4062 43.4062 43.2656 Q42.1875 45.3125 39.8906 46.3125 Q37.5938 47.3125 33.9375 47.3125 Q30.1719 47.3125 26.0703 45.4609 Q21.9688 43.6094 18.2188 40.7188 L18.2188 0 L9.0312 0 L9.0312 54.5469 L18.2188 54.5469 L18.2188 48.4844 Q22.5156 52.0469 27.1016 54.0547 Q31.6875 56.0625 36.5312 56.0625 Q45.3594 56.0625 50 50.7344 Q54.6406 45.4062 54.6406 35.4062 L54.6406 0 Z"
/><glyph unicode="a" horiz-adv-x="60.058594" d="M51.4219 0 L42.2812 0 L42.2812 5.8125 Q41.0625 4.9844 38.9922 3.4922 Q36.9219 2 34.9688 1.125 Q32.6719 0 29.6875 -0.75 Q26.7031 -1.5 22.7031 -1.5 Q15.3281 -1.5 10.2031 3.375 Q5.0781 8.25 5.0781 15.8281 Q5.0781 22.0156 7.7422 25.8516 Q10.4062 29.6875 15.3281 31.8906 Q20.3125 34.0781 27.2969 34.8594 Q34.2812 35.6406 42.2812 36.0312 L42.2812 37.4531 Q42.2812 40.5781 41.1875 42.625 Q40.0938 44.6719 38.0312 45.8438 Q36.0781 46.9688 33.3438 47.3594 Q30.6094 47.75 27.6406 47.75 Q24.0312 47.75 19.5859 46.7969 Q15.1406 45.8438 10.4062 44.0469 L9.9062 44.0469 L9.9062 53.375 Q12.5938 54.1094 17.6719 54.9844 Q22.75 55.8594 27.6875 55.8594 Q33.4531 55.8594 37.7266 54.9062 Q42 53.9531 45.125 51.6562 Q48.1875 49.4219 49.8047 45.8516 Q51.4219 42.2812 51.4219 37.0156 L51.4219 0 ZM42.2812 13.4219 L42.2812 28.6094 Q38.0938 28.375 32.3984 27.8828 Q26.7031 27.3906 23.3906 26.4688 Q19.4375 25.3438 16.9922 22.9766 Q14.5469 20.6094 14.5469
16.4531 Q14.5469 11.7656 17.3828 9.3984 Q20.2188 7.0312 26.0312 7.0312 Q30.8594 7.0312 34.8672 8.9141 Q38.875 10.7969 42.2812 13.4219 Z"
@@ -139,7 +139,7 @@
/><glyph unicode="V" horiz-adv-x="68.359375" d="M67.0938 72.7031 L40.625 0 L27.7344 0 L1.2656 72.7031 L11.625 72.7031 L34.4219 8.7344 L57.2344 72.7031 L67.0938 72.7031 Z"
/></font
><font horiz-adv-x="75.0" id="testfont8"
- ><font-face ascent="100.53711" descent="21.972656" units-per-em="100" font-family="sans-serif" font-style="normal" font-weight="normal"
+ ><font-face ascent="100.53711" font-style="normal" descent="21.972656" units-per-em="100" font-family="sans-serif" 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="g" horiz-adv-x="55.615234" d="M4.9844 -4.2812 L13.5312 -5.5469 Q14.0625 -9.5 16.5 -11.3125 Q19.7812 -13.75 25.4375 -13.75 Q31.5469 -13.75 34.8672 -11.3125 Q38.1875 -8.875 39.3594 -4.4844 Q40.0469 -1.7969 39.9844 6.7812 Q34.2344 0 25.6406 0 Q14.9375 0 9.0781 7.7188 Q3.2188 15.4375 3.2188 26.2188 Q3.2188 33.6406 5.9062 39.9141 Q8.5938 46.1875 13.6953 49.6094 Q18.7969 53.0312 25.6875 53.0312 Q34.8594 53.0312 40.8281 45.6094 L40.8281 51.8594 L48.9219 51.8594 L48.9219 7.0312 Q48.9219 -5.0625 46.4609 -10.1172 Q44 -15.1719 38.6484 -18.1016 Q33.2969 -21.0312 25.4844 -21.0312 Q16.2188 -21.0312 10.5 -16.8594 Q4.7812 -12.6875 4.9844 -4.2812 ZM12.25 26.8594 Q12.25 16.6562 16.3047 11.9688 Q20.3594 7.2812 26.4688 7.2812 Q32.5156 7.2812 36.6172 11.9453 Q40.7188 16.6094 40.7188 26.5625 Q40.7188 36.0781 36.5 40.9141 Q32.2812 45.75 26.3125 45.75 Q20.4531 45.75 16.3516 40.9922 Q12.25 36.2344 12.25 26.8594 Z"
/><glyph unicode="o" horiz-adv-x="55.615234" d="M3.3281 25.9219 Q3.3281 40.3281 11.3281 47.2656 Q18.0156 53.0312 27.6406 53.0312 Q38.3281 53.0312 45.1172 46.0234 Q51.9062 39.0156 51.9062 26.6562 Q51.9062 16.6562 48.9062 10.9141 Q45.9062 5.1719 40.1641 2.0078 Q34.4219 -1.1562 27.6406 -1.1562 Q16.75 -1.1562 10.0391 5.8203 Q3.3281 12.7969 3.3281 25.9219 ZM12.3594 25.9219 Q12.3594 15.9688 16.7031 11.0156 Q21.0469 6.0625 27.6406 6.0625 Q34.1875 6.0625 38.5312 11.0391 Q42.875 16.0156 42.875 26.2188 Q42.875 35.8438 38.5 40.7969 Q34.125 45.75 27.6406 45.75 Q21.0469 45.75 16.7031 40.8203 Q12.3594 35.8906 12.3594 25.9219 Z"
@@ -149,7 +149,7 @@
/><glyph unicode="d" horiz-adv-x="55.615234" d="M40.2344 0 L40.2344 6.5469 Q35.2969 -1.1562 25.7344 -1.1562 Q19.5312 -1.1562 14.3281 2.2578 Q9.125 5.6719 6.2734 11.7969 Q3.4219 17.9219 3.4219 25.875 Q3.4219 33.6406 6.0078 39.9688 Q8.5938 46.2969 13.7734 49.6641 Q18.9531 53.0312 25.3438 53.0312 Q30.0312 53.0312 33.6953 51.0547 Q37.3594 49.0781 39.6562 45.9062 L39.6562 71.5781 L48.3906 71.5781 L48.3906 0 L40.2344 0 ZM12.4531 25.875 Q12.4531 15.9219 16.6484 10.9922 Q20.8438 6.0625 26.5625 6.0625 Q32.3281 6.0625 36.3516 10.7734 Q40.375 15.4844 40.375 25.1406 Q40.375 35.7969 36.2734 40.7734 Q32.1719 45.75 26.1719 45.75 Q20.3125 45.75 16.3828 40.9688 Q12.4531 36.1875 12.4531 25.875 Z"
/></font
><font horiz-adv-x="63.23242" id="testfont9"
- ><font-face ascent="100.53711" descent="30.029297" units-per-em="100" font-family="monospace" font-style="normal" font-weight="bold"
+ ><font-face ascent="100.53711" font-style="normal" descent="30.029297" units-per-em="100" font-family="monospace" font-weight="bold"
/><missing-glyph horiz-adv-x="63.23242" d="M3.4219 0 L3.4219 62.5 L56.6406 62.5 L56.6406 0 L3.4219 0 ZM8.1562 1.5625 L51.8594 1.5625 L51.8594 60.9375 L8.1562 60.9375 L8.1562 1.5625 Z"
/><glyph unicode="t" horiz-adv-x="63.23242" d="M29.1562 34.3281 L29.1562 14.2656 Q29.1562 11.0312 30.4688 10.0156 Q32.4688 8.4062 36.1875 8.4062 Q42.2344 8.4062 48.7344 11.6719 Q51.2656 12.9375 54.25 12.9375 Q57.8125 12.9375 59.25 11.4766 Q60.6875 10.0156 60.6875 7.9062 Q60.6875 5.9531 59.125 4.5469 Q56.7344 2.25 49.6562 0.3281 Q42.5781 -1.5938 36.1875 -1.5938 Q25.25 -1.5938 20.5859 2.4297 Q15.9219 6.4531 15.9219 12.3125 L15.9219 34.3281 L13.9219 34.3281 Q8.6875 34.3281 7.1484 35.7188 Q5.6094 37.1094 5.6094 39.3594 Q5.6094 41.5469 7.1719 42.9453 Q8.7344 44.3438 13.9219 44.3438 L15.9219 44.3438 L15.9219 53.375 Q15.9219 56.9844 17.3359 58.5234 Q18.75 60.0625 22.5625 60.0625 Q26.375 60.0625 27.7422 58.5234 Q29.1094 56.9844 29.1094 53.375 L29.1094 44.3438 L46.0469 44.3438 Q51.2656 44.3438 52.8047 42.9453 Q54.3438 41.5469 54.3438 39.3125 Q54.3438 37.1094 52.7812 35.7188 Q51.2188 34.3281 46.0469 34.3281 L29.1562 34.3281 Z"
/><glyph unicode="u" horiz-adv-x="63.23242" d="M52.8281 44.3438 L52.8281 10.0156 Q56.0625 10.0156 57.5703 8.5938 Q59.0781 7.1719 59.0781 4.9844 Q59.0781 2.7812 57.5156 1.3906 Q55.9531 0 50.7812 0 L39.6562 0 L39.6562 0.8281 Q38.5781 0.3438 34.6484 -0.625 Q30.7188 -1.5938 25.6406 -1.5938 Q19.0938 -1.5938 15.4766 0.4766 Q11.8594 2.5469 9.7656 6.2031 Q8.25 8.8438 8.25 12.7969 L8.25 34.3281 L8.1562 34.3281 Q2.9375 34.3281 1.4062 35.7188 Q-0.125 37.1094 -0.125 39.3594 Q-0.125 41.5469 1.4297 42.9453 Q2.9844 44.3438 8.1562 44.3438 L21.4844 44.3438 L21.4844 14.5469 Q21.4844 11.375 23 9.8906 Q24.5156 8.4062 26.125 8.4062 Q27.5469 8.4062 31.0312 9.6016 Q34.5156 10.7969 39.6562 13.9219 L39.6562 34.3281 L37.6406 34.3281 Q32.4219 34.3281 30.8828 35.7188 Q29.3438 37.1094 29.3438 39.3594 Q29.3438 41.5469 30.9062 42.9453 Q32.4688 44.3438 37.6406 44.3438 L52.8281 44.3438 Z"
@@ -163,7 +163,7 @@
/><glyph unicode="d" horiz-adv-x="63.23242" d="M54.5469 63.3281 L54.5469 10.0156 L54.6875 10.0156 Q59.8594 10.0156 61.4219 8.625 Q62.9844 7.2344 62.9844 4.9844 Q62.9844 2.7812 61.4219 1.3906 Q59.8594 0 54.6875 0 L41.3594 0 L41.3594 0.5938 Q41.1562 0.4375 37.3984 -0.5781 Q33.6406 -1.5938 28.0781 -1.5938 Q15.1875 -1.5938 8.3047 4.9141 Q1.4219 11.4219 1.4219 21.1406 Q1.4219 31.2969 8.6719 38.4766 Q15.9219 45.6562 27.875 45.6562 Q33.4062 45.6562 37.1641 44.4609 Q40.9219 43.2656 41.3594 42.9688 L41.3594 53.3281 L41.2656 53.3281 Q36.0312 53.3281 34.4922 54.7188 Q32.9531 56.1094 32.9531 58.2969 Q32.9531 60.5469 34.5156 61.9375 Q36.0781 63.3281 41.2656 63.3281 L54.5469 63.3281 ZM41.3594 20.8438 Q41.3594 27.0469 37.0391 31.3438 Q32.7188 35.6406 27.9844 35.6406 Q23.3438 35.6406 19 31.3438 Q14.6562 27.0469 14.6562 21 Q14.6562 15.4844 18.5312 11.9453 Q22.4062 8.4062 27.9844 8.4062 Q33.4531 8.4062 37.4062 11.9453 Q41.3594 15.4844 41.3594 20.8438 Z"
/></font
><font horiz-adv-x="60.009766" id="testfont10"
- ><font-face ascent="100.52667" descent="30.026169" units-per-em="100" font-family="monospace" font-style="italic" font-weight="normal"
+ ><font-face ascent="100.52667" font-style="italic" descent="30.026169" units-per-em="100" font-family="monospace" font-weight="normal"
/><missing-glyph horiz-adv-x="60.009766" d="M5.0312 0 L17.5312 62.5 L67.5312 62.5 L55.0312 0 L5.0312 0 ZM6.9062 1.5625 L53.7812 1.5625 L65.6562 60.9375 L18.7812 60.9375 L6.9062 1.5625 Z"
/><glyph unicode="d" horiz-adv-x="60.009766" d="M75.3438 61.2812 L51.7344 4.0938 L57.2656 4.0938 Q58.625 4.0938 59.0312 3.6797 Q59.4375 3.2656 59.2812 2.4844 Q59.0781 1.4688 58.125 0.7344 Q57.1719 0 55.5625 0 L45.9062 0 L49.2812 8.1406 Q38.1719 -1.5781 26.9844 -1.5781 Q19.5625 -1.5781 15.6641 3.3828 Q11.7656 8.3438 13.375 16.3594 Q14.6719 22.8594 19.9453 29.5703 Q25.2188 36.2812 32.4141 40.0156 Q39.6094 43.75 45.9062 43.75 Q56.6562 43.75 59.9688 33.9844 L69.4844 57.125 L64.0156 57.125 Q62.6406 57.125 62.2188 57.5703 Q61.7969 58.0156 61.9531 58.7969 Q62.1562 59.7812 63.1328 60.5312 Q64.1094 61.2812 65.7188 61.2812 L75.3438 61.2812 ZM28.9531 2.4844 Q33.3438 2.4844 37.5938 4.3203 Q41.8438 6.1562 45.6016 9.2031 Q49.3594 12.25 52.1719 16.5469 Q54.9844 20.8438 55.8906 25.3281 Q57.125 31.5 53.9062 35.5469 Q50.6875 39.5938 44.5781 39.5938 Q35.9375 39.5938 27.7031 32.7109 Q19.4688 25.8281 17.7188 17.0938 Q16.4375 10.6406 19.6406 6.5625 Q22.8438 2.4844 28.9531 2.4844 Z"
/><glyph unicode="e" horiz-adv-x="60.009766" d="M60.5781 20.1562 L18.7812 20.1562 Q18.3125 18.6562 18.1562 17.875 Q16.8281 11.1719 20.5 6.8281 Q24.1719 2.4844 31.9375 2.4844 Q36.4688 2.4844 42.0938 3.9766 Q47.7188 5.4688 52.0312 8 Q53.2969 8.7344 53.9844 8.7344 Q54.6094 8.7344 54.9688 8.2734 Q55.3281 7.8125 55.1719 7.0781 Q55 6.2031 54.0625 5.4219 Q51.3281 3.0312 44.1328 0.7266 Q36.9375 -1.5781 30.0156 -1.5781 Q21.0312 -1.5781 16.6406 3.7266 Q12.25 9.0312 13.8906 17.2344 Q14.9844 22.6562 18.2891 27.4688 Q21.5938 32.2812 26.1172 35.7734 Q30.6406 39.2656 36.1016 41.5078 Q41.5625 43.75 47.4688 43.75 Q55.875 43.75 59.9844 38.8203 Q64.0938 33.8906 62.5625 26.2188 Q62.0625 23.6719 60.5781 20.1562 ZM58.0781 24.3125 Q59.6719 31.0469 56.2812 35.3594 Q52.8281 39.5938 45.6094 39.5938 Q38.5781 39.5938 31.6406 35.4453 Q24.7031 31.2969 20.4844 24.3125 L58.0781 24.3125 Z"
@@ -176,7 +176,7 @@
/><glyph unicode="m" horiz-adv-x="60.009766" d="M28.7656 42.2812 L27.0625 38.125 Q34.5781 43.75 39.9531 43.75 Q42.875 43.75 44.6328 42.0391 Q46.3906 40.3281 46.6562 36.9688 Q50.7812 40.375 54.3047 42.0625 Q57.8281 43.75 60.7031 43.75 Q64.3125 43.75 66.2109 41.2812 Q68.1094 38.8125 67.3281 34.9062 Q67.1406 33.9375 66.6094 32.7656 L54.8125 4.0938 L58.2344 4.0938 Q59.6562 4.0938 60.0547 3.6797 Q60.4531 3.2656 60.2969 2.4844 Q60.0938 1.4688 59.125 0.7344 Q58.1562 0 56.5469 0 L48.9688 0 L62.3281 32.3594 Q62.7031 33.2031 62.8594 34.0312 Q63.375 36.625 62.2734 38.1094 Q61.1719 39.5938 59.125 39.5938 Q56.875 39.5938 54.1719 38.2344 Q50.5312 36.3281 45.2188 31.2969 L33.9688 4.0938 L37.4375 4.0938 Q38.7969 4.0938 39.2031 3.6797 Q39.6094 3.2656 39.4531 2.4844 Q39.25 1.4688 38.3047 0.7344 Q37.3594 0 35.75 0 L28.1719 0 L41.4219 32.0781 Q41.8125 33.0625 42 33.9844 Q42.4844 36.4688 41.3594 38.0312 Q40.2344 39.5938 38.3281 39.5938 Q36.125 39.5938 33.4844 38.2812 Q29.6094 36.2812
24.2188 31.2969 L13.0156 4.0938 L16.4375 4.0938 Q17.8594 4.0938 18.2578 3.6797 Q18.6562 3.2656 18.5 2.4844 Q18.2969 1.4688 17.3281 0.7344 Q16.3594 0 14.75 0 L3.7656 0 Q2.3906 0 1.9922 0.4297 Q1.5938 0.8594 1.75 1.6406 Q1.9375 2.625 2.8906 3.3594 Q3.8438 4.0938 5.4531 4.0938 L8.875 4.0938 L22.9531 38.125 L19.4844 38.125 Q18.125 38.125 17.7188 38.5703 Q17.3125 39.0156 17.4688 39.7969 Q17.6719 40.7812 18.6328 41.5312 Q19.5938 42.2812 21.2031 42.2812 L28.7656 42.2812 Z"
/></font
><font horiz-adv-x="77.7832" id="testfont11"
- ><font-face ascent="100.53711" descent="21.972656" units-per-em="100" font-family="serif" font-style="normal" font-weight="normal"
+ ><font-face ascent="100.53711" font-style="normal" descent="21.972656" units-per-em="100" font-family="serif" font-weight="normal"
/><missing-glyph horiz-adv-x="77.7832" d="M13.875 0 L13.875 62.5 L63.875 62.5 L63.875 0 L13.875 0 ZM15.4375 1.5625 L62.3125 1.5625 L62.3125 60.9375 L15.4375 60.9375 L15.4375 1.5625 Z"
/><glyph unicode="f" horiz-adv-x="33.30078" d="M20.6094 41.2188 L20.6094 11.8125 Q20.6094 5.5625 21.9688 3.9062 Q23.7812 1.7656 26.8125 1.7656 L30.8594 1.7656 L30.8594 0 L4.1562 0 L4.1562 1.7656 L6.1562 1.7656 Q8.1094 1.7656 9.7188 2.7422 Q11.3281 3.7188 11.9375 5.375 Q12.5469 7.0312 12.5469 11.8125 L12.5469 41.2188 L3.8594 41.2188 L3.8594 44.7344 L12.5469 44.7344 L12.5469 47.6562 Q12.5469 54.3438 14.6953 58.9844 Q16.8438 63.625 21.2656 66.4844 Q25.6875 69.3438 31.2031 69.3438 Q36.3281 69.3438 40.625 66.0156 Q43.4531 63.8125 43.4531 61.0781 Q43.4531 59.625 42.1875 58.3281 Q40.9219 57.0312 39.4531 57.0312 Q38.3281 57.0312 37.0859 57.8359 Q35.8438 58.6406 34.0391 61.3047 Q32.2344 63.9688 30.7188 64.8906 Q29.2031 65.8281 27.3438 65.8281 Q25.0938 65.8281 23.5312 64.625 Q21.9688 63.4219 21.2891 60.9141 Q20.6094 58.4062 20.6094 47.9531 L20.6094 44.7344 L32.125 44.7344 L32.125 41.2188 L20.6094 41.2188 Z"
/><glyph unicode="i" horiz-adv-x="27.783203" d="M14.5 69.4375 Q16.5469 69.4375 17.9922 67.9922 Q19.4375 66.5469 19.4375 64.5 Q19.4375 62.4531 17.9922 60.9844 Q16.5469 59.5156 14.5 59.5156 Q12.4531 59.5156 10.9844 60.9844 Q9.5156 62.4531 9.5156 64.5 Q9.5156 66.5469 10.9609 67.9922 Q12.4062 69.4375 14.5 69.4375 ZM18.5625 46.0469 L18.5625 10.1094 Q18.5625 5.9062 19.1719 4.5156 Q19.7812 3.125 20.9766 2.4453 Q22.1719 1.7656 25.3438 1.7656 L25.3438 0 L3.6094 0 L3.6094 1.7656 Q6.8906 1.7656 8.0078 2.3984 Q9.125 3.0312 9.7891 4.4922 Q10.4531 5.9531 10.4531 10.1094 L10.4531 27.3438 Q10.4531 34.625 10.0156 36.7656 Q9.6719 38.3281 8.9375 38.9375 Q8.2031 39.5469 6.9375 39.5469 Q5.5625 39.5469 3.6094 38.8125 L2.9375 40.5781 L16.4062 46.0469 L18.5625 46.0469 Z"
@@ -185,7 +185,7 @@
/><glyph unicode="s" horiz-adv-x="38.916016" d="M32.0312 46.0469 L32.0312 30.8125 L30.4219 30.8125 Q28.5625 37.9844 25.6562 40.5781 Q22.75 43.1719 18.2656 43.1719 Q14.8438 43.1719 12.7422 41.3594 Q10.6406 39.5469 10.6406 37.3594 Q10.6406 34.625 12.2031 32.6719 Q13.7188 30.6719 18.3594 28.4219 L25.4844 24.9531 Q35.4062 20.125 35.4062 12.2031 Q35.4062 6.1094 30.7891 2.375 Q26.1719 -1.3594 20.4531 -1.3594 Q16.3594 -1.3594 11.0781 0.0938 Q9.4688 0.5938 8.4531 0.5938 Q7.3281 0.5938 6.6875 -0.6719 L5.0781 -0.6719 L5.0781 15.2812 L6.6875 15.2812 Q8.0625 8.4531 11.9141 4.9844 Q15.7656 1.5156 20.5625 1.5156 Q23.9219 1.5156 26.0469 3.4922 Q28.1719 5.4688 28.1719 8.25 Q28.1719 11.625 25.8047 13.9219 Q23.4375 16.2188 16.3594 19.7344 Q9.2812 23.25 7.0781 26.0781 Q4.8906 28.8594 4.8906 33.1094 Q4.8906 38.625 8.6719 42.3359 Q12.4531 46.0469 18.4531 46.0469 Q21.0938 46.0469 24.8594 44.9219 Q27.3438 44.1875 28.1719 44.1875 Q28.9531 44.1875 29.3906 44.5312 Q29.8281 44.875 30.4219
46.0469 L32.0312 46.0469 Z"
/></font
><font horiz-adv-x="78.22266" id="testfont12"
- ><font-face ascent="100.53711" descent="21.972656" units-per-em="100" font-family="sans-serif" font-style="normal" font-weight="bold"
+ ><font-face ascent="100.53711" font-style="normal" descent="21.972656" units-per-em="100" font-family="sans-serif" font-weight="bold"
/><missing-glyph horiz-adv-x="78.22266" d="M10.8906 0 L10.8906 62.5 L64.1094 62.5 L64.1094 0 L10.8906 0 ZM15.625 1.5625 L59.3281 1.5625 L59.3281 60.9375 L15.625 60.9375 L15.625 1.5625 Z"
/><glyph unicode="f" horiz-adv-x="36.523438" d="M-0.375 51.8594 L7.1719 51.8594 L7.1719 55.7656 Q7.1719 62.3125 8.5703 65.5312 Q9.9688 68.75 13.7266 70.7734 Q17.4844 72.7969 24.75 72.7969 Q32.2344 72.7969 37.8438 71.0469 L35.8438 60.75 Q29.5469 62.25 28.0781 62.25 Q26.7031 62.25 25.3906 60.8594 Q24.0781 59.4688 24.0781 55.5156 L24.0781 51.8594 L34.3281 51.8594 L34.3281 41.0625 L24.0781 41.0625 L24.0781 0 L7.1719 0 L7.1719 41.0625 L-0.375 41.0625 L-0.375 51.8594 Z"
/><glyph unicode="i" horiz-adv-x="31.00586" d="M5.5625 58.8906 L5.5625 71.5781 L22.5156 71.5781 L22.4688 58.8906 L5.5625 58.8906 ZM5.5625 0 L5.5625 51.8594 L22.5156 51.8594 L22.4688 0 L5.5625 0 Z"
@@ -197,67 +197,67 @@
/></font
></defs
><g class="testC1"
- ><text xml:space="preserve" x="10" y="30" class="testC2"
+ ><text x="10" xml:space="preserve" y="30" class="testC2"
>Font size</text
></g
><g class="testC3" transform="translate(0,20)"
- ><text xml:space="preserve" x="10" y="40" class="testC4"
+ ><text x="10" xml:space="preserve" y="40" class="testC4"
>aA</text
- ><text xml:space="preserve" x="10" y="40" class="testC5" transform="translate(9.6,0)"
+ ><text x="10" xml:space="preserve" y="40" class="testC5" transform="translate(9.6,0)"
>aA</text
- ><text xml:space="preserve" x="10" y="40" class="testC6" transform="translate(21.6,0)"
+ ><text x="10" xml:space="preserve" y="40" class="testC6" transform="translate(21.6,0)"
>aA</text
- ><text xml:space="preserve" x="10" y="40" class="testC7" transform="translate(37.2,0)"
+ ><text x="10" xml:space="preserve" y="40" class="testC7" transform="translate(37.2,0)"
>aA</text
- ><text xml:space="preserve" x="10" y="40" class="testC8" transform="translate(55.2,0)"
+ ><text x="10" xml:space="preserve" y="40" class="testC8" transform="translate(55.2,0)"
>aA</text
- ><text xml:space="preserve" x="10" y="40" class="testC9" transform="translate(82.8,0)"
+ ><text x="10" xml:space="preserve" y="40" class="testC9" transform="translate(82.8,0)"
>aA</text
- ><text xml:space="preserve" x="10" y="40" class="testC10" transform="translate(135.6,0)"
+ ><text x="10" xml:space="preserve" y="40" class="testC10" transform="translate(135.6,0)"
>aA</text
></g
><g class="testC11" transform="translate(0,60)"
- ><text xml:space="preserve" x="10" y="30" class="testC12"
+ ><text x="10" xml:space="preserve" y="30" class="testC12"
>Font Styles</text
></g
><g class="testC13" transform="translate(0,80)"
- ><text xml:space="preserve" x="10" y="40" class="testC14"
+ ><text x="10" xml:space="preserve" y="40" class="testC14"
>Plain</text
- ><text xml:space="preserve" x="10" y="40" class="testC15" transform="translate(51.6,0)"
+ ><text x="10" xml:space="preserve" y="40" class="testC15" transform="translate(51.6,0)"
>Bold</text
- ><text xml:space="preserve" x="10" y="40" class="testC16" transform="translate(105.6,0)"
+ ><text x="10" xml:space="preserve" y="40" class="testC16" transform="translate(105.6,0)"
>Italic</text
- ><text xml:space="preserve" x="10" y="40" class="testC17" transform="translate(157.2,0)"
+ ><text x="10" xml:space="preserve" y="40" class="testC17" transform="translate(157.2,0)"
>Bold Italic</text
></g
><g class="testC18" transform="translate(0,120)"
- ><text xml:space="preserve" x="10" y="30" class="testC19"
+ ><text x="10" xml:space="preserve" y="30" class="testC19"
>Font Families</text
></g
><g class="testC20" transform="translate(0,139.6)"
- ><text xml:space="preserve" x="10" y="40" class="testC21"
+ ><text x="10" xml:space="preserve" y="40" class="testC21"
>Arial</text
- ><text xml:space="preserve" x="10" y="40" class="testC22" transform="translate(0,19.6)"
+ ><text x="10" xml:space="preserve" y="40" class="testC22" transform="translate(0,19.6)"
>Times New Roman</text
- ><text xml:space="preserve" x="10" y="40" class="testC23" transform="translate(0,37.8)"
+ ><text x="10" xml:space="preserve" y="40" class="testC23" transform="translate(0,37.8)"
>Courier New</text
- ><text xml:space="preserve" x="10" y="40" class="testC24" transform="translate(0,58.8)"
+ ><text x="10" xml:space="preserve" y="40" class="testC24" transform="translate(0,58.8)"
>Verdana</text
></g
><g class="testC25" transform="translate(0,268.4)"
- ><text xml:space="preserve" x="10" y="0" class="testC26"
+ ><text x="10" xml:space="preserve" y="0" class="testC26"
>Logical Fonts</text
></g
><g class="testC27" transform="translate(0,288)"
- ><text xml:space="preserve" x="10" y="0" class="testC28"
+ ><text x="10" xml:space="preserve" y="0" class="testC28"
>dialog</text
- ><text xml:space="preserve" x="10" y="0" class="testC29" transform="translate(0,16.8)"
+ ><text x="10" xml:space="preserve" y="0" class="testC29" transform="translate(0,16.8)"
>dialoginput</text
- ><text xml:space="preserve" x="10" y="0" class="testC30" transform="translate(0,33.6)"
+ ><text x="10" xml:space="preserve" y="0" class="testC30" transform="translate(0,33.6)"
>monospaced</text
- ><text xml:space="preserve" x="10" y="0" class="testC31" transform="translate(0,49)"
+ ><text x="10" xml:space="preserve" y="0" class="testC31" transform="translate(0,49)"
>serif</text
- ><text xml:space="preserve" x="10" y="0" class="testC32" transform="translate(0,65.8)"
+ ><text x="10" xml:space="preserve" y="0" class="testC32" transform="translate(0,65.8)"
>sansserif</text
></g
></g