Commit 56516d4160478f5eea54a80c4b6993e8af424572

sammy 2008-05-01T12:05:27

* Remade metrics.png using Inkscape.

diff --git a/docs/Makefile.am b/docs/Makefile.am
index ae970a2..3a3ae3a 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -28,6 +28,7 @@ EXTRA_DIST = \
     FTGL_1_3.gif \
     images/ftgldemo.jpg \
     images/metrics.png \
+    images/metrics.svg \
     $(NULL)
 
 NULL =
diff --git a/docs/images/metrics.png b/docs/images/metrics.png
index e5eb472..367b58d 100644
Binary files a/docs/images/metrics.png and b/docs/images/metrics.png differ
diff --git a/docs/images/metrics.svg b/docs/images/metrics.svg
new file mode 100644
index 0000000..686043f
--- /dev/null
+++ b/docs/images/metrics.svg
@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   width="388"
+   height="253"
+   version="1.0"
+   sodipodi:docname="metrics.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="metrics.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="EmptyTriangleInL"
+       style="overflow:visible">
+      <path
+         id="path3378"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;fill:#FFFFFF;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(-0.8) translate(-6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="EmptyTriangleOutL"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="EmptyTriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path3387"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;fill:#FFFFFF;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.8) translate(-6,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="EmptyTriangleOutM"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="EmptyTriangleOutM"
+       style="overflow:visible">
+      <path
+         id="path3390"
+         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+         style="fill-rule:evenodd;fill:#FFFFFF;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.4) translate(-4.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3253"
+         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-60.812845 : 433.43778 : 1"
+       inkscape:vp_y="2.6577705e-13 : 928.27612 : 0"
+       inkscape:vp_z="3168.9059 : 433.43778 : 1"
+       inkscape:persp3d-origin="1554.0465 : 270.624 : 1"
+       id="perspective9" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="986"
+     inkscape:window-width="1295"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="2"
+     inkscape:cx="186.00122"
+     inkscape:cy="172.39914"
+     inkscape:window-x="7"
+     inkscape:window-y="10"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3174"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <text
+     xml:space="preserve"
+     style="font-size:156.53997803px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif"
+     x="152.40973"
+     y="168.92683"
+     id="text3154"
+     sodipodi:linespacing="125%"
+     transform="scale(1.0099353,0.9901624)"><tspan
+       sodipodi:role="line"
+       id="tspan3156"
+       x="152.40973"
+       y="168.92683"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic">g</tspan></text>
+  <rect
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect3172"
+     width="82"
+     height="123"
+     x="114.5"
+     y="80.5" />
+  <text
+     xml:space="preserve"
+     style="font-size:22.6816864px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     x="305.80084"
+     y="36.100758"
+     id="text3176"><tspan
+       sodipodi:role="line"
+       id="tspan3178"
+       x="305.80084"
+       y="36.100758"
+       style="font-style:italic">Glyph Metrics</tspan></text>
+  <text
+     id="text3180"
+     y="25.990524"
+     x="192.38017"
+     style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     xml:space="preserve"><tspan
+       style="font-size:15px;font-style:italic"
+       y="25.990524"
+       x="192.38017"
+       id="tspan3182"
+       sodipodi:role="line">xMax</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     x="112.38017"
+     y="25.990524"
+     id="text3184"><tspan
+       sodipodi:role="line"
+       id="tspan3186"
+       x="112.38017"
+       y="25.990524"
+       style="font-size:15px;font-style:italic">xMin</tspan></text>
+  <text
+     id="text3188"
+     y="107.99052"
+     x="44.380173"
+     style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     xml:space="preserve"><tspan
+       style="font-size:15px;font-style:italic"
+       y="107.99052"
+       x="44.380173"
+       id="tspan3190"
+       sodipodi:role="line">bearingX</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     x="250.38019"
+     y="109.99051"
+     id="text3192"><tspan
+       sodipodi:role="line"
+       id="tspan3194"
+       x="250.38019"
+       y="109.99051"
+       style="font-size:15px;font-style:italic">bearingY</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     x="48.099609"
+     y="198"
+     id="text3196"><tspan
+       sodipodi:role="line"
+       id="tspan3198"
+       x="48.099609"
+       y="198"
+       style="font-size:15px;font-style:italic">origin</tspan></text>
+  <text
+     id="text3200"
+     y="237"
+     x="160.50977"
+     style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     xml:space="preserve"><tspan
+       style="font-size:15px;font-style:italic"
+       y="237"
+       x="160.50977"
+       id="tspan3202"
+       sodipodi:role="line">advance</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     x="281.61328"
+     y="143"
+     id="text3204"><tspan
+       sodipodi:role="line"
+       id="tspan3206"
+       x="281.61328"
+       y="143"
+       style="font-size:15px;font-style:italic">height</tspan></text>
+  <text
+     id="text3208"
+     y="57.990509"
+     x="156.38019"
+     style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     xml:space="preserve"><tspan
+       style="font-size:15px;font-style:italic"
+       y="57.990509"
+       x="156.38019"
+       id="tspan3210"
+       sodipodi:role="line">width</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     x="352.38019"
+     y="85.990524"
+     id="text3212"><tspan
+       sodipodi:role="line"
+       id="tspan3214"
+       x="352.38019"
+       y="85.990524"
+       style="font-size:15px;font-style:italic">yMax</tspan></text>
+  <text
+     id="text3216"
+     y="205.99051"
+     x="352.38019"
+     style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     xml:space="preserve"><tspan
+       style="font-size:15px;font-style:italic"
+       y="205.99051"
+       x="352.38019"
+       id="tspan3218"
+       sodipodi:role="line">yMin</tspan></text>
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#EmptyTriangleOutL);stroke-opacity:1"
+     d="M 84,218.5 L 242,218.5"
+     id="path5542"
+     sodipodi:nodetypes="cc" />
+  <path
+     sodipodi:nodetypes="cc"
+     id="path7111"
+     d="M 84,104.5 L 114,104.5"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#EmptyTriangleOutL);stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#EmptyTriangleOutL);stroke-opacity:1"
+     d="M 213.5,167 L 213.5,81"
+     id="path7113"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#EmptyTriangleInL);marker-end:url(#EmptyTriangleOutL);stroke-opacity:1"
+     d="M 115,67.5 L 196,67.5"
+     id="path7115"
+     sodipodi:nodetypes="cc" />
+  <path
+     sodipodi:nodetypes="cc"
+     id="path7652"
+     d="M 309.5,203 L 309.5,81"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#EmptyTriangleInL);marker-end:url(#EmptyTriangleOutL);stroke-opacity:1" />
+  <path
+     sodipodi:nodetypes="cc"
+     id="path8187"
+     d="M 42,168 L 282,168"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;marker-end:url(#EmptyTriangleOutL);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;marker-end:url(#EmptyTriangleOutL);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 84,232 L 84,38"
+     id="path8189"
+     sodipodi:nodetypes="cc" />
+  <path
+     sodipodi:type="arc"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95723611;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path8206"
+     sodipodi:cx="80.5"
+     sodipodi:cy="163.5"
+     sodipodi:rx="4.5"
+     sodipodi:ry="5"
+     d="M 85,163.5 A 4.5,5 0 1 1 76,163.5 A 4.5,5 0 1 1 85,163.5 z"
+     transform="matrix(1.5555556,0,0,1.4,-41.222222,-60.9)" />
+  <path
+     transform="matrix(1.5555556,0,0,1.4,117.27777,-60.9)"
+     d="M 85,163.5 A 4.5,5 0 1 1 76,163.5 A 4.5,5 0 1 1 85,163.5 z"
+     sodipodi:ry="5"
+     sodipodi:rx="4.5"
+     sodipodi:cy="163.5"
+     sodipodi:cx="80.5"
+     id="path8208"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95723611;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     sodipodi:type="arc" />
+  <path
+     sodipodi:nodetypes="cc"
+     id="path8210"
+     d="M 234,39.5 L 380,39.5"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:none;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:none;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 196,80.5 L 328,80.5"
+     id="path8745"
+     sodipodi:nodetypes="cc" />
+  <path
+     sodipodi:nodetypes="cc"
+     id="path8747"
+     d="M 196,203.5 L 328,203.5"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:none;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:none;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 242.5,232 L 242.5,164"
+     id="path8749"
+     sodipodi:nodetypes="cc" />
+  <path
+     sodipodi:nodetypes="cc"
+     id="path8751"
+     d="M 196.5,84 L 196.5,32"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:none;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:none;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 114.5,84 L 114.5,32"
+     id="path8753"
+     sodipodi:nodetypes="cc" />
+  <path
+     sodipodi:nodetypes="cc"
+     id="path8755"
+     d="M 60.5,184 L 84,168"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:none;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" />
+  <text
+     id="text8757"
+     y="164"
+     x="38.099609"
+     style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bookman Uralic;-inkscape-font-specification:Bookman Uralic"
+     xml:space="preserve"><tspan
+       style="font-size:15px;font-style:italic"
+       y="164"
+       x="38.099609"
+       id="tspan8759"
+       sodipodi:role="line">baseline</tspan></text>
+</svg>