deweese 2003/03/10 08:53:10
Modified: resources/org/apache/batik/apps/rasterizer/resources
rasterizer.policy
samples batikLogo.svg
samples/tests/spec/fonts batikFont.svg
test-resources/org/apache/batik/bridge
scriptPermissions2.svg
Log:
1) Uses of Batik_Squiggle now provide desired w/h
2) Security policy for rasterizer updated for use of Xerces.
Revision Changes Path
1.3 +1 -1
xml-batik/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
Index: rasterizer.policy
===================================================================
RCS file:
/home/cvs/xml-batik/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rasterizer.policy 14 May 2002 08:57:32 -0000 1.2
+++ rasterizer.policy 10 Mar 2003 16:53:07 -0000 1.3
@@ -5,7 +5,7 @@
permission java.security.AllPermission;
};
-grant codeBase "${app.dev.base}/lib/crimson-parser.jar" {
+grant codeBase "${app.dev.base}/lib/xerces_2_3_0.jar" {
permission java.security.AllPermission;
};
1.12 +7 -8 xml-batik/samples/batikLogo.svg
Index: batikLogo.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/batikLogo.svg,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- batikLogo.svg 10 Mar 2003 15:12:19 -0000 1.11
+++ batikLogo.svg 10 Mar 2003 16:53:07 -0000 1.12
@@ -24,8 +24,7 @@
<title>Batik Logo</title>
<g id="content">
<defs>
- <symbol id="Batik_Squiggle" stroke="none"
- width="54" height="57" viewBox="0 0 540 570">
+ <symbol id="Batik_Squiggle" stroke="none" viewBox="0 0 540 570">
<path id="Batik_Squiggle_Blue" fill="#6666FF"
d="M172,44C137,60,31,135,11,199c-8,27,22,48,44,33
C14,306-1,332,0,356c0,14,13,42,44,27c8-4,35-25,52-41
@@ -74,7 +73,7 @@
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" width="54" height="57"
transform="translate(45,103)" />
</g>
</glyph>
@@ -118,8 +117,8 @@
<glyph unicode="*" glyph-name="*" horiz-adv-x="120">
<g transform="scale(1, -1)">
- <use xlink:href="#Batik_Squiggle"
- transform="scale(2,2) translate(0,-67)" />
+ <use xlink:href="#Batik_Squiggle" width="108" height="114"
+ transform="translate(0,-130)" />
</g>
</glyph>
@@ -163,8 +162,8 @@
<g id="Batik_Tag_Box" >
<rect x="1" y="1" width="446" height="496"
style="fill:none; stroke:black" />
- <use xlink:href="#Batik_Squiggle"
- transform="translate(418,467) scale(0.5, 0.5)" />
+ <use xlink:href="#Batik_Squiggle" width="27" height="28"
+ transform="translate(418,467)" />
</g> <!-- End Batik_Tag_Box -->
</defs>
1.4 +3 -4 xml-batik/samples/tests/spec/fonts/batikFont.svg
Index: batikFont.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/fonts/batikFont.svg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- batikFont.svg 10 Mar 2003 15:12:19 -0000 1.3
+++ batikFont.svg 10 Mar 2003 16:53:08 -0000 1.4
@@ -30,8 +30,7 @@
<text class="title" x="50%" y="40">Batik SVG Font</text>
<defs>
- <symbol id="Batik_Squiggle" stroke="none"
- width="54" height="57" viewBox="0 0 540 570">
+ <symbol id="Batik_Squiggle" viewBox="0 0 540 570">
<path id="Batik_Squiggle_Blue" fill="#6666FF"
d="M172,44C137,60,31,135,11,199c-8,27,22,48,44,33
C14,306-1,332,0,356c0,14,13,42,44,27c8-4,35-25,52-41
@@ -80,7 +79,7 @@
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" width="54" height="57"
transform="translate(45,103)" />
</g>
</glyph>
1.3 +3 -77
xml-batik/test-resources/org/apache/batik/bridge/scriptPermissions2.svg
Index: scriptPermissions2.svg
===================================================================
RCS file:
/home/cvs/xml-batik/test-resources/org/apache/batik/bridge/scriptPermissions2.svg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scriptPermissions2.svg 10 Mar 2003 15:12:19 -0000 1.2
+++ scriptPermissions2.svg 10 Mar 2003 16:53:10 -0000 1.3
@@ -352,83 +352,9 @@
</altGlyphItem>
</altGlyphDef>
- <font horiz-adv-x="150" id="Batik">
- <font-face
- font-family="Batik SVGFont"
- units-per-em="240"
- ascent="190"
- descent="50"
- alphabetic="0"/>
-
- <missing-glyph horiz-adv-x="150" d="M20 0 V240 H100 V0 z"/>
-
-
- <glyph unicode=" " glyph-name=" " horiz-adv-x="100"/>
-
- <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
-
c-6.078,0-13.367-0.293-21.871-0.875c-8.508-0.586-13.898-0.875-16.172-0.875c-6.762,0-13.863,0.348-21.301,1.043c-1.824,0.137-2.965,0.207-3.418,0.207c-0.609,0-1.199-0.344-1.77-1.027s-0.852-1.406-0.852-2.172c0-1.598,1.355-2.93,4.074-3.996l0.113-0.055
-
c1.809-0.836,3.223-1.574,4.242-2.223c1.02-0.645,1.906-1.387,2.66-2.223c2.039-2.047,3.492-4.516,4.359-7.402s1.301-7.254,1.301-13.105z
M39.244,73.209c0,3.648,0.453,5.93,1.367,6.84c0.914,0.914,2.816,1.367,5.711,1.367h16.555
-
c12.023,0,20.758-2.031,26.203-6.098c5.441-4.066,8.164-10.508,8.164-19.324c0-10.945-4.188-20.027-12.559-27.246c-8.375-7.219-18.914-10.832-31.625-10.832c-5.711,0-9.441,0.855-11.191,2.566s-2.625,5.148-2.625,10.316v42.41z
M39.244,150.737
-
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"
- transform="translate(45,103)" />
- </g>
- </glyph>
-
- <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
-
c5.734,5.238,8.605,14.535,8.605,27.891v42.844c0,6.516,0.621,10.715,1.867,12.594s3.609,2.816,7.086,2.816c0.602,0,1.434-0.035,2.492-0.113c1.055-0.078,1.773-0.117,2.152-0.117c0.527,0,1.02,0.246,1.473,0.73c0.453,0.488,0.68,1.07,0.68,1.742
-
c0,1.574-1.273,2.887-3.816,3.934s-5.785,1.574-9.73,1.574c-4.176,0-7.668-1.039-10.477-3.117s-4.973-5.191-6.488-9.348z
M193.037,122.167c-16.43,3.43-27.789,7.273-34.074,11.535c-6.285,4.266-9.426,9.973-9.426,17.129c0,5.559,1.512,9.879,4.543,12.961
-
c3.027,3.086,7.27,4.625,12.723,4.625c7.492,0,13.738-1.941,18.738-5.832c4.996-3.887,7.496-8.813,7.496-14.777v-25.641z"/>
- </glyph>
-
- <glyph id="ti" unicode="ti" glyph-name="ti" horiz-adv-x="100">
- <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
-
c4.105,4.754,10.875,7.133,20.305,7.133c5.724,0,11.038-1.066,15.948-3.17c4.26-0.381,8.633-0.58,13.126-0.58c4.328,0,8.957,0.211,13.895,0.625c4.934,0.414,7.668,0.625,8.199,0.625c1.141,0,2.09-0.266,2.848-0.793c0.758-0.531,1.141-1.176,1.141-1.934
- c0-1.137-0.344-1.969-1.023-2.5z
M251.317,163.288c-2.773-2.922-4.156-7.227-4.156-12.914v-64.957c0,0,12.812,0.543,13.215,0.57c1.194,0.081,2.965,0.184,5.164,0.184c3.867,0,6.23,1.637,7.637,3.914c1.402,2.281,2.105,7.367,2.105,15.266v42.039
-
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 id="k" unicode="k" glyph-name="k" horiz-adv-x="120">
- <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
-
c-0.305-0.074-0.566-0.148-0.793-0.227c-1.891-0.375-3.215-0.828-3.969-1.359c-0.758-0.527-1.133-1.242-1.133-2.148c0-0.68,0.453-1.262,1.359-1.754s2.004-0.738,3.289-0.738c0.301,0,2.305,0.211,6.008,0.625c3.703,0.418,7.297,0.625,10.773,0.625
-
c2.871,0,6.141-0.207,9.809-0.625c3.664-0.414,5.875-0.625,6.633-0.625c1.438,0,2.496,0.227,3.176,0.68s1.02,1.133,1.02,2.039c0,1.734-1.285,2.828-3.855,3.281h-0.113c-1.133,0.152-2.27,0.379-3.402,0.684s-2.305,0.723-3.516,1.254
-
c-7.332,2.891-13.758,7.07-19.273,12.543c-0.605,0.684-1.059,1.141-1.359,1.367l-19.73,17.781c10.66,14.914,19.223,26.215,25.688,33.902s11.59,12.672,15.371,14.953c3.023,1.75,6.879,2.969,11.566,3.652c0.375,0.078,0.641,0.113,0.793,0.113
-
c2.191,0.152,3.609,0.438,4.254,0.852c0.641,0.414,1,1.113,1.078,2.094c0,1.133-0.512,1.922-1.535,2.375s-3.012,0.68-5.965,0.68h-19.277c-5,0-15.23-10.113-30.684-30.34c-5.609-7.375-10.117-13.227-13.523-17.563l-6.516,6.156v15.617
-
c0,6.852,0.531,11.344,1.602,13.477c1.066,2.133,3.086,3.883,6.059,5.25c1.219,0.535,3.121,0.992,5.715,1.371c0.078,0.023,0.152,0.031,0.23,0.031c2.133,0.152,3.523,0.492,4.172,1.023s0.973,1.363,0.973,2.5c0,0.836-0.344,1.496-1.027,1.988
-
s-1.594,0.738-2.734,0.738c-0.305,0-2.758-0.211-7.355-0.625c-4.602-0.414-8.992-0.625-13.172-0.625c-6.309,0-12.313,0.375-18.016,1.125c-0.914,0.082-1.445,0.125-1.594,0.125c-0.836,0-1.523-0.25-2.055-0.746s-0.797-1.09-0.797-1.777
-
c0-0.766,0.262-1.473,0.789-2.121c0.523-0.648,1.613-1.434,3.27-2.355c0.375-0.227,0.789-0.492,1.242-0.797c1.273-0.758,2.215-1.445,2.816-2.055c1.277-1.367,2.16-3.074,2.648-5.129c0.488-2.051,0.734-5.926,0.734-11.629z"/>
- </glyph>
-
- <hkern g1="B" g2="a" k="5"/>
- <hkern g1="a" g2="t" k="14"/>
- <hkern g1="a" g2="ti" k="14"/>
- <hkern g1="i" g2="k" k="6"/>
- <hkern g1="ti" g2="k" k="6"/>
- </font>
-
<defs>
- <symbol id="Batik_Squiggle" stroke="none"
- width="54" height="57" viewBox="0 0 540 570">
+ <symbol id="Batik_Squiggle" viewBox="0 0 540 570">
<path id="Batik_Squiggle_Blue" fill="#6666FF"
d="M172,44C137,60,31,135,11,199c-8,27,22,48,44,33
C14,306-1,332,0,356c0,14,13,42,44,27c8-4,35-25,52-41
@@ -477,7 +403,7 @@
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" width="54" height="57"
transform="translate(45,103)" />
</g>
</glyph>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
