put decent glyphs for font

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194890 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 35 insertions, 25 deletions

diff --git a/test/resources/fop/svg/text.svg b/test/resources/fop/svg/text.svg
index f48bff0da..405e09c2d 100644
--- a/test/resources/fop/svg/text.svg
+++ b/test/resources/fop/svg/text.svg
@@ -68,39 +68,49 @@
  <missing-glyph horiz-adv-x="150" d="M20 0 V240 H100 V0 z"/>
 
  <glyph unicode=" " glyph-name=" " horiz-adv-x="100"/>
- <glyph unicode="F" glyph-name="F" horiz-adv-x="130">
-                    <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 unicode="F" glyph-name="F" horiz-adv-x="190">
+<g transform="scale(1.5, -1.5) translate(0, -130)">
+<g style="stroke:black;stroke-width:8">
+<line x1="5" y1="20" x2="125" y2="20"/>
+<line x1="5" y1="40" x2="40" y2="40"/>
+<line x1="5" y1="60" x2="100" y2="60"/>
+<line x1="5" y1="85" x2="40" y2="85"/>
+<line x1="5" y1="110" x2="40" y2="110"/>
+</g>
+</g>
   </glyph>
 
- <glyph unicode="o" glyph-name="o" 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 unicode="O" glyph-name="o" horiz-adv-x="185">
+<g transform="scale(1.5, -1.5) translate(0, -130)">
+<g style="stroke:black;stroke-width:8">
+<line x1="50" y1="30" x2="80" y2="30"/>
+<line x1="30" y1="45" x2="100" y2="45"/>
+<line x1="20" y1="60" x2="110" y2="60"/>
+<line x1="30" y1="80" x2="100" y2="80"/>
+<line x1="50" y1="100" x2="80" y2="100"/>
+</g>
+</g> 
   </glyph>
 
- <glyph unicode="p" glyph-name="p" 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 unicode="P" glyph-name="p" horiz-adv-x="210">
+<g transform="scale(1.5, -1.5) translate(0, -130)">
+<g style="stroke:black;stroke-width:8">
+<line x1="5" y1="20" x2="110" y2="20"/>
+<line x1="5" y1="40" x2="40" y2="40"/>
+<line x1="90" y1="40" x2="120" y2="40"/>
+<line x1="5" y1="60" x2="105" y2="60"/>
+<line x1="5" y1="85" x2="40" y2="85"/>
+<line x1="5" y1="110" x2="40" y2="110"/>
+</g>
+</g> 
   </glyph>
 
-    <hkern g1="F"  g2="o"  k="5"/>
-    <hkern g1="o"  g2="p"  k="4"/>
+    <hkern g1="F"  g2="O"  k="5"/>
+    <hkern g1="O"  g2="P"  k="4"/>
   </font>
 
-  <text x="15" y="310" font-family="FOPFont" font-size="12">Fop</text>
+  <text x="15" y="310" font-family="FOPFont" font-size="12">FOP in FOPfont</text>
 </g>
 
 </g>