hillion 02/03/14 03:20:00
Modified: samples mapSpain.svg mapWaadt.svg
samples/tests/spec/fonts fontKerning.svg
Log:
- Fixed invalid font-family values in the sample maps.
- fontKerning had invalid glyph-orientations.
Revision Changes Path
1.3 +44 -44 xml-batik/samples/mapSpain.svg
Index: mapSpain.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/mapSpain.svg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapSpain.svg 3 Dec 2001 09:30:56 -0000 1.2
+++ mapSpain.svg 14 Mar 2002 11:20:00 -0000 1.3
@@ -13,7 +13,7 @@
<!-- Map example -->
<!-- -->
<!-- @author Andreas Neuman -->
-<!-- @version $Id: mapSpain.svg,v 1.2 2001/12/03 09:30:56 vhardy Exp $
-->
+<!-- @version $Id: mapSpain.svg,v 1.3 2002/03/14 11:20:00 hillion Exp $
-->
<!-- Translated from German to English by Bert Bos, 21 Nov 2001 -->
<!-- ========================================================================= -->
@@ -260,49 +260,49 @@
.fil1 {fill:#EECB97;fill-opacity:0.501961}
.fil2 {fill:#F4B770;fill-opacity:0.501961}
.fil0 {fill:#FFFEE3;fill-opacity:0.501961}
- .fnt0 {font-weight:normal;font-size:69;font-family:FontID0 'Humnst777 BT'}
- .fnt42 {font-weight:normal;font-size:69;font-family:FontID34 'Humnst777 BT'}
- .fnt8 {font-weight:normal;font-size:69;font-family:FontID4 'Humnst777 BT'}
- .fnt41 {font-weight:normal;font-size:83;font-family:FontID34 'Humnst777 BT'}
- .fnt5 {font-weight:normal;font-size:83;font-family:FontID4 'Humnst777 BT'}
- .fnt17 {font-weight:normal;font-size:97;font-family:FontID10 'Humnst777 BT'}
- .fnt19 {font-weight:normal;font-size:97;font-family:FontID12 'Humnst777 BT'}
- .fnt21 {font-weight:normal;font-size:97;font-family:FontID14 'Humnst777 BT'}
- .fnt23 {font-weight:normal;font-size:97;font-family:FontID16 'Humnst777 BT'}
- .fnt25 {font-weight:normal;font-size:97;font-family:FontID18 'Humnst777 BT'}
- .fnt27 {font-weight:normal;font-size:97;font-family:FontID20 'Humnst777 BT'}
- .fnt29 {font-weight:normal;font-size:97;font-family:FontID22 'Humnst777 BT'}
- .fnt31 {font-weight:normal;font-size:97;font-family:FontID24 'Humnst777 BT'}
- .fnt33 {font-weight:normal;font-size:97;font-family:FontID26 'Humnst777 BT'}
- .fnt35 {font-weight:normal;font-size:97;font-family:FontID28 'Humnst777 BT'}
- .fnt37 {font-weight:normal;font-size:97;font-family:FontID30 'Humnst777 BT'}
- .fnt39 {font-weight:normal;font-size:97;font-family:FontID32 'Humnst777 BT'}
- .fnt13 {font-weight:normal;font-size:97;font-family:FontID6 'Humnst777 BT'}
- .fnt15 {font-weight:normal;font-size:97;font-family:FontID8 'Humnst777 BT'}
- .fnt18 {font-weight:normal;font-size:97;font-family:FontID11 Symbol}
- .fnt20 {font-weight:normal;font-size:97;font-family:FontID13 Symbol}
- .fnt22 {font-weight:normal;font-size:97;font-family:FontID15 Symbol}
- .fnt24 {font-weight:normal;font-size:97;font-family:FontID17 Symbol}
- .fnt26 {font-weight:normal;font-size:97;font-family:FontID19 Symbol}
- .fnt28 {font-weight:normal;font-size:97;font-family:FontID21 Symbol}
- .fnt30 {font-weight:normal;font-size:97;font-family:FontID23 Symbol}
- .fnt32 {font-weight:normal;font-size:97;font-family:FontID25 Symbol}
- .fnt34 {font-weight:normal;font-size:97;font-family:FontID27 Symbol}
- .fnt36 {font-weight:normal;font-size:97;font-family:FontID29 Symbol}
- .fnt38 {font-weight:normal;font-size:97;font-family:FontID31 Symbol}
- .fnt40 {font-weight:normal;font-size:97;font-family:FontID33 Symbol}
- .fnt12 {font-weight:normal;font-size:97;font-family:FontID5 Symbol}
- .fnt14 {font-weight:normal;font-size:97;font-family:FontID7 Symbol}
- .fnt16 {font-weight:normal;font-size:97;font-family:FontID9 Symbol}
- .fnt3 {font-weight:normal;font-size:111;font-family:FontID2 'Humnst777 BT'}
- .fnt7 {font-weight:normal;font-size:111;font-family:FontID4 'Humnst777 BT'}
- .fnt2 {font-weight:normal;font-size:130;font-family:FontID2 'Humnst777 BT'}
- .fnt9 {font-weight:normal;font-size:130;font-family:FontID4 'Humnst777 BT'}
- .fnt11 {font-weight:bold;font-size:130;font-family:FontID4 'Humnst777 BT'}
- .fnt4 {font-weight:normal;font-size:167;font-family:FontID3 'Humnst777 Lt BT'}
- .fnt10 {font-weight:bold;font-size:222;font-family:FontID4 'Humnst777 BT'}
- .fnt6 {font-style:italic;font-weight:normal;font-size:83;font-family:FontID4
'Humnst777 BT'}
- .fnt1 {font-style:italic;font-weight:normal;font-size:167;font-family:FontID1
'Humnst777 Lt BT'}
+ .fnt0 {font-weight:normal;font-size:69;font-family:FontID0, 'Humnst777 BT'}
+ .fnt42 {font-weight:normal;font-size:69;font-family:FontID34, 'Humnst777 BT'}
+ .fnt8 {font-weight:normal;font-size:69;font-family:FontID4, 'Humnst777 BT'}
+ .fnt41 {font-weight:normal;font-size:83;font-family:FontID34, 'Humnst777 BT'}
+ .fnt5 {font-weight:normal;font-size:83;font-family:FontID4, 'Humnst777 BT'}
+ .fnt17 {font-weight:normal;font-size:97;font-family:FontID10, 'Humnst777 BT'}
+ .fnt19 {font-weight:normal;font-size:97;font-family:FontID12, 'Humnst777 BT'}
+ .fnt21 {font-weight:normal;font-size:97;font-family:FontID14, 'Humnst777 BT'}
+ .fnt23 {font-weight:normal;font-size:97;font-family:FontID16, 'Humnst777 BT'}
+ .fnt25 {font-weight:normal;font-size:97;font-family:FontID18, 'Humnst777 BT'}
+ .fnt27 {font-weight:normal;font-size:97;font-family:FontID20, 'Humnst777 BT'}
+ .fnt29 {font-weight:normal;font-size:97;font-family:FontID22, 'Humnst777 BT'}
+ .fnt31 {font-weight:normal;font-size:97;font-family:FontID24, 'Humnst777 BT'}
+ .fnt33 {font-weight:normal;font-size:97;font-family:FontID26, 'Humnst777 BT'}
+ .fnt35 {font-weight:normal;font-size:97;font-family:FontID28, 'Humnst777 BT'}
+ .fnt37 {font-weight:normal;font-size:97;font-family:FontID30, 'Humnst777 BT'}
+ .fnt39 {font-weight:normal;font-size:97;font-family:FontID32, 'Humnst777 BT'}
+ .fnt13 {font-weight:normal;font-size:97;font-family:FontID6, 'Humnst777 BT'}
+ .fnt15 {font-weight:normal;font-size:97;font-family:FontID8, 'Humnst777 BT'}
+ .fnt18 {font-weight:normal;font-size:97;font-family:FontID11, Symbol}
+ .fnt20 {font-weight:normal;font-size:97;font-family:FontID13, Symbol}
+ .fnt22 {font-weight:normal;font-size:97;font-family:FontID15, Symbol}
+ .fnt24 {font-weight:normal;font-size:97;font-family:FontID17, Symbol}
+ .fnt26 {font-weight:normal;font-size:97;font-family:FontID19, Symbol}
+ .fnt28 {font-weight:normal;font-size:97;font-family:FontID21, Symbol}
+ .fnt30 {font-weight:normal;font-size:97;font-family:FontID23, Symbol}
+ .fnt32 {font-weight:normal;font-size:97;font-family:FontID25, Symbol}
+ .fnt34 {font-weight:normal;font-size:97;font-family:FontID27, Symbol}
+ .fnt36 {font-weight:normal;font-size:97;font-family:FontID29, Symbol}
+ .fnt38 {font-weight:normal;font-size:97;font-family:FontID31, Symbol}
+ .fnt40 {font-weight:normal;font-size:97;font-family:FontID33, Symbol}
+ .fnt12 {font-weight:normal;font-size:97;font-family:FontID5, Symbol}
+ .fnt14 {font-weight:normal;font-size:97;font-family:FontID7, Symbol}
+ .fnt16 {font-weight:normal;font-size:97;font-family:FontID9, Symbol}
+ .fnt3 {font-weight:normal;font-size:111;font-family:FontID2, 'Humnst777 BT'}
+ .fnt7 {font-weight:normal;font-size:111;font-family:FontID4, 'Humnst777 BT'}
+ .fnt2 {font-weight:normal;font-size:130;font-family:FontID2, 'Humnst777 BT'}
+ .fnt9 {font-weight:normal;font-size:130;font-family:FontID4, 'Humnst777 BT'}
+ .fnt11 {font-weight:bold;font-size:130;font-family:FontID4, 'Humnst777 BT'}
+ .fnt4 {font-weight:normal;font-size:167;font-family:FontID3, 'Humnst777 Lt BT'}
+ .fnt10 {font-weight:bold;font-size:222;font-family:FontID4, 'Humnst777 BT'}
+ .fnt6 {font-style:italic;font-weight:normal;font-size:83;font-family:FontID4,
'Humnst777 BT'}
+ .fnt1 {font-style:italic;font-weight:normal;font-size:167;font-family:FontID1,
'Humnst777 Lt BT'}
]]></style></defs>
<g id="relief">
<image transform="matrix(0.555102 0 0 0.555268 -5368.74 5205.7)" x="0"
y="-8696" width="15792"
1.3 +13 -13 xml-batik/samples/mapWaadt.svg
Index: mapWaadt.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/mapWaadt.svg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapWaadt.svg 3 Dec 2001 09:30:56 -0000 1.2
+++ mapWaadt.svg 14 Mar 2002 11:20:00 -0000 1.3
@@ -13,7 +13,7 @@
<!-- Map example. -->
<!-- -->
<!-- @author Andreas Neuman -->
-<!-- @version $Id: mapWaadt.svg,v 1.2 2001/12/03 09:30:56 vhardy Exp $
-->
+<!-- @version $Id: mapWaadt.svg,v 1.3 2002/03/14 11:20:00 hillion Exp $
-->
<!-- Translated from German to English by Bert Bos, 21 Nov 2001 -->
<!-- ========================================================================= -->
@@ -211,18 +211,18 @@
.fil3 {fill:#F3CFA8}
.fil11 {fill:#F6F18B}
.fil0 {fill:#C4E1F6}
- .fnt10 {font-weight:normal;font-size:56;font-family:FontID0 'Humnst777 BT'}
- .fnt7 {font-weight:normal;font-size:69;font-family:FontID0 'Humnst777 BT'}
- .fnt6 {font-weight:normal;font-size:83;font-family:FontID0 'Humnst777 BT'}
- .fnt9 {font-weight:normal;font-size:97;font-family:FontID0 'Humnst777 BT'}
- .fnt8 {font-weight:normal;font-size:111;font-family:FontID0 'Humnst777 BT'}
- .fnt11 {font-weight:bold;font-size:111;font-family:FontID0 'Humnst777 BT'}
- .fnt0 {font-weight:normal;font-size:125;font-family:FontID0 'Humnst777 BT'}
- .fnt4 {font-weight:bold;font-size:139;font-family:FontID0 'Humnst777 BT'}
- .fnt5 {font-weight:normal;font-size:194;font-family:FontID0 'Humnst777 BT'}
- .fnt3 {font-weight:bold;font-size:306;font-family:FontID0 'Humnst777 BT'}
- .fnt2 {font-style:italic;font-weight:normal;font-size:111;font-family:FontID0
'Humnst777 BT'}
- .fnt1 {font-style:italic;font-weight:normal;font-size:167;font-family:FontID0
'Humnst777 BT'}
+ .fnt10 {font-weight:normal;font-size:56;font-family:FontID0, 'Humnst777 BT'}
+ .fnt7 {font-weight:normal;font-size:69;font-family:FontID0, 'Humnst777 BT'}
+ .fnt6 {font-weight:normal;font-size:83;font-family:FontID0, 'Humnst777 BT'}
+ .fnt9 {font-weight:normal;font-size:97;font-family:FontID0, 'Humnst777 BT'}
+ .fnt8 {font-weight:normal;font-size:111;font-family:FontID0, 'Humnst777 BT'}
+ .fnt11 {font-weight:bold;font-size:111;font-family:FontID0, 'Humnst777 BT'}
+ .fnt0 {font-weight:normal;font-size:125;font-family:FontID0, 'Humnst777 BT'}
+ .fnt4 {font-weight:bold;font-size:139;font-family:FontID0, 'Humnst777 BT'}
+ .fnt5 {font-weight:normal;font-size:194;font-family:FontID0, 'Humnst777 BT'}
+ .fnt3 {font-weight:bold;font-size:306;font-family:FontID0, 'Humnst777 BT'}
+ .fnt2 {font-style:italic;font-weight:normal;font-size:111;font-family:FontID0,
'Humnst777 BT'}
+ .fnt1 {font-style:italic;font-weight:normal;font-size:167;font-family:FontID0,
'Humnst777 BT'}
]]></style></defs>
<g id="polygonAreas">
<path class="fil0"
1.4 +7 -7 xml-batik/samples/tests/spec/fonts/fontKerning.svg
Index: fontKerning.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/fonts/fontKerning.svg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fontKerning.svg 20 Nov 2001 15:08:24 -0000 1.3
+++ fontKerning.svg 14 Mar 2002 11:20:00 -0000 1.4
@@ -14,7 +14,7 @@
<!-- Tests various methods of specifying kerning. -->
<!-- -->
<!-- @author [EMAIL PROTECTED] -->
-<!-- @version $Id: fontKerning.svg,v 1.3 2001/11/20 15:08:24 hillion Exp $ -->
+<!-- @version $Id: fontKerning.svg,v 1.4 2002/03/14 11:20:00 hillion Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="../../resources/style/test.css" ?>
@@ -229,14 +229,14 @@
<text x="260" y="130" glyph-orientation-vertical="auto"
writing-mode="tb" font-family="SVGComic" fill="#6666FF">abcdefg</text>
<text x="285" y="130" glyph-orientation-vertical="auto"
writing-mode="tb" font-family="SVGComicK" fill="#6666FF">abcdefg</text>
- <text x="260" y="300" glyph-orientation-vertical="0"
writing-mode="tb" font-family="SVGComic" fill="#6666FF">abcdefg</text>
- <text x="280" y="300" glyph-orientation-vertical="0"
writing-mode="tb" font-family="SVGComicK" fill="#6666FF">abcdefg</text>
+ <text x="260" y="300" glyph-orientation-vertical="0deg"
writing-mode="tb" font-family="SVGComic" fill="#6666FF">abcdefg</text>
+ <text x="280" y="300" glyph-orientation-vertical="0deg"
writing-mode="tb" font-family="SVGComicK" fill="#6666FF">abcdefg</text>
- <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="130" glyph-orientation-vertical="0deg"
writing-mode="tb" font-family="SVGComic" fill="red">uvwxyz</text>
+ <text x="360" y="130" glyph-orientation-vertical="0deg"
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="#33CC33">abcxyz</text>
- <text x="360" y="300" glyph-orientation-vertical="180"
writing-mode="tb" font-family="SVGComicK" fill="#33CC33">abcxyz</text>
+ <text x="340" y="300" glyph-orientation-vertical="180deg"
writing-mode="tb" font-family="SVGComic" fill="#33CC33">abcxyz</text>
+ <text x="360" y="300" glyph-orientation-vertical="180deg"
writing-mode="tb" font-family="SVGComicK" fill="#33CC33">abcxyz</text>
</g>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
