bella 01/07/04 22:58:49
Modified: samples/tests batikFont.svg fontChoice.svg fontKerning.svg
Log:
minor cosmetic changes
Revision Changes Path
1.4 +17 -18 xml-batik/samples/tests/batikFont.svg
Index: batikFont.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/batikFont.svg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- batikFont.svg 2001/05/14 16:42:22 1.3
+++ batikFont.svg 2001/07/05 05:58:49 1.4
@@ -14,7 +14,7 @@
<!-- Defines a Batik SVG font. -->
<!-- -->
<!-- @author [EMAIL PROTECTED] -->
-<!-- @version $Id: batikFont.svg,v 1.3 2001/05/14 16:42:22 tkormann Exp $ -->
+<!-- @version $Id: batikFont.svg,v 1.4 2001/07/05 05:58:49 bella Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="test.css" ?>
@@ -30,10 +30,9 @@
<text class="title" x="50%" y="40">Batik SVG Font</text>
<defs>
+
-
<g id="Batik_Squiggle">
- <!-- The squiggle is defined as approx 54x57 units @ 0,0 -->
<path id="Batik_Squiggle_Blue" style="fill:#6666FF;"
d="M7,22c2.783-3.428,5.975-5.999,9.896-8.025c-1.157-1.682-2.313-3.363-3.47-5.045c-3.529,8.583-9.506,15.878-12.988,24.507c-1.424,3.528,1.087,7.368,4.788,4.606c4.628-3.453,9.209-6.988,12.807-11.548
@@ -64,7 +63,7 @@
c2.271-2.566,3.568-5.538,5.016-8.597c2.284-4.825-3.085-6.168-6.233-3.18c-3.328,3.158-7.349,5.426-10.644,8.623c2.044,1.02,4.088,2.041,6.132,3.061c1.928-4.203,2.889-8.988,5.245-12.96c2.417-4.074-1.607-5.273-4.748-3.628
c-3.403,1.783-6.204,3.945-8.23,7.255c-0.98,1.601-1.226,4.278,1.271,4.468c2.564,0.195,5.004-1.875,6.301-3.884z"/>
- </g> <!-- End Batik_Squiggle -->
+ </g>
<!-- ============================= -->
@@ -75,7 +74,7 @@
<font-face
font-family="Batik SVGFont"
units-per-em="240"
- ascent="240"
+ ascent="190"
descent="50"
alphabetic="0"/>
@@ -84,8 +83,8 @@
<glyph unicode=" " glyph-name=" " horiz-adv-x="100"/>
- <glyph id="B" unicode="B" glyph-name="B" horiz-adv-x="125">
- <g transform="scale(1,-1)translate(0,-170)">
+ <glyph id="B" unicode="B" glyph-name="B" horiz-adv-x="130">
+ <g transform="scale(1,-1)translate(0,-170)">
<path
d="M21.244,141.963V40.831c0-6.188-0.57-10.773-1.707-13.754c-1.137-2.977-3.066-5.461-5.793-7.449c-1.137-0.766-2.367-1.395-3.695-1.891s-3.012-0.938-5.055-1.32c-2.125-0.371-3.488-0.781-4.094-1.23s-0.906-1.121-0.906-2.02
c0-1.195,0.32-2.035,0.969-2.52c0.645-0.484,1.953-0.73,3.93-0.73c0.758,0,3.816,0.211,9.176,0.625c5.355,0.418,10.387,0.625,15.098,0.625c2.961,0,7.883-0.207,14.758-0.625c6.875-0.414,12.324-0.625,16.352-0.625c16.711,0,29.762,3.461,39.145,10.379
s14.074,16.574,14.074,28.965c0,7.148-1.793,13.418-5.375,18.816c-3.586,5.398-9,9.996-16.242,13.797v2.18c11.574,2.051,20.445,6.547,26.613,13.492s9.254,15.879,9.254,26.805c0,15.406-5.184,27.645-15.551,36.715s-24.473,13.602-42.316,13.602
@@ -95,13 +94,13 @@
c0,6.539,1.789,10.953,5.371,13.242c3.578,2.293,11.16,3.438,22.746,3.438c14.172,0,24.82-3.031,31.945-9.094s10.688-15.156,10.688-27.281c0-13.031-4.234-23.188-12.695-30.461s-20.316-10.914-35.563-10.914H47.463c-3.578,0-5.84,0.477-6.793,1.426
s-1.426,3.285-1.426,7.004v52.641z"/>
<!-- Put the Squiggle in the B -->
- <use xlink:href="#Batik_Squiggle"
+ <use xlink:href="#Batik_Squiggle"
transform="translate(45,103)" />
- </g>
+ </g>
</glyph>
- <glyph id="a" unicode="a" glyph-name="a" horiz-adv-x="100">
- <path transform="scale(1,-1)translate(-120, -170)"
+ <glyph id="a" unicode="a" glyph-name="a" horiz-adv-x="105">
+ <path transform="scale(1,-1)translate(-125, -170)"
d="M194.825,161.952c-5.238,4.766-10.891,8.285-16.961,10.559c-6.07,2.27-12.863,3.406-20.375,3.406c-7.363,0-12.98-1.922-16.848-5.762c-3.871-3.844-5.805-9.414-5.805-16.719c0-9.359,4.266-16.758,12.805-22.195
c8.535-5.438,23.766-10.215,45.695-14.324v-15.789c0-7.09-2.16-12.523-6.477-16.297s-10.523-5.664-18.625-5.664c-6.891,0-11.758,0.992-14.598,2.977s-4.258,5.336-4.258,10.063c0,1.984,0.281,4.27,0.852,6.863s0.855,4.156,0.855,4.688
c0,1.07-0.516,1.945-1.547,2.633s-2.352,1.027-3.953,1.027c-3.055,0-5.652-0.816-7.793-2.449s-3.207-3.664-3.207-6.098c0-6.605,3.664-12.625,11-18.055c7.332-5.43,15.977-8.148,25.93-8.148c13.906,0,23.727,2.621,29.465,7.855
@@ -111,7 +110,7 @@
</glyph>
<glyph id="ti" unicode="ti" glyph-name="ti" horiz-adv-x="100">
- <g style="fill:#FF0000;"
transform="scale(1,-1)translate(-200,-170)">
+ <g style="fill:#FF0000;"
transform="scale(1,-1)translate(-215,-170)">
<path
d="M311.259,168.69c-0.684-0.531-2.199-0.871-4.551-1.023c-1.441,0-2.711-0.113-3.813-0.34s-2.105-0.57-3.012-1.027c-3.035-1.594-5.102-3.586-6.203-5.98c-1.102-2.391-1.648-6.625-1.648-12.703v-35.543c0-11.688,0.188-23.227,0.566-34.617
c0.078-2.047,0.117-3.227,0.117-3.531c0-1.594-0.191-2.617-0.57-3.074c-0.383-0.453-1.066-0.684-2.059-0.684c-1.066,0-9.44,3.681-11.451,4.196s-6.655,1.804-11.209,1.804h-20.266V55.045c0-1.148-0.117-1.918-0.344-2.301s-0.684-0.578-1.363-0.578
c-1.219,0-3.059,2.172-5.527,6.516s-4.727,7.617-6.777,9.824c-2.887,3.199-5.98,6.246-9.285,9.141s-4.953,4.609-4.953,5.141c0,0.609,0.375,1.203,1.129,1.773s1.434,0.855,2.035,0.855h8.586v59.84c0,11.266,2.051,19.273,6.16,24.027
@@ -120,10 +119,11 @@
c0,4.781-0.285,8.273-0.848,10.477c-0.566,2.203-1.563,4.211-2.992,6.031c-0.758,0.836-1.961,1.863-3.617,3.074c-0.292,0.169-0.532,0.312-0.731,0.434c-1.229,0.172-2.446,0.261-3.651,0.261c-5.313,0-9.355-1.457-12.125-4.379z"/>
<path
d="M284.067,48.667c1.969,0,4.207-1.535,6.711-4.605c2.5-3.07,3.754-5.555,3.754-7.453c0-1.969-1.309-4.453-3.926-7.449c-2.617-2.992-4.648-4.492-6.086-4.492c-1.594,0-3.695,1.555-6.313,4.664s-3.926,5.766-3.926,7.961c0,2.352,1.137,4.836,3.41,7.453s4.398,3.922,6.375,3.922z"/>
</g>
- </glyph>
+ </glyph>
+
<glyph id="k" unicode="k" glyph-name="k" horiz-adv-x="120">
- <path transform="scale(1,-1)translate(-290, -170)"
+ <path transform="scale(1,-1)translate(-310, -170)"
d="M331.507,147.307V35.413c0-8.078-0.68-13.219-2.031-15.43s-3.906-3.316-7.664-3.316h-1.805c-1.387,0-2.465-0.242-3.23-0.734c-0.77-0.492-1.191-1.188-1.27-2.094c0-1.656,1.977-2.941,5.93-3.848l0.23-0.074
c1.824-0.301,3.516-0.68,5.074-1.133s3.098-0.984,4.617-1.594c2.66-1.059,5.586-2.535,8.781-4.43c3.191-1.895,5.246-2.844,6.16-2.844c0.984,0,1.746,0.383,2.277,1.141s0.801,1.859,0.801,3.301c0,0.305-0.039,1.082-0.113,2.332
c-0.078,1.254-0.113,2.375-0.113,3.359c-0.383,5.391-0.668,10.684-0.859,15.883s-0.285,10.531-0.285,15.996v80.641l33.148-30.207c1.434-1.367,2.566-2.715,3.398-4.047c0.832-1.328,1.25-2.527,1.25-3.594c0-1.289-1.324-2.316-3.969-3.078
@@ -169,14 +169,13 @@
<text x="80" y="360" font-family="Batik SVGFont"
font-size="30">tititi</text>
<text x="80" y="390" font-family="Batik SVGFont" font-size="30">kkk</text>
<text x="80" y="420" font-family="Batik SVGFont" font-size="30">ktiaB</text>
- <text x="80" y="450" font-family="Batik SVGFont" font-size="30">atikB</text>
-
-
+ <text x="80" y="450" font-family="Batik SVGFont"
font-size="30">atikB</text>
+
</g>
<!-- ============================================================= -->
<!-- Batik sample mark -->
<!-- ============================================================= -->
- <use xlink:href="../batikLogo.svg#Batik_Tag_Box" />
+ <use xlink:href="../batikLogo.svg#Batik_Tag_Box" />
</svg>
1.5 +6 -5 xml-batik/samples/tests/fontChoice.svg
Index: fontChoice.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/fontChoice.svg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fontChoice.svg 2001/05/18 16:41:06 1.4
+++ fontChoice.svg 2001/07/05 05:58:49 1.5
@@ -17,7 +17,7 @@
<!-- properties if possible. -->
<!-- -->
<!-- @author [EMAIL PROTECTED] -->
-<!-- @version $Id: fontChoice.svg,v 1.4 2001/05/18 16:41:06 vhardy Exp $ -->
+<!-- @version $Id: fontChoice.svg,v 1.5 2001/07/05 05:58:49 bella Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="test.css" ?>
@@ -61,15 +61,16 @@
<path d="M256 0V1536H1792V0H256zM384 128H1664V1408H384V128z"/>
</missing-glyph>
- <glyph unicode=" " glyph-name="space" horiz-adv-x="494"/>
+ <glyph unicode=" " glyph-name="space" horiz-adv-x="494"/>
<glyph unicode="G" glyph-name="G" horiz-adv-x="1485">
<path d="M1471 567Q1447 564 1407 558T1341 539Q1311 524 1299
497T1286 432V322Q1286 202 1287 160T1291 91Q1158 31 1026 -1T767 -33Q631 -33 505 18T285
163Q190 258 134 394T78 698Q78 860 131 998T283 1239Q378
1339 509 1394T791 1450Q911 1450 1000 1421T1157 1351L1198 1419H1278L1287
923H1205Q1184 1005 1153 1084T1073 1227Q1024 1290 954 1327T785 1365Q678 1365 594
1322T448 1192Q387 1109 354 985T321 708Q321 573 353 454T448 247Q510 158 603 107T814
56Q902
56 974 83T1077 140Q1085 192 1085 245T1086 335V413Q1086 455 1075 487T1027 535Q994
550 938 557T849 567V640H1471V567z"/>
- </glyph>
-
- <glyph unicode="S" glyph-name="S" horiz-adv-x="1149">
+ </glyph>
+
+
+ <glyph unicode="S" glyph-name="S" horiz-adv-x="1149">
<path d="M981 651Q1026 601 1047 542T1069 403Q1069 215 930
93T585 -29Q490 -29 395 0T231 72L188 -1H108L94 485H175Q200 395 233 323T322 187Q374 128
443 93T605 58Q674 58 725 76T809 127Q841 160 856 204T872
307Q872 392 824 465T681 577Q616 603 532 634T387 694Q267 748 201 835T134 1064Q134
1145 167 1215T261 1340Q319 1392 398 1421T563 1451Q661 1451 738 1421T880 1351L921
1419H1001L1009 948H928Q906 1029 879 1103T807 1237Q764 1295 702 1329T550 1364Q455
1364 388 1303T321 1154Q321 1062 364 1002T489 902Q562 867 632 842T769 787Q829 761
884 728T981 651z"/>
1.2 +5 -5 xml-batik/samples/tests/fontKerning.svg
Index: fontKerning.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/fontKerning.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontKerning.svg 2001/06/13 00:13:20 1.1
+++ fontKerning.svg 2001/07/05 05:58:49 1.2
@@ -14,7 +14,7 @@
<!-- Tests various methods of specifying kerning. -->
<!-- -->
<!-- @author [EMAIL PROTECTED] -->
-<!-- @version $Id: fontKerning.svg,v 1.1 2001/06/13 00:13:20 bella Exp $ -->
+<!-- @version $Id: fontKerning.svg,v 1.2 2001/07/05 05:58:49 bella Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="test.css" ?>
@@ -219,8 +219,8 @@
<text x="40" y="275" font-size="10">u1="x" g2="y" k="400"</text>
<text x="40" y="285" font-size="10">u1="y" g2="z" k="-1000"</text>
- <text x="40" y="330" font-family="SVGComic"
fill="green">abcxyz</text>
- <text x="40" y="355" font-family="SVGComicK"
fill="green">abcxyz</text>
+ <text x="40" y="330" font-family="SVGComic"
fill="#33CC33">abcxyz</text>
+ <text x="40" y="355" font-family="SVGComicK"
fill="#33CC33">abcxyz</text>
<text x="40" y="375" font-size="10">u1="U+006?" u2="U+007?"
k="-1000"</text>
</g>
@@ -237,8 +237,8 @@
<text x="340" y="130" glyph-orientation-vertical="0"
writing-mode="tb" font-family="SVGComic" fill="red">uvwxyz</text>
<text x="360" y="130" glyph-orientation-vertical="0"
writing-mode="tb" font-family="SVGComicK" fill="red">uvwxyz</text>
- <text x="340" y="300" glyph-orientation-vertical="180"
writing-mode="tb" font-family="SVGComic" fill="green">abcxyz</text>
- <text x="360" y="300" glyph-orientation-vertical="180"
writing-mode="tb" font-family="SVGComicK" fill="green">abcxyz</text>
+ <text x="340" y="300" glyph-orientation-vertical="180"
writing-mode="tb" font-family="SVGComic" fill="#33CC33">abcxyz</text>
+ <text x="360" y="300" glyph-orientation-vertical="180"
writing-mode="tb" font-family="SVGComicK" fill="#33CC33">abcxyz</text>
</g>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
