new baseline for regression tests for graphviz-2.18

diff --git a/rtest/nshare/url_dot.ps2 b/rtest/nshare/url_dot.ps2
index 965f2de7130c63f949d4d401a8bcd1cd4907e523..6b5a67e0d14d52257c1a39926846074fd5ea383d 100644 (file)
--- a/rtest/nshare/url_dot.ps2
+++ b/rtest/nshare/url_dot.ps2
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0
-%%Creator: Graphviz version 2.16 (Sat Nov 10 02:02:40 UTC 2007)
+%%Creator: Graphviz version 2.17 (Mon Mar 10 18:55:03 UTC 2008)
 %%For: (ellson) John Ellson
 %%Title: G
 %%Pages: (atend)
@@ -181,75 +181,75 @@ setupLatin1
 [ {Catalog} << /URI << /Base (http://www.graphviz.org/doc/info/output.html) >> >>
 /PUT pdfmark
 %%Page: 1 1
-%%PageBoundingBox: 36 36 517 232
+%%PageBoundingBox: 36 36 557 234
 %%PageOrientation: Portrait
-<< /PageSize [517 232] >> setpagedevice
+<< /PageSize [557 234] >> setpagedevice
 0 0 1 beginpage
 gsave
-36 36 481 196 boxprim clip newpath
+36 36 521 198 boxprim clip newpath
 1 1 set_scale 0 rotate 40 40 translate
-[ /CropBox [36 36 517 232] /PAGES pdfmark
+[ /CropBox [36 36 557 234] /PAGES pdfmark
 [ /Rect [ -4 -4 536 716 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (http://www.graphviz.org/doc/info/output.html) >>
   /Subtype /Link
 /ANN pdfmark
 0.000 0.000 0.000 graphcolor
-14.00 /Times-Roman set_font
-218.375 7.65 moveto 35.25 (output) alignedtext
+14 /Times-Roman set_font
+238.5 7.9 moveto 35 (output) alignedtext
 % cluster0
 gsave
-[ /Rect [ 88 33 260 110 ]
+[ /Rect [ 100 33 298 110 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (http://www.graphviz.org/doc/info/arrows.html) >>
   /Subtype /Link
 /ANN pdfmark
 0.165 1.000 1.000 graphcolor
-newpath 88 33 moveto
-88 110 lineto
-260 110 lineto
-260 33 lineto
+newpath 100 33 moveto
+100 110 lineto
+298 110 lineto
+298 33 lineto
 closepath fill
 1 setlinewidth
 filled
 0.000 0.000 0.000 graphcolor
-newpath 88 33 moveto
-88 110 lineto
-260 110 lineto
-260 33 lineto
+newpath 100 33 moveto
+100 110 lineto
+298 110 lineto
+298 33 lineto
 closepath stroke
 0.000 0.000 0.000 graphcolor
-14.00 /Times-Roman set_font
-154.5 93.65 moveto 39 (arrows) alignedtext
+14 /Times-Roman set_font
+179.5 93.9 moveto 39 (arrows) alignedtext
 grestore
 % lang
 gsave
-[ /Rect [ 184 152 238 188 ]
+[ /Rect [ 212 154 268 190 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (http://www.graphviz.org/doc/info/lang.html) >>
   /Subtype /Link
 /ANN pdfmark
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-211 170 27 18 ellipse_path stroke
+240 172 27.99 18 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-14.00 /Times-Roman set_font
-198.625 165.65 moveto 24.75 (lang) alignedtext
+14 /Times-Roman set_font
+227.5 167.9 moveto 25 (lang) alignedtext
 grestore
 % colors
 gsave
-[ /Rect [ 0 35 78 83 ]
+[ /Rect [ 0 35 90 83 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (http://www.graphviz.org/doc/info/output.html) >>
   /Subtype /Link
 /ANN pdfmark
 0.537 0.247 0.902 nodecolor
-39 59 39.0416 24.0416 ellipse_path fill
+45 59 44.76 24.04 ellipse_path fill
 1 setlinewidth
 filled
 0.000 0.000 0.000 nodecolor
-39 59 39.0416 24.0416 ellipse_path stroke
-[ /Rect [ 15 46 63 72 ]
+45 59 44.76 24.04 ellipse_path stroke
+[ /Rect [ 21 46 69 72 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (http://www.graphviz.org/doc/info/colors.html) >>
   /Subtype /Link
@@ -257,37 +257,37 @@ filled
 1 setlinewidth
 solid
 0.000 0.000 0.000 nodecolor
-newpath 15 46 moveto
-15 72 lineto
-63 72 lineto
-63 46 lineto
+newpath 21 46 moveto
+21 72 lineto
+69 72 lineto
+69 46 lineto
 closepath stroke
 0.333 1.000 1.000 nodecolor
-newpath 18 49 moveto
-18 69 lineto
-60 69 lineto
-60 49 lineto
+newpath 24 49 moveto
+24 69 lineto
+66 69 lineto
+66 49 lineto
 closepath fill
 1 setlinewidth
 solid
 0.333 1.000 1.000 nodecolor
-newpath 18 49 moveto
-18 69 lineto
-60 69 lineto
-60 49 lineto
+newpath 24 49 moveto
+24 69 lineto
+66 69 lineto
+66 49 lineto
 closepath stroke
 1 setlinewidth
 solid
 0.000 0.000 0.000 nodecolor
-newpath 18 49 moveto
-18 69 lineto
-60 69 lineto
-60 49 lineto
+newpath 24 49 moveto
+24 69 lineto
+66 69 lineto
+66 49 lineto
 closepath stroke
 0.000 0.000 0.000 nodecolor
-14.00 /Times-Roman set_font
-21 55.7333 moveto 36 (colors) alignedtext
-[ /Rect [ 15 46 63 72 ]
+14 /Times-Roman set_font
+27 55.73 moveto 36 (colors) alignedtext
+[ /Rect [ 21 46 69 72 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (http://www.graphviz.org/doc/info/output.html) >>
   /Subtype /Link
@@ -297,28 +297,28 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 edgecolor
-newpath 186 162 moveto
-160 152 116 134 84 110 curveto
-76 104 68 97 62 89 curveto
+newpath 215 164 moveto
+185 155 134 136 96 110 curveto
+87 104 79 96 71 89 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 64.2191 86.221 moveto
-55 81 lineto
-58.9511 90.8306 lineto
+newpath 73.22 86.22 moveto
+64 81 lineto
+67.95 90.83 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 64.2191 86.221 moveto
-55 81 lineto
-58.9511 90.8306 lineto
+newpath 73.22 86.22 moveto
+64 81 lineto
+67.95 90.83 lineto
 closepath stroke
-[ /Rect [ 183 159 189 165 ]
+[ /Rect [ 212 161 218 167 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (lang->colors) >>
   /Subtype /Link
 /ANN pdfmark
-[ /Rect [ 52 78 58 84 ]
+[ /Rect [ 61 78 67 84 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (lang->colors) >>
   /Subtype /Link
@@ -326,46 +326,46 @@ closepath stroke
 grestore
 % command
 gsave
-[ /Rect [ 170 41 252 77 ]
+[ /Rect [ 190 41 290 77 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (http://www.graphviz.org/doc/info/command.html) >>
   /Subtype /Link
 /ANN pdfmark
 0.000 0.000 0.753 nodecolor
-211 59 41.1991 18 ellipse_path fill
+240 59 50.03 18 ellipse_path fill
 1 setlinewidth
 filled
 0.000 0.000 0.000 nodecolor
-211 59 41.1991 18 ellipse_path stroke
+240 59 50.03 18 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-14.00 /Times-Roman set_font
-182.875 54.65 moveto 56.25 (command) alignedtext
+14 /Times-Roman set_font
+212 54.9 moveto 56 (command) alignedtext
 grestore
 % lang->command
 gsave
 1 setlinewidth
 0.000 0.000 0.000 edgecolor
-newpath 211 152 moveto
-211 134 211 108 211 87 curveto
+newpath 240 154 moveto
+240 136 240 108 240 87 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 214.5 87 moveto
-211 77 lineto
-207.5 87 lineto
+newpath 243.5 87 moveto
+240 77 lineto
+236.5 87 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 214.5 87 moveto
-211 77 lineto
-207.5 87 lineto
+newpath 243.5 87 moveto
+240 77 lineto
+236.5 87 lineto
 closepath stroke
-[ /Rect [ 208 149 214 155 ]
+[ /Rect [ 237 151 243 157 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (http://www.graphviz.org/doc/info/shapes.html) >>
   /Subtype /Link
 /ANN pdfmark
-[ /Rect [ 208 74 214 80 ]
+[ /Rect [ 237 74 243 80 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (http://www.graphviz.org/doc/info/shapes.html) >>
   /Subtype /Link
@@ -375,229 +375,229 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-297 59 27 18 ellipse_path stroke
+335 59 27.1 18 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-14.00 /Times-Roman set_font
-285.75 54.65 moveto 22.5 (size) alignedtext
+14 /Times-Roman set_font
+323.5 54.9 moveto 23 (size) alignedtext
 grestore
 % lang->size
 gsave
 1 setlinewidth
 0.000 0.000 0.000 edgecolor
-newpath 225 155 moveto
-236 143 252 126 264 110 curveto
-270 102 276 93 282 85 curveto
+newpath 256 157 moveto
+269 145 288 127 302 110 curveto
+308 102 314 93 320 85 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 285.203 86.4414 moveto
-287 76 lineto
-279.084 83.0418 lineto
+newpath 323.2 86.44 moveto
+325 76 lineto
+317.08 83.04 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 285.203 86.4414 moveto
-287 76 lineto
-279.084 83.0418 lineto
+newpath 323.2 86.44 moveto
+325 76 lineto
+317.08 83.04 lineto
 closepath stroke
-[ /Rect [ 222 152 228 158 ]
+[ /Rect [ 253 154 259 160 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (headurl) >>
   /Subtype /Link
 /ANN pdfmark
-[ /Rect [ 284 73 290 79 ]
+[ /Rect [ 322 73 328 79 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (headurl) >>
   /Subtype /Link
 /ANN pdfmark
-[ /Rect [ 274.75 77.75 297.25 94.25 ]
+[ /Rect [ 312.5 77.5 335.5 94.5 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (headurl) >>
   /Subtype /Link
 /ANN pdfmark
 0.000 0.000 0.000 edgecolor
-14.00 /Times-Roman set_font
-274.75 81.65 moveto 22.5 (size) alignedtext
+14 /Times-Roman set_font
+312.5 81.9 moveto 23 (size) alignedtext
 grestore
 % name
 gsave
-[ /Rect [ 96 41 152 77 ]
+[ /Rect [ 108 41 172 77 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (G name) >>
   /Subtype /Link
 /ANN pdfmark
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-124 59 27.95 18 ellipse_path stroke
+140 59 32.16 18 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-14.00 /Times-Roman set_font
-108.625 54.65 moveto 30.75 (name) alignedtext
+14 /Times-Roman set_font
+124.5 54.9 moveto 31 (name) alignedtext
 grestore
 % word
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-349 170 27.1955 18 ellipse_path stroke
+386 172 30.77 18 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-14.00 /Times-Roman set_font
-334.375 165.65 moveto 29.25 (word) alignedtext
+14 /Times-Roman set_font
+371.5 167.9 moveto 29 (word) alignedtext
 grestore
 % word->size
 gsave
 1 setlinewidth
 0.000 0.000 0.000 edgecolor
-newpath 341 153 moveto
-332 135 319 107 310 86 curveto
+newpath 378 154 moveto
+370 136 356 107 347 85 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 312.916 84.0418 moveto
-305 77 lineto
-306.797 87.4414 lineto
+newpath 350.26 83.72 moveto
+343 76 lineto
+343.86 86.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 312.916 84.0418 moveto
-305 77 lineto
-306.797 87.4414 lineto
+newpath 350.26 83.72 moveto
+343 76 lineto
+343.86 86.56 lineto
 closepath stroke
-[ /Rect [ 338 150 344 156 ]
+[ /Rect [ 375 151 381 157 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (tailurl) >>
   /Subtype /Link
 /ANN pdfmark
-[ /Rect [ 302 74 308 80 ]
+[ /Rect [ 340 73 346 79 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (tailurl) >>
   /Subtype /Link
 /ANN pdfmark
-[ /Rect [ 321.75 138.75 344.25 155.25 ]
+[ /Rect [ 358.5 138.5 381.5 155.5 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (tailurl) >>
   /Subtype /Link
 /ANN pdfmark
 0.000 0.000 0.000 edgecolor
-14.00 /Times-Roman set_font
-321.75 142.65 moveto 22.5 (size) alignedtext
+14 /Times-Roman set_font
+358.5 142.9 moveto 23 (size) alignedtext
 grestore
 % garf
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-369 59 27 18 ellipse_path stroke
+407 59 27.1 18 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-14.00 /Times-Roman set_font
-357.375 54.65 moveto 23.25 (garf) alignedtext
+14 /Times-Roman set_font
+395.5 54.9 moveto 23 (garf) alignedtext
 grestore
 % word->garf
 gsave
 1 setlinewidth
 0.000 0.000 0.000 edgecolor
-newpath 352 152 moveto
-355 134 360 108 364 87 curveto
+newpath 389 154 moveto
+392 136 398 108 402 87 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 367.471 87.4922 moveto
-366 77 lineto
-360.607 86.1194 lineto
+newpath 405.47 87.49 moveto
+404 77 lineto
+398.61 86.12 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 367.471 87.4922 moveto
-366 77 lineto
-360.607 86.1194 lineto
+newpath 405.47 87.49 moveto
+404 77 lineto
+398.61 86.12 lineto
 closepath stroke
-[ /Rect [ 349 149 355 155 ]
+[ /Rect [ 386 151 392 157 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (labelurl) >>
   /Subtype /Link
 /ANN pdfmark
-[ /Rect [ 363 74 369 80 ]
+[ /Rect [ 401 74 407 80 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (labelurl) >>
   /Subtype /Link
 /ANN pdfmark
-[ /Rect [ 356.375 117.75 379.625 134.25 ]
+[ /Rect [ 394.5 118.5 417.5 135.5 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (garf) >>
   /Subtype /Link
 /ANN pdfmark
 0.000 0.000 0.000 edgecolor
-14.00 /Times-Roman set_font
-356.375 121.65 moveto 23.25 (garf) alignedtext
+14 /Times-Roman set_font
+394.5 122.9 moveto 23 (garf) alignedtext
 grestore
 % line
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-441 170 27 18 ellipse_path stroke
+481 172 27 18 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-14.00 /Times-Roman set_font
-430.5 165.65 moveto 21 (line) alignedtext
+14 /Times-Roman set_font
+470.5 167.9 moveto 21 (line) alignedtext
 grestore
 % all
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-441 59 27 18 ellipse_path stroke
+481 59 27 18 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-14.00 /Times-Roman set_font
-433.875 54.65 moveto 14.25 (all) alignedtext
+14 /Times-Roman set_font
+474 54.9 moveto 14 (all) alignedtext
 grestore
 % line->all
 gsave
 1 setlinewidth
 0.000 0.000 0.000 edgecolor
-newpath 441 152 moveto
-441 134 441 108 441 87 curveto
+newpath 481 154 moveto
+481 136 481 108 481 87 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 444.5 87 moveto
-441 77 lineto
-437.5 87 lineto
+newpath 484.5 87 moveto
+481 77 lineto
+477.5 87 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 444.5 87 moveto
-441 77 lineto
-437.5 87 lineto
+newpath 484.5 87 moveto
+481 77 lineto
+477.5 87 lineto
 closepath stroke
-[ /Rect [ 438 149 444 155 ]
+[ /Rect [ 478 151 484 157 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (tailURL) >>
   /Subtype /Link
 /ANN pdfmark
-[ /Rect [ 438 74 444 80 ]
+[ /Rect [ 478 74 484 80 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (headURL) >>
   /Subtype /Link
 /ANN pdfmark
-[ /Rect [ 440.375 117.75 463.625 134.25 ]
+[ /Rect [ 480.5 118.5 503.5 135.5 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (garf) >>
   /Subtype /Link
 /ANN pdfmark
 0.000 0.000 0.000 edgecolor
-14.00 /Times-Roman set_font
-440.375 121.65 moveto 23.25 (garf) alignedtext
-[ /Rect [ 417.25 77.75 472.75 94.25 ]
+14 /Times-Roman set_font
+480.5 122.9 moveto 23 (garf) alignedtext
+[ /Rect [ 457 77.5 513 94.5 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (headURL) >>
   /Subtype /Link
 /ANN pdfmark
 0.000 0.000 0.000 edgecolor
-14.00 /Times-Roman set_font
-417.25 81.65 moveto 55.5 (headlabel) alignedtext
-[ /Rect [ 414.125 134.75 459.875 151.25 ]
+14 /Times-Roman set_font
+457 81.9 moveto 56 (headlabel) alignedtext
+[ /Rect [ 454 136.5 500 153.5 ]
   /Border [ 0 0 0 ]
   /Action << /Subtype /URI /URI (tailURL) >>
   /Subtype /Link
 /ANN pdfmark
 0.000 0.000 0.000 edgecolor
-14.00 /Times-Roman set_font
-414.125 138.65 moveto 45.75 (taillabel) alignedtext
+14 /Times-Roman set_font
+454 140.9 moveto 46 (taillabel) alignedtext
 grestore
 endpage
 showpage
@@ -606,7 +606,7 @@ grestore
 %%EndPage: 1
 %%Trailer
 %%Pages: 1
-%%BoundingBox: 36 36 517 232
+%%BoundingBox: 36 36 557 234
 end
 restore
 %%EOF

diff --git a/rtest/nshare/url_dot.svg b/rtest/nshare/url_dot.svg
index f697cca2355301e210b4f386036c7a009b4406c4..530e208182de275f76e4f658aa5466e9cf473df4 100644 (file)
--- a/rtest/nshare/url_dot.svg
+++ b/rtest/nshare/url_dot.svg
@@ -4,40 +4,40 @@
  "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
  <!ATTLIST svg xmlns:xlink CDATA #FIXED "http://www.w3.org/1999/xlink">
 ]>
-<!-- Generated by Graphviz version 2.16 (Sat Nov 10 02:02:40 UTC 2007)
+<!-- Generated by Graphviz version 2.17 (Mon Mar 10 18:55:03 UTC 2008)
      For user: (ellson) John Ellson -->
 <!-- Title: G Pages: 1 -->
-<svg width="481pt" height="196pt"
- viewBox="0.00 0.00 481.00 196.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 192)">
+<svg width="521pt" height="198pt"
+ viewBox="0.00 0.00 521.00 198.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 194)">
 <title>G</title>
 <a xlink:href="http://www.graphviz.org/doc/info/output.html" xlink:title="output">
-<polygon style="fill:white;stroke:white;" points="-4,4 -4,-192 477,-192 477,4 -4,4"/>
-<text text-anchor="middle" x="236" y="-7.65" style="font-family:Times New Roman;font-size:14.00;">output</text>
+<polygon style="fill:white;stroke:white;" points="-4,4 -4,-194 517,-194 517,4 -4,4"/>
+<text text-anchor="middle" x="256" y="-7.9" style="font-family:Times New Roman;font-size:14.00;">output</text>
 </a>
 <g id="cluster2" class="cluster"><title>cluster0</title>
 <a xlink:href="http://www.graphviz.org/doc/info/arrows.html" xlink:title="arrows">
-<polygon style="fill:yellow;stroke:black;" points="88,-33 88,-110 260,-110 260,-33 88,-33"/>
-<text text-anchor="middle" x="174" y="-93.65" style="font-family:Times New Roman;font-size:14.00;">arrows</text>
+<polygon style="fill:yellow;stroke:black;" points="100,-33 100,-110 298,-110 298,-33 100,-33"/>
+<text text-anchor="middle" x="199" y="-93.9" style="font-family:Times New Roman;font-size:14.00;">arrows</text>
 </a>
 </g>
 <!-- lang -->
 <g id="node1" class="node"><title>lang</title>
 <a xlink:href="http://www.graphviz.org/doc/info/lang.html" xlink:title="lang">
-<ellipse style="fill:none;stroke:black;" cx="211" cy="-170" rx="27" ry="18"/>
-<text text-anchor="middle" x="211" y="-165.65" style="font-family:Times New Roman;font-size:14.00;">lang</text>
+<ellipse style="fill:none;stroke:black;" cx="240" cy="-172" rx="27.9903" ry="18"/>
+<text text-anchor="middle" x="240" y="-167.9" style="font-family:Times New Roman;font-size:14.00;">lang</text>
 </a>
 </g>
 <!-- colors -->
 <g id="node2" class="node"><title>colors</title>
 <a xlink:href="http://www.graphviz.org/doc/info/output.html" xlink:title="&lt;TABLE&gt;">
-<ellipse style="fill:lightblue;stroke:black;" cx="39" cy="-59" rx="39.0416" ry="24.0416"/>
+<ellipse style="fill:lightblue;stroke:black;" cx="45" cy="-59" rx="44.7575" ry="24.0416"/>
 </a>
 <a xlink:href="http://www.graphviz.org/doc/info/colors.html" xlink:title="&lt;TABLE&gt;">
-<polygon style="fill:none;stroke:black;" points="15,-46 15,-72 63,-72 63,-46 15,-46"/>
-<polygon style="fill:green;stroke:green;" points="18,-49 18,-69 60,-69 60,-49 18,-49"/>
-<polygon style="fill:none;stroke:black;" points="18,-49 18,-69 60,-69 60,-49 18,-49"/>
-<text text-anchor="middle" x="39" y="-55.7333" style="font-family:Times New Roman;font-size:14.00;">colors</text>
+<polygon style="fill:none;stroke:black;" points="21,-46 21,-72 69,-72 69,-46 21,-46"/>
+<polygon style="fill:green;stroke:green;" points="24,-49 24,-69 66,-69 66,-49 24,-49"/>
+<polygon style="fill:none;stroke:black;" points="24,-49 24,-69 66,-69 66,-49 24,-49"/>
+<text text-anchor="middle" x="45" y="-55.7333" style="font-family:Times New Roman;font-size:14.00;">colors</text>
 </a>
 <a xlink:href="http://www.graphviz.org/doc/info/output.html" xlink:title="&lt;TABLE&gt;">
 </a>
@@ -45,8 +45,8 @@
 <!-- lang&#45;&gt;colors -->
 <g id="edge5" class="edge"><title>lang&#45;&gt;colors</title>
 <a xlink:href="lang&#45;&gt;colors" xlink:title="self">
-<path style="fill:none;stroke:black;" d="M186,-162C160,-152 116,-134 84,-110 76,-104 68,-97 62,-89"/>
-<polygon style="fill:black;stroke:black;" points="64.2191,-86.221 55,-81 58.9511,-90.8306 64.2191,-86.221"/>
+<path style="fill:none;stroke:black;" d="M215,-164C185,-155 134,-136 96,-110 87,-104 79,-96 71,-89"/>
+<polygon style="fill:black;stroke:black;" points="73.2191,-86.221 64,-81 67.9511,-90.8306 73.2191,-86.221"/>
 </a>
 <a xlink:href="lang&#45;&gt;colors" xlink:title="self">
 </a>
@@ -56,15 +56,15 @@
 <!-- command -->
 <g id="node4" class="node"><title>command</title>
 <a xlink:href="http://www.graphviz.org/doc/info/command.html" xlink:title="command">
-<ellipse style="fill:grey;stroke:black;" cx="211" cy="-59" rx="41.1991" ry="18"/>
-<text text-anchor="middle" x="211" y="-54.65" style="font-family:Times New Roman;font-size:14.00;">command</text>
+<ellipse style="fill:grey;stroke:black;" cx="240" cy="-59" rx="50.0315" ry="18"/>
+<text text-anchor="middle" x="240" y="-54.9" style="font-family:Times New Roman;font-size:14.00;">command</text>
 </a>
 </g>
 <!-- lang&#45;&gt;command -->
 <g id="edge3" class="edge"><title>lang&#45;&gt;command</title>
 <a xlink:href="http://www.graphviz.org/doc/info/shapes.html">
-<path style="fill:none;stroke:black;" d="M211,-152C211,-134 211,-108 211,-87"/>
-<polygon style="fill:black;stroke:black;" points="214.5,-87 211,-77 207.5,-87 214.5,-87"/>
+<path style="fill:none;stroke:black;" d="M240,-154C240,-136 240,-108 240,-87"/>
+<polygon style="fill:black;stroke:black;" points="243.5,-87 240,-77 236.5,-87 243.5,-87"/>
 </a>
 <a xlink:href="http://www.graphviz.org/doc/info/shapes.html">
 </a>
@@ -73,96 +73,96 @@
 </g>
 <!-- size -->
 <g id="node9" class="node"><title>size</title>
-<ellipse style="fill:none;stroke:black;" cx="297" cy="-59" rx="27" ry="18"/>
-<text text-anchor="middle" x="297" y="-54.65" style="font-family:Times New Roman;font-size:14.00;">size</text>
+<ellipse style="fill:none;stroke:black;" cx="335" cy="-59" rx="27.1004" ry="18"/>
+<text text-anchor="middle" x="335" y="-54.9" style="font-family:Times New Roman;font-size:14.00;">size</text>
 </g>
 <!-- lang&#45;&gt;size -->
 <g id="edge7" class="edge"><title>lang&#45;&gt;size</title>
 <a xlink:href="headurl" xlink:title="headurl">
-<path style="fill:none;stroke:black;" d="M225,-155C236,-143 252,-126 264,-110 270,-102 276,-93 282,-85"/>
-<polygon style="fill:black;stroke:black;" points="285.203,-86.4414 287,-76 279.084,-83.0418 285.203,-86.4414"/>
+<path style="fill:none;stroke:black;" d="M256,-157C269,-145 288,-127 302,-110 308,-102 314,-93 320,-85"/>
+<polygon style="fill:black;stroke:black;" points="323.203,-86.4414 325,-76 317.084,-83.0418 323.203,-86.4414"/>
 </a>
 <a xlink:href="headurl" xlink:title="headurl">
 </a>
 <a xlink:href="headurl" xlink:title="headurl">
 </a>
 <a xlink:href="headurl" xlink:title="size">
-<text text-anchor="middle" x="286" y="-81.65" style="font-family:Times New Roman;font-size:14.00;">size</text>
+<text text-anchor="middle" x="324" y="-81.9" style="font-family:Times New Roman;font-size:14.00;">size</text>
 </a>
 </g>
 <!-- name -->
 <g id="node5" class="node"><title>name</title>
 <a xlink:href="G name" xlink:title="name">
-<ellipse style="fill:none;stroke:black;" cx="124" cy="-59" rx="27.95" ry="18"/>
-<text text-anchor="middle" x="124" y="-54.65" style="font-family:Times New Roman;font-size:14.00;">name</text>
+<ellipse style="fill:none;stroke:black;" cx="140" cy="-59" rx="32.157" ry="18"/>
+<text text-anchor="middle" x="140" y="-54.9" style="font-family:Times New Roman;font-size:14.00;">name</text>
 </a>
 </g>
 <!-- word -->
 <g id="node10" class="node"><title>word</title>
-<ellipse style="fill:none;stroke:black;" cx="349" cy="-170" rx="27.1955" ry="18"/>
-<text text-anchor="middle" x="349" y="-165.65" style="font-family:Times New Roman;font-size:14.00;">word</text>
+<ellipse style="fill:none;stroke:black;" cx="386" cy="-172" rx="30.7734" ry="18"/>
+<text text-anchor="middle" x="386" y="-167.9" style="font-family:Times New Roman;font-size:14.00;">word</text>
 </g>
 <!-- word&#45;&gt;size -->
 <g id="edge9" class="edge"><title>word&#45;&gt;size</title>
 <a xlink:href="tailurl">
-<path style="fill:none;stroke:black;" d="M341,-153C332,-135 319,-107 310,-86"/>
-<polygon style="fill:black;stroke:black;" points="312.916,-84.0418 305,-77 306.797,-87.4414 312.916,-84.0418"/>
+<path style="fill:none;stroke:black;" d="M378,-154C370,-136 356,-107 347,-85"/>
+<polygon style="fill:black;stroke:black;" points="350.26,-83.7166 343,-76 343.863,-86.5596 350.26,-83.7166"/>
 </a>
 <a xlink:href="tailurl" xlink:title="size">
 </a>
 <a xlink:href="tailurl">
 </a>
 <a xlink:href="tailurl" xlink:title="size">
-<text text-anchor="middle" x="333" y="-142.65" style="font-family:Times New Roman;font-size:14.00;">size</text>
+<text text-anchor="middle" x="370" y="-142.9" style="font-family:Times New Roman;font-size:14.00;">size</text>
 </a>
 </g>
 <!-- garf -->
 <g id="node13" class="node"><title>garf</title>
-<ellipse style="fill:none;stroke:black;" cx="369" cy="-59" rx="27" ry="18"/>
-<text text-anchor="middle" x="369" y="-54.65" style="font-family:Times New Roman;font-size:14.00;">garf</text>
+<ellipse style="fill:none;stroke:black;" cx="407" cy="-59" rx="27.1004" ry="18"/>
+<text text-anchor="middle" x="407" y="-54.9" style="font-family:Times New Roman;font-size:14.00;">garf</text>
 </g>
 <!-- word&#45;&gt;garf -->
 <g id="edge11" class="edge"><title>word&#45;&gt;garf</title>
 <a xlink:href="labelurl" xlink:title="garf">
-<path style="fill:none;stroke:black;" d="M352,-152C355,-134 360,-108 364,-87"/>
-<polygon style="fill:black;stroke:black;" points="367.471,-87.4922 366,-77 360.607,-86.1194 367.471,-87.4922"/>
+<path style="fill:none;stroke:black;" d="M389,-154C392,-136 398,-108 402,-87"/>
+<polygon style="fill:black;stroke:black;" points="405.471,-87.4922 404,-77 398.607,-86.1194 405.471,-87.4922"/>
 </a>
 <a xlink:href="labelurl" xlink:title="garf">
 </a>
 <a xlink:href="labelurl" xlink:title="garf">
 </a>
 <a xlink:href="garf" xlink:title="garf">
-<text text-anchor="middle" x="368" y="-121.65" style="font-family:Times New Roman;font-size:14.00;">garf</text>
+<text text-anchor="middle" x="406" y="-122.9" style="font-family:Times New Roman;font-size:14.00;">garf</text>
 </a>
 </g>
 <!-- line -->
 <g id="node14" class="node"><title>line</title>
-<ellipse style="fill:none;stroke:black;" cx="441" cy="-170" rx="27" ry="18"/>
-<text text-anchor="middle" x="441" y="-165.65" style="font-family:Times New Roman;font-size:14.00;">line</text>
+<ellipse style="fill:none;stroke:black;" cx="481" cy="-172" rx="27" ry="18"/>
+<text text-anchor="middle" x="481" y="-167.9" style="font-family:Times New Roman;font-size:14.00;">line</text>
 </g>
 <!-- all -->
 <g id="node16" class="node"><title>all</title>
-<ellipse style="fill:none;stroke:black;" cx="441" cy="-59" rx="27" ry="18"/>
-<text text-anchor="middle" x="441" y="-54.65" style="font-family:Times New Roman;font-size:14.00;">all</text>
+<ellipse style="fill:none;stroke:black;" cx="481" cy="-59" rx="27" ry="18"/>
+<text text-anchor="middle" x="481" y="-54.9" style="font-family:Times New Roman;font-size:14.00;">all</text>
 </g>
 <!-- line&#45;&gt;all -->
 <g id="edge13" class="edge"><title>line&#45;&gt;all</title>
 <a xlink:href="labelurl" xlink:title="edgetooltip">
-<path style="fill:none;stroke:black;" d="M441,-152C441,-134 441,-108 441,-87"/>
-<polygon style="fill:black;stroke:black;" points="444.5,-87 441,-77 437.5,-87 444.5,-87"/>
+<path style="fill:none;stroke:black;" d="M481,-154C481,-136 481,-108 481,-87"/>
+<polygon style="fill:black;stroke:black;" points="484.5,-87 481,-77 477.5,-87 484.5,-87"/>
 </a>
 <a xlink:href="tailURL" xlink:title="tailtooltip">
 </a>
 <a xlink:href="headURL" xlink:title="headtooltip">
 </a>
 <a xlink:href="garf" xlink:title="garf">
-<text text-anchor="middle" x="452" y="-121.65" style="font-family:Times New Roman;font-size:14.00;">garf</text>
+<text text-anchor="middle" x="492" y="-122.9" style="font-family:Times New Roman;font-size:14.00;">garf</text>
 </a>
 <a xlink:href="headURL" xlink:title="headtooltip">
-<text text-anchor="middle" x="445" y="-81.65" style="font-family:Times New Roman;font-size:14.00;">headlabel</text>
+<text text-anchor="middle" x="485" y="-81.9" style="font-family:Times New Roman;font-size:14.00;">headlabel</text>
 </a>
 <a xlink:href="tailURL" xlink:title="tailtooltip">
-<text text-anchor="middle" x="437" y="-138.65" style="font-family:Times New Roman;font-size:14.00;">taillabel</text>
+<text text-anchor="middle" x="477" y="-140.9" style="font-family:Times New Roman;font-size:14.00;">taillabel</text>
 </a>
 </g>
 </g>

diff --git a/rtest/nshare/user_shapes_dot.ps b/rtest/nshare/user_shapes_dot.ps
index 038c660a71150ca155b14e0bf78cef619881b4c5..ab319b492c1a7d4fb484227031b5bf0370336df6 100644 (file)
--- a/rtest/nshare/user_shapes_dot.ps
+++ b/rtest/nshare/user_shapes_dot.ps
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0
-%%Creator: Graphviz version 2.16 (Sat Nov 10 02:02:40 UTC 2007)
+%%Creator: Graphviz version 2.17 (Mon Mar 10 18:55:03 UTC 2008)
 %%For: (ellson) John Ellson
 %%Title: G
 %%Pages: (atend)
@@ -200,9 +200,9 @@ gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
 newpath 216 216 moveto
-9.9476e-14 216 lineto
-0 9.9476e-14 lineto
-216 2.84217e-14 lineto
+0 216 lineto
+0 0 lineto
+216 0 lineto
 closepath stroke
 grestore
 % n->x
@@ -231,8 +231,8 @@ gsave
 0.000 0.000 0.000 nodecolor
 108 342 27 18 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-14.00 /Times-Roman set_font
-102.75 337.65 moveto 10.5 (m) alignedtext
+14 /Times-Roman set_font
+102.5 337.9 moveto 11 (m) alignedtext
 grestore
 % m->n
 gsave

diff --git a/rtest/nshare/viewport_neato.png b/rtest/nshare/viewport_neato.png
index 82b9cd5f0976c21720a6863061021570b8527d85..8ad802f7d7304a645f7369abd1578a46d81aa982 100644 (file)
Binary files a/rtest/nshare/viewport_neato.png and b/rtest/nshare/viewport_neato.png differ

diff --git a/rtest/nshare/viewport_neato.ps b/rtest/nshare/viewport_neato.ps
index 0a8f37a2a005b0b44665b95ba57a4cf81eebb320..24a0d57143ec17fe9f855a3908f88de08850e76b 100644 (file)
--- a/rtest/nshare/viewport_neato.ps
+++ b/rtest/nshare/viewport_neato.ps
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0
-%%Creator: Graphviz version 2.16 (Sat Nov 10 02:02:40 UTC 2007)
+%%Creator: Graphviz version 2.17 (Mon Mar 10 18:55:03 UTC 2008)
 %%For: (ellson) John Ellson
 %%Title: G
 %%Pages: (atend)
@@ -219,26 +219,26 @@ newpath 1023 703 moveto
 1033 701 1058 696 1080 691 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1080.88 694.393 moveto
+newpath 1080.88 694.39 moveto
 1090 689 lineto
-1079.51 687.529 lineto
+1079.51 687.53 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1080.88 694.393 moveto
+newpath 1080.88 694.39 moveto
 1090 689 lineto
-1079.51 687.529 lineto
+1079.51 687.53 lineto
 closepath stroke
 grestore
 % 371942
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1074 757 29 13.6118 ellipse_path stroke
+1074 757 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1060.5 754.525 moveto 27 (371942) alignedtext
+9 /Times-Roman set_font
+1060.5 754.4 moveto 27 (371942) alignedtext
 grestore
 % fcfpr1_1_3t_9->371942
 gsave
@@ -248,26 +248,26 @@ newpath 1022 707 moveto
 1029 714 1042 727 1054 738 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1051.45 740.404 moveto
+newpath 1051.45 740.4 moveto
 1061 745 lineto
-1056.4 735.454 lineto
+1056.4 735.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1051.45 740.404 moveto
+newpath 1051.45 740.4 moveto
 1061 745 lineto
-1056.4 735.454 lineto
+1056.4 735.45 lineto
 closepath stroke
 grestore
 % 374700
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-924 627 30 13.6118 ellipse_path stroke
+924 627 30.96 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-910.5 624.525 moveto 27 (374700) alignedtext
+9 /Times-Roman set_font
+910 624.4 moveto 28 (374700) alignedtext
 grestore
 % fcfpr1_1_3t_9->374700
 gsave
@@ -293,10 +293,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-983 655 30 13.6118 ellipse_path stroke
+983 655 30.96 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-969.5 652.525 moveto 27 (374741) alignedtext
+9 /Times-Roman set_font
+969 652.4 moveto 28 (374741) alignedtext
 grestore
 % fcfpr1_1_3t_9->374741
 gsave
@@ -322,10 +322,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1015 737 30 13.6118 ellipse_path stroke
+1015 737 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1001.5 734.525 moveto 27 (374886) alignedtext
+9 /Times-Roman set_font
+1001.5 734.4 moveto 27 (374886) alignedtext
 grestore
 % fcfpr1_1_3t_9->374886
 gsave
@@ -335,26 +335,26 @@ newpath 1018 709 moveto
 1018 710 1018 712 1018 713 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1014.53 712.508 moveto
+newpath 1014.53 712.51 moveto
 1016 723 lineto
-1021.39 713.881 lineto
+1021.39 713.88 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1014.53 712.508 moveto
+newpath 1014.53 712.51 moveto
 1016 723 lineto
-1021.39 713.881 lineto
+1021.39 713.88 lineto
 closepath stroke
 grestore
 % 375039
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1022 649 29 13.6118 ellipse_path stroke
+1022 649 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1008.5 646.525 moveto 27 (375039) alignedtext
+9 /Times-Roman set_font
+1009 646.4 moveto 26 (375039) alignedtext
 grestore
 % fcfpr1_1_3t_9->375039
 gsave
@@ -380,10 +380,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-951 760 29 13.6118 ellipse_path stroke
+951 760 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-937.5 757.525 moveto 27 (375507) alignedtext
+9 /Times-Roman set_font
+938 757.4 moveto 26 (375507) alignedtext
 grestore
 % fcfpr1_1_3t_9->375507
 gsave
@@ -393,26 +393,26 @@ newpath 1016 707 moveto
 1008 713 989 729 974 741 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 971.221 738.781 moveto
+newpath 971.22 738.78 moveto
 966 748 lineto
-975.831 744.049 lineto
+975.83 744.05 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 971.221 738.781 moveto
+newpath 971.22 738.78 moveto
 966 748 lineto
-975.831 744.049 lineto
+975.83 744.05 lineto
 closepath stroke
 grestore
 % 375508
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-959 746 29 13.6118 ellipse_path stroke
+959 746 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-945.5 743.525 moveto 27 (375508) alignedtext
+9 /Times-Roman set_font
+946 743.4 moveto 26 (375508) alignedtext
 grestore
 % fcfpr1_1_3t_9->375508
 gsave
@@ -438,10 +438,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1065 643 29 13.6118 ellipse_path stroke
+1065 643 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1051.5 640.525 moveto 27 (375519) alignedtext
+9 /Times-Roman set_font
+1052 640.4 moveto 26 (375519) alignedtext
 grestore
 % fcfpr1_1_3t_9->375519
 gsave
@@ -467,10 +467,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1088 736 30 13.6118 ellipse_path stroke
+1088 736 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1074.5 733.525 moveto 27 (377380) alignedtext
+9 /Times-Roman set_font
+1074.5 733.4 moveto 27 (377380) alignedtext
 grestore
 % fcfpr1_1_3t_9->377380
 gsave
@@ -480,14 +480,14 @@ newpath 1023 706 moveto
 1030 708 1044 715 1058 722 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1056.44 725.137 moveto
+newpath 1056.44 725.14 moveto
 1067 726 lineto
 1059.28 718.74 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1056.44 725.137 moveto
+newpath 1056.44 725.14 moveto
 1067 726 lineto
 1059.28 718.74 lineto
 closepath stroke
@@ -496,10 +496,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1020 802 30 13.6118 ellipse_path stroke
+1020 802 31.17 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1006.5 799.525 moveto 27 (377719) alignedtext
+9 /Times-Roman set_font
+1005.5 799.4 moveto 29 (377719) alignedtext
 grestore
 % fcfpr1_1_3t_9->377719
 gsave
@@ -525,10 +525,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1006 761 30 13.6118 ellipse_path stroke
+1006 761 30.96 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-992.5 758.525 moveto 27 (377763) alignedtext
+9 /Times-Roman set_font
+992 758.4 moveto 28 (377763) alignedtext
 grestore
 % fcfpr1_1_3t_9->377763
 gsave
@@ -538,26 +538,26 @@ newpath 1018 708 moveto
 1017 715 1014 727 1011 737 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1007.53 736.508 moveto
+newpath 1007.53 736.51 moveto
 1009 747 lineto
-1014.39 737.881 lineto
+1014.39 737.88 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1007.53 736.508 moveto
+newpath 1007.53 736.51 moveto
 1009 747 lineto
-1014.39 737.881 lineto
+1014.39 737.88 lineto
 closepath stroke
 grestore
 % 379848
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1063 677 30 13.6118 ellipse_path stroke
+1063 677 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1049.5 674.525 moveto 27 (379848) alignedtext
+9 /Times-Roman set_font
+1049.5 674.4 moveto 27 (379848) alignedtext
 grestore
 % fcfpr1_1_3t_9->379848
 gsave
@@ -567,26 +567,26 @@ newpath 1023 702 moveto
 1026 700 1031 697 1036 694 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1038.62 696.459 moveto
+newpath 1038.62 696.46 moveto
 1045 688 lineto
-1034.74 690.635 lineto
+1034.74 690.63 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1038.62 696.459 moveto
+newpath 1038.62 696.46 moveto
 1045 688 lineto
-1034.74 690.635 lineto
+1034.74 690.63 lineto
 closepath stroke
 grestore
 % 380571
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-986 734 29 13.6118 ellipse_path stroke
+986 734 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-972.5 731.525 moveto 27 (380571) alignedtext
+9 /Times-Roman set_font
+973 731.4 moveto 26 (380571) alignedtext
 grestore
 % fcfpr1_1_3t_9->380571
 gsave
@@ -596,26 +596,26 @@ newpath 1016 707 moveto
 1014 709 1010 712 1007 715 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1004.22 712.781 moveto
+newpath 1004.22 712.78 moveto
 999 722 lineto
-1008.83 718.049 lineto
+1008.83 718.05 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1004.22 712.781 moveto
+newpath 1004.22 712.78 moveto
 999 722 lineto
-1008.83 718.049 lineto
+1008.83 718.05 lineto
 closepath stroke
 grestore
 % 380604
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1006 663 30 13.6118 ellipse_path stroke
+1006 663 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-992.5 660.525 moveto 27 (380604) alignedtext
+9 /Times-Roman set_font
+993 660.4 moveto 26 (380604) alignedtext
 grestore
 % fcfpr1_1_3t_9->380604
 gsave
@@ -625,26 +625,26 @@ newpath 1018 700 moveto
 1017 696 1015 692 1013 687 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1016.23 685.573 moveto
+newpath 1016.23 685.57 moveto
 1010 677 lineto
-1009.52 687.584 lineto
+1009.52 687.58 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1016.23 685.573 moveto
+newpath 1016.23 685.57 moveto
 1010 677 lineto
-1009.52 687.584 lineto
+1009.52 687.58 lineto
 closepath stroke
 grestore
 % 381211
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1043 672 29 13.6118 ellipse_path stroke
+1043 672 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1029.5 669.525 moveto 27 (381211) alignedtext
+9 /Times-Roman set_font
+1030 669.4 moveto 26 (381211) alignedtext
 grestore
 % fcfpr1_1_3t_9->381211
 gsave
@@ -670,10 +670,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-956 719 29 13.6118 ellipse_path stroke
+956 719 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-942.5 716.525 moveto 27 (381835) alignedtext
+9 /Times-Roman set_font
+943.5 716.4 moveto 25 (381835) alignedtext
 grestore
 % fcfpr1_1_3t_9->381835
 gsave
@@ -683,26 +683,26 @@ newpath 1015 705 moveto
 1010 706 1001 708 992 710 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 990.573 706.774 moveto
+newpath 990.57 706.77 moveto
 982 713 lineto
-992.584 713.479 lineto
+992.58 713.48 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 990.573 706.774 moveto
+newpath 990.57 706.77 moveto
 982 713 lineto
-992.584 713.479 lineto
+992.58 713.48 lineto
 closepath stroke
 grestore
 % 381897
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1041 754 30 13.6118 ellipse_path stroke
+1041 754 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1027.5 751.525 moveto 27 (381897) alignedtext
+9 /Times-Roman set_font
+1027.5 751.4 moveto 27 (381897) alignedtext
 grestore
 % fcfpr1_1_3t_9->381897
 gsave
@@ -712,14 +712,14 @@ newpath 1021 708 moveto
 1023 713 1027 722 1031 731 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1027.74 732.283 moveto
+newpath 1027.74 732.28 moveto
 1035 740 lineto
 1034.14 729.44 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1027.74 732.283 moveto
+newpath 1027.74 732.28 moveto
 1035 740 lineto
 1034.14 729.44 lineto
 closepath stroke
@@ -728,10 +728,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1044 647 30 13.6118 ellipse_path stroke
+1044 647 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1030.5 644.525 moveto 27 (381901) alignedtext
+9 /Times-Roman set_font
+1031 644.4 moveto 26 (381901) alignedtext
 grestore
 % fcfpr1_1_3t_9->381901
 gsave
@@ -741,26 +741,26 @@ newpath 1021 700 moveto
 1024 694 1030 681 1034 670 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1037.54 670.585 moveto
+newpath 1037.54 670.58 moveto
 1038 660 lineto
-1031.04 667.985 lineto
+1031.04 667.98 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1037.54 670.585 moveto
+newpath 1037.54 670.58 moveto
 1038 660 lineto
-1031.04 667.985 lineto
+1031.04 667.98 lineto
 closepath stroke
 grestore
 % 382103
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-963 698 29 13.6118 ellipse_path stroke
+963 698 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-949.5 695.525 moveto 27 (382103) alignedtext
+9 /Times-Roman set_font
+950 695.4 moveto 26 (382103) alignedtext
 grestore
 % fcfpr1_1_3t_9->382103
 gsave
@@ -770,26 +770,26 @@ newpath 1015 704 moveto
 1012 703 1007 703 1001 702 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1001.3 698.512 moveto
+newpath 1001.3 698.51 moveto
 991 701 lineto
-1000.6 705.478 lineto
+1000.6 705.48 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1001.3 698.512 moveto
+newpath 1001.3 698.51 moveto
 991 701 lineto
-1000.6 705.478 lineto
+1000.6 705.48 lineto
 closepath stroke
 grestore
 % 382161
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1062 721 29 13.6118 ellipse_path stroke
+1062 721 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1048.5 718.525 moveto 27 (382161) alignedtext
+9 /Times-Roman set_font
+1049 718.4 moveto 26 (382161) alignedtext
 grestore
 % fcfpr1_1_3t_9->382161
 gsave
@@ -799,26 +799,26 @@ newpath 1023 706 moveto
 1025 706 1027 707 1029 708 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1028.42 711.536 moveto
+newpath 1028.42 711.54 moveto
 1039 712 lineto
-1031.02 705.036 lineto
+1031.02 705.04 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1028.42 711.536 moveto
+newpath 1028.42 711.54 moveto
 1039 712 lineto
-1031.02 705.036 lineto
+1031.02 705.04 lineto
 closepath stroke
 grestore
 % 383174
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-973 673 30 13.6118 ellipse_path stroke
+973 673 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-959.5 670.525 moveto 27 (383174) alignedtext
+9 /Times-Roman set_font
+960 670.4 moveto 26 (383174) alignedtext
 grestore
 % fcfpr1_1_3t_9->383174
 gsave
@@ -848,26 +848,26 @@ newpath 1127 587 moveto
 1119 594 1101 611 1086 624 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1083.22 621.781 moveto
+newpath 1083.22 621.78 moveto
 1078 631 lineto
-1087.83 627.049 lineto
+1087.83 627.05 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1083.22 621.781 moveto
+newpath 1083.22 621.78 moveto
 1078 631 lineto
-1087.83 627.049 lineto
+1087.83 627.05 lineto
 closepath stroke
 grestore
 % 352010
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1072 551 29 13.6118 ellipse_path stroke
+1072 551 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1058.5 548.525 moveto 27 (352010) alignedtext
+9 /Times-Roman set_font
+1059 548.4 moveto 26 (352010) alignedtext
 grestore
 % fpfpr1_1_3t_1
 gsave
@@ -883,16 +883,16 @@ newpath 1017 613 moveto
 1027 616 1053 626 1074 634 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1073.42 637.479 moveto
+newpath 1073.42 637.48 moveto
 1084 637 lineto
-1075.43 630.774 lineto
+1075.43 630.77 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1073.42 637.479 moveto
+newpath 1073.42 637.48 moveto
 1084 637 lineto
-1075.43 630.774 lineto
+1075.43 630.77 lineto
 closepath stroke
 grestore
 % fpfpr1_1_3t_1->374700
@@ -903,16 +903,16 @@ newpath 1009 613 moveto
 1001 615 981 618 962 621 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 961.602 617.522 moveto
+newpath 961.6 617.52 moveto
 952 622 lineto
-962.299 624.488 lineto
+962.3 624.49 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 961.602 617.522 moveto
+newpath 961.6 617.52 moveto
 952 622 lineto
-962.299 624.488 lineto
+962.3 624.49 lineto
 closepath stroke
 grestore
 % fpfpr1_1_3t_1->374741
@@ -963,16 +963,16 @@ newpath 1014 617 moveto
 1015 619 1015 622 1016 625 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1012.77 626.427 moveto
+newpath 1012.77 626.43 moveto
 1019 635 lineto
-1019.48 624.416 lineto
+1019.48 624.42 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1012.77 626.427 moveto
+newpath 1012.77 626.43 moveto
 1019 635 lineto
-1019.48 624.416 lineto
+1019.48 624.42 lineto
 closepath stroke
 grestore
 % fpfpr1_1_3t_1->375519
@@ -983,16 +983,16 @@ newpath 1017 614 moveto
 1021 617 1030 622 1038 627 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1036.56 630.203 moveto
+newpath 1036.56 630.2 moveto
 1047 632 lineto
-1039.96 624.084 lineto
+1039.96 624.08 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1036.56 630.203 moveto
+newpath 1036.56 630.2 moveto
 1047 632 lineto
-1039.96 624.084 lineto
+1039.96 624.08 lineto
 closepath stroke
 grestore
 % fpfpr1_1_3t_1->379848
@@ -1023,16 +1023,16 @@ newpath 1012 617 moveto
 1011 622 1010 631 1009 639 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1005.51 638.701 moveto
+newpath 1005.51 638.7 moveto
 1008 649 lineto
-1012.48 639.398 lineto
+1012.48 639.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1005.51 638.701 moveto
+newpath 1005.51 638.7 moveto
 1008 649 lineto
-1012.48 639.398 lineto
+1012.48 639.4 lineto
 closepath stroke
 grestore
 % fpfpr1_1_3t_1->381211
@@ -1043,14 +1043,14 @@ newpath 1015 616 moveto
 1018 622 1026 637 1032 650 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1028.74 651.283 moveto
+newpath 1028.74 651.28 moveto
 1036 659 lineto
 1035.14 648.44 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1028.74 651.283 moveto
+newpath 1028.74 651.28 moveto
 1036 659 lineto
 1035.14 648.44 lineto
 closepath stroke
@@ -1063,16 +1063,16 @@ newpath 1016 615 moveto
 1019 618 1022 622 1026 627 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1023.45 629.404 moveto
+newpath 1023.45 629.4 moveto
 1033 634 lineto
-1028.4 624.454 lineto
+1028.4 624.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1023.45 629.404 moveto
+newpath 1023.45 629.4 moveto
 1033 634 lineto
-1028.4 624.454 lineto
+1028.4 624.45 lineto
 closepath stroke
 grestore
 % fpfpr1_1_3t_1->383174
@@ -1083,16 +1083,16 @@ newpath 1011 616 moveto
 1006 623 996 638 988 651 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 984.635 649.738 moveto
+newpath 984.63 649.74 moveto
 982 660 lineto
-990.459 653.621 lineto
+990.46 653.62 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 984.635 649.738 moveto
+newpath 984.63 649.74 moveto
 982 660 lineto
-990.459 653.621 lineto
+990.46 653.62 lineto
 closepath stroke
 grestore
 % fpfpr1_1_3t_1->352010
@@ -1103,26 +1103,26 @@ newpath 1016 609 moveto
 1023 601 1039 585 1053 570 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1055.4 572.546 moveto
+newpath 1055.4 572.55 moveto
 1060 563 lineto
-1050.45 567.596 lineto
+1050.45 567.6 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1055.4 572.546 moveto
+newpath 1055.4 572.55 moveto
 1060 563 lineto
-1050.45 567.596 lineto
+1050.45 567.6 lineto
 closepath stroke
 grestore
 % 382409
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1019 545 29 13.6118 ellipse_path stroke
+1019 545 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1005.5 542.525 moveto 27 (382409) alignedtext
+9 /Times-Roman set_font
+1006 542.4 moveto 26 (382409) alignedtext
 grestore
 % fpfpr1_1_3t_1->382409
 gsave
@@ -1132,26 +1132,26 @@ newpath 1013 607 moveto
 1014 599 1015 583 1017 569 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1020.49 569.299 moveto
+newpath 1020.49 569.3 moveto
 1018 559 lineto
-1013.52 568.602 lineto
+1013.52 568.6 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1020.49 569.299 moveto
+newpath 1020.49 569.3 moveto
 1018 559 lineto
-1013.52 568.602 lineto
+1013.52 568.6 lineto
 closepath stroke
 grestore
 % 382827
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1046 541 29 13.6118 ellipse_path stroke
+1046 541 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1032.5 538.525 moveto 27 (382827) alignedtext
+9 /Times-Roman set_font
+1032.5 538.4 moveto 27 (382827) alignedtext
 grestore
 % fpfpr1_1_3t_1->382827
 gsave
@@ -1163,24 +1163,24 @@ stroke
 0.000 0.000 0.000 edgecolor
 newpath 1039.14 564.56 moveto
 1040 554 lineto
-1032.74 561.717 lineto
+1032.74 561.72 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
 newpath 1039.14 564.56 moveto
 1040 554 lineto
-1032.74 561.717 lineto
+1032.74 561.72 lineto
 closepath stroke
 grestore
 % 382928
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-951 625 29 13.6118 ellipse_path stroke
+951 625 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-937.5 622.525 moveto 27 (382928) alignedtext
+9 /Times-Roman set_font
+938 622.4 moveto 26 (382928) alignedtext
 grestore
 % fpfpr1_1_3t_1->382928
 gsave
@@ -1190,16 +1190,16 @@ newpath 1009 613 moveto
 1005 614 997 616 988 618 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 987.119 614.607 moveto
+newpath 987.12 614.61 moveto
 978 620 lineto
-988.492 621.471 lineto
+988.49 621.47 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 987.119 614.607 moveto
+newpath 987.12 614.61 moveto
 978 620 lineto
-988.492 621.471 lineto
+988.49 621.47 lineto
 closepath stroke
 grestore
 % tymsgfpr1_1_3t_3
@@ -1216,26 +1216,26 @@ newpath 855 562 moveto
 864 570 887 591 904 608 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 901.454 610.404 moveto
+newpath 901.45 610.4 moveto
 911 615 lineto
-906.404 605.454 lineto
+906.4 605.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 901.454 610.404 moveto
+newpath 901.45 610.4 moveto
 911 615 lineto
-906.404 605.454 lineto
+906.4 605.45 lineto
 closepath stroke
 grestore
 % 358224
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-743 583 29 13.6118 ellipse_path stroke
+743 583 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-729.5 580.525 moveto 27 (358224) alignedtext
+9 /Times-Roman set_font
+730 580.4 moveto 26 (358224) alignedtext
 grestore
 % tymsgfpr1_1_3t_3->358224
 gsave
@@ -1245,26 +1245,26 @@ newpath 848 560 moveto
 837 563 805 569 779 575 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 778.119 571.607 moveto
+newpath 778.12 571.61 moveto
 769 577 lineto
-779.492 578.471 lineto
+779.49 578.47 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 778.119 571.607 moveto
+newpath 778.12 571.61 moveto
 769 577 lineto
-779.492 578.471 lineto
+779.49 578.47 lineto
 closepath stroke
 grestore
 % 358900
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-811 587 29 13.6118 ellipse_path stroke
+811 587 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-797.5 584.525 moveto 27 (358900) alignedtext
+9 /Times-Roman set_font
+798 584.4 moveto 26 (358900) alignedtext
 grestore
 % tymsgfpr1_1_3t_3->358900
 gsave
@@ -1290,10 +1290,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-877 447 29 13.6118 ellipse_path stroke
+877 447 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-863.5 444.525 moveto 27 (372568) alignedtext
+9 /Times-Roman set_font
+864 444.4 moveto 26 (372568) alignedtext
 grestore
 % tymsgfpr1_1_3t_3->372568
 gsave
@@ -1303,26 +1303,26 @@ newpath 853 554 moveto
 857 541 866 498 872 471 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 875.471 471.492 moveto
+newpath 875.47 471.49 moveto
 874 461 lineto
-868.607 470.119 lineto
+868.61 470.12 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 875.471 471.492 moveto
+newpath 875.47 471.49 moveto
 874 461 lineto
-868.607 470.119 lineto
+868.61 470.12 lineto
 closepath stroke
 grestore
 % 375557
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-828 512 29 13.6118 ellipse_path stroke
+828 512 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-814.5 509.525 moveto 27 (375557) alignedtext
+9 /Times-Roman set_font
+815 509.4 moveto 26 (375557) alignedtext
 grestore
 % tymsgfpr1_1_3t_3->375557
 gsave
@@ -1332,16 +1332,16 @@ newpath 850 555 moveto
 848 551 844 543 840 535 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 842.916 533.042 moveto
+newpath 842.92 533.04 moveto
 835 526 lineto
-836.797 536.441 lineto
+836.8 536.44 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 842.916 533.042 moveto
+newpath 842.92 533.04 moveto
 835 526 lineto
-836.797 536.441 lineto
+836.8 536.44 lineto
 closepath stroke
 grestore
 % rtafpr1_1_3t_7
@@ -1358,16 +1358,16 @@ newpath 918 681 moveto
 919 674 920 662 921 651 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 924.488 651.299 moveto
+newpath 924.49 651.3 moveto
 922 641 lineto
-917.522 650.602 lineto
+917.52 650.6 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 924.488 651.299 moveto
+newpath 924.49 651.3 moveto
 922 641 lineto
-917.522 650.602 lineto
+917.52 650.6 lineto
 closepath stroke
 grestore
 % rtafpr1_1_3t_7->374741
@@ -1378,16 +1378,16 @@ newpath 921 684 moveto
 927 681 940 674 953 669 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 954.283 672.26 moveto
+newpath 954.28 672.26 moveto
 962 665 lineto
-951.44 665.863 lineto
+951.44 665.86 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 954.283 672.26 moveto
+newpath 954.28 672.26 moveto
 962 665 lineto
-951.44 665.863 lineto
+951.44 665.86 lineto
 closepath stroke
 grestore
 % rtafpr1_1_3t_7->374886
@@ -1398,16 +1398,16 @@ newpath 921 688 moveto
 932 693 962 710 986 722 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 984.559 725.203 moveto
+newpath 984.56 725.2 moveto
 995 727 lineto
-987.958 719.084 lineto
+987.96 719.08 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 984.559 725.203 moveto
+newpath 984.56 725.2 moveto
 995 727 lineto
-987.958 719.084 lineto
+987.96 719.08 lineto
 closepath stroke
 grestore
 % rtafpr1_1_3t_7->375507
@@ -1418,16 +1418,16 @@ newpath 919 690 moveto
 923 699 933 721 941 738 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 937.74 739.283 moveto
+newpath 937.74 739.28 moveto
 945 747 lineto
-944.137 736.44 lineto
+944.14 736.44 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 937.74 739.283 moveto
+newpath 937.74 739.28 moveto
 945 747 lineto
-944.137 736.44 lineto
+944.14 736.44 lineto
 closepath stroke
 grestore
 % rtafpr1_1_3t_7->375508
@@ -1458,16 +1458,16 @@ newpath 921 687 moveto
 923 687 925 688 927 689 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 926.508 692.471 moveto
+newpath 926.51 692.47 moveto
 937 691 lineto
-927.881 685.607 lineto
+927.88 685.61 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 926.508 692.471 moveto
+newpath 926.51 692.47 moveto
 937 691 lineto
-927.881 685.607 lineto
+927.88 685.61 lineto
 closepath stroke
 grestore
 % rtafpr1_1_3t_7->383174
@@ -1478,16 +1478,16 @@ newpath 921 685 moveto
 924 684 930 683 936 681 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 936.881 684.393 moveto
+newpath 936.88 684.39 moveto
 946 679 lineto
-935.508 677.529 lineto
+935.51 677.53 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 936.881 684.393 moveto
+newpath 936.88 684.39 moveto
 946 679 lineto
-935.508 677.529 lineto
+935.51 677.53 lineto
 closepath stroke
 grestore
 % rtafpr1_1_3t_7->382928
@@ -1498,26 +1498,26 @@ newpath 919 682 moveto
 923 675 932 660 939 647 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 942.203 648.441 moveto
+newpath 942.2 648.44 moveto
 944 638 lineto
-936.084 645.042 lineto
+936.08 645.04 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 942.203 648.441 moveto
+newpath 942.2 648.44 moveto
 944 638 lineto
-936.084 645.042 lineto
+936.08 645.04 lineto
 closepath stroke
 grestore
 % 376956
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-969 579 29 13.6118 ellipse_path stroke
+969 579 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-955.5 576.525 moveto 27 (376956) alignedtext
+9 /Times-Roman set_font
+956 576.4 moveto 26 (376956) alignedtext
 grestore
 % rtafpr1_1_3t_7->376956
 gsave
@@ -1527,26 +1527,26 @@ newpath 919 682 moveto
 925 669 946 628 958 601 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 961.137 602.56 moveto
+newpath 961.14 602.56 moveto
 962 592 lineto
-954.74 599.717 lineto
+954.74 599.72 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 961.137 602.56 moveto
+newpath 961.14 602.56 moveto
 962 592 lineto
-954.74 599.717 lineto
+954.74 599.72 lineto
 closepath stroke
 grestore
 % 379339
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-860 726 30 13.6118 ellipse_path stroke
+860 726 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-846.5 723.525 moveto 27 (379339) alignedtext
+9 /Times-Roman set_font
+847 723.4 moveto 26 (379339) alignedtext
 grestore
 % rtafpr1_1_3t_7->379339
 gsave
@@ -1572,10 +1572,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-853 766 29 13.6118 ellipse_path stroke
+853 766 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-839.5 763.525 moveto 27 (379422) alignedtext
+9 /Times-Roman set_font
+839.5 763.4 moveto 27 (379422) alignedtext
 grestore
 % rtafpr1_1_3t_7->379422
 gsave
@@ -1601,10 +1601,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-860 701 30 13.6118 ellipse_path stroke
+860 701 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-846.5 698.525 moveto 27 (383039) alignedtext
+9 /Times-Roman set_font
+847.5 698.4 moveto 25 (383039) alignedtext
 grestore
 % rtafpr1_1_3t_7->383039
 gsave
@@ -1614,16 +1614,16 @@ newpath 913 687 moveto
 909 688 903 690 896 692 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 895.119 688.607 moveto
+newpath 895.12 688.61 moveto
 886 694 lineto
-896.492 695.471 lineto
+896.49 695.47 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 895.119 688.607 moveto
+newpath 895.12 688.61 moveto
 886 694 lineto
-896.492 695.471 lineto
+896.49 695.47 lineto
 closepath stroke
 grestore
 % fcfpr1_1_3g_2
@@ -1640,16 +1640,16 @@ newpath 1059 586 moveto
 1049 595 1023 619 1003 636 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1000.6 633.454 moveto
+newpath 1000.6 633.45 moveto
 996 643 lineto
-1005.55 638.404 lineto
+1005.55 638.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1000.6 633.454 moveto
+newpath 1000.6 633.45 moveto
 996 643 lineto
-1005.55 638.404 lineto
+1005.55 638.4 lineto
 closepath stroke
 grestore
 % fcfpr1_1_1t_18
@@ -1666,14 +1666,14 @@ newpath 1066 846 moveto
 1060 833 1038 787 1025 759 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1028.26 757.717 moveto
+newpath 1028.26 757.72 moveto
 1021 750 lineto
 1021.86 760.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1028.26 757.717 moveto
+newpath 1028.26 757.72 moveto
 1021 750 lineto
 1021.86 760.56 lineto
 closepath stroke
@@ -1682,10 +1682,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1099 955 29 13.6118 ellipse_path stroke
+1099 955 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1085.5 952.525 moveto 27 (359471) alignedtext
+9 /Times-Roman set_font
+1086 952.4 moveto 26 (359471) alignedtext
 grestore
 % fcfpr1_1_1t_18->359471
 gsave
@@ -1695,16 +1695,16 @@ newpath 1069 855 moveto
 1073 868 1084 907 1092 931 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1088.77 932.427 moveto
+newpath 1088.77 932.43 moveto
 1095 941 lineto
-1095.48 930.416 lineto
+1095.48 930.42 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1088.77 932.427 moveto
+newpath 1088.77 932.43 moveto
 1095 941 lineto
-1095.48 930.416 lineto
+1095.48 930.42 lineto
 closepath stroke
 grestore
 % fcfpr1_1_3t_42
@@ -1737,10 +1737,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-920 949 30 13.6118 ellipse_path stroke
+920 949 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-906.5 946.525 moveto 27 (384096) alignedtext
+9 /Times-Roman set_font
+907 946.4 moveto 26 (384096) alignedtext
 grestore
 % fcfpr1_1_3t_42->384096
 gsave
@@ -1750,16 +1750,16 @@ newpath 948 860 moveto
 945 872 934 904 927 925 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 923.521 924.416 moveto
+newpath 923.52 924.42 moveto
 924 935 lineto
-930.226 926.427 lineto
+930.23 926.43 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 923.521 924.416 moveto
+newpath 923.52 924.42 moveto
 924 935 lineto
-930.226 926.427 lineto
+930.23 926.43 lineto
 closepath stroke
 grestore
 % rdlfpr2_0_rdlt_158
@@ -1776,16 +1776,16 @@ newpath 898 821 moveto
 905 813 921 795 933 781 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 936.049 782.831 moveto
+newpath 936.05 782.83 moveto
 940 773 lineto
-930.781 778.221 lineto
+930.78 778.22 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 936.049 782.831 moveto
+newpath 936.05 782.83 moveto
 940 773 lineto
-930.781 778.221 lineto
+930.78 778.22 lineto
 closepath stroke
 grestore
 % rtafpr1_1_3t_71
@@ -1802,16 +1802,16 @@ newpath 920 853 moveto
 924 841 936 807 944 783 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 947.158 784.594 moveto
+newpath 947.16 784.59 moveto
 947 774 lineto
-940.517 782.38 lineto
+940.52 782.38 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 947.158 784.594 moveto
+newpath 947.16 784.59 moveto
 947 774 lineto
-940.517 782.38 lineto
+940.52 782.38 lineto
 closepath stroke
 grestore
 % rtafpr1_1_3t_71->384096
@@ -1868,16 +1868,16 @@ newpath 906 795 moveto
 913 789 927 776 939 765 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 941.404 767.546 moveto
+newpath 941.4 767.55 moveto
 946 758 lineto
-936.454 762.596 lineto
+936.45 762.6 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 941.404 767.546 moveto
+newpath 941.4 767.55 moveto
 946 758 lineto
-936.454 762.596 lineto
+936.45 762.6 lineto
 closepath stroke
 grestore
 % rdlfpr1_1g_13
@@ -1894,16 +1894,16 @@ newpath 929 826 moveto
 932 816 942 789 950 768 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 953.137 769.56 moveto
+newpath 953.14 769.56 moveto
 954 759 lineto
-946.74 766.717 lineto
+946.74 766.72 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 953.137 769.56 moveto
+newpath 953.14 769.56 moveto
 954 759 lineto
-946.74 766.717 lineto
+946.74 766.72 lineto
 closepath stroke
 grestore
 % rtafpr2_1_rdlg_1
@@ -1920,16 +1920,16 @@ newpath 976 832 moveto
 973 821 968 791 964 770 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 967.393 769.119 moveto
+newpath 967.39 769.12 moveto
 962 760 lineto
-960.529 770.492 lineto
+960.53 770.49 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 967.393 769.119 moveto
+newpath 967.39 769.12 moveto
 962 760 lineto
-960.529 770.492 lineto
+960.53 770.49 lineto
 closepath stroke
 grestore
 % fcfpr1_0_2g_1
@@ -1946,16 +1946,16 @@ newpath 1076 862 moveto
 1069 854 1053 836 1039 822 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1041.55 819.596 moveto
+newpath 1041.55 819.6 moveto
 1032 815 lineto
-1036.6 824.546 lineto
+1036.6 824.55 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1041.55 819.596 moveto
+newpath 1041.55 819.6 moveto
 1032 815 lineto
-1036.6 824.546 lineto
+1036.6 824.55 lineto
 closepath stroke
 grestore
 % fcfpr1_1_3t_10
@@ -1972,16 +1972,16 @@ newpath 1050 874 moveto
 1047 865 1037 842 1030 825 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1032.96 822.985 moveto
+newpath 1032.96 822.98 moveto
 1026 815 lineto
-1026.46 825.585 lineto
+1026.46 825.58 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1032.96 822.985 moveto
+newpath 1032.96 822.98 moveto
 1026 815 lineto
-1026.46 825.585 lineto
+1026.46 825.58 lineto
 closepath stroke
 grestore
 % fcfpr1_1_3t_7
@@ -1998,16 +1998,16 @@ newpath 1004 886 moveto
 1006 875 1011 846 1015 825 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1018.47 825.492 moveto
+newpath 1018.47 825.49 moveto
 1017 815 lineto
-1011.61 824.119 lineto
+1011.61 824.12 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1018.47 825.492 moveto
+newpath 1018.47 825.49 moveto
 1017 815 lineto
-1011.61 824.119 lineto
+1011.61 824.12 lineto
 closepath stroke
 grestore
 % rdlfpr2_0_rdlg_12
@@ -2024,16 +2024,16 @@ newpath 956 877 moveto
 964 867 986 841 1002 823 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1005.05 824.831 moveto
+newpath 1005.05 824.83 moveto
 1009 815 lineto
-999.781 820.221 lineto
+999.78 820.22 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1005.05 824.831 moveto
+newpath 1005.05 824.83 moveto
 1009 815 lineto
-999.781 820.221 lineto
+999.78 820.22 lineto
 closepath stroke
 grestore
 % rdlfpr2_0_rdlt_108
@@ -2050,16 +2050,16 @@ newpath 1025 874 moveto
 1024 865 1023 843 1022 826 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1025.48 825.602 moveto
+newpath 1025.48 825.6 moveto
 1021 816 lineto
-1018.51 826.299 lineto
+1018.51 826.3 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1025.48 825.602 moveto
+newpath 1025.48 825.6 moveto
 1021 816 lineto
-1018.51 826.299 lineto
+1018.51 826.3 lineto
 closepath stroke
 grestore
 % rdlfpr2_0_rdlt_27->377719
@@ -2070,16 +2070,16 @@ newpath 1098 842 moveto
 1089 838 1067 826 1049 817 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1050.44 813.797 moveto
+newpath 1050.44 813.8 moveto
 1040 812 lineto
-1047.04 819.916 lineto
+1047.04 819.92 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1050.44 813.797 moveto
+newpath 1050.44 813.8 moveto
 1040 812 lineto
-1047.04 819.916 lineto
+1047.04 819.92 lineto
 closepath stroke
 grestore
 % rdlfpr2_0_rdlt_30
@@ -2098,14 +2098,14 @@ stroke
 0.000 0.000 0.000 edgecolor
 newpath 1012.14 825.56 moveto
 1013 815 lineto
-1005.74 822.717 lineto
+1005.74 822.72 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
 newpath 1012.14 825.56 moveto
 1013 815 lineto
-1005.74 822.717 lineto
+1005.74 822.72 lineto
 closepath stroke
 grestore
 % tlfpr1_1_1t_5
@@ -2122,16 +2122,16 @@ newpath 708 596 moveto
 709 596 710 595 711 595 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 712.283 598.26 moveto
+newpath 712.28 598.26 moveto
 720 591 lineto
-709.44 591.863 lineto
+709.44 591.86 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 712.283 598.26 moveto
+newpath 712.28 598.26 moveto
 720 591 lineto
-709.44 591.863 lineto
+709.44 591.86 lineto
 closepath stroke
 grestore
 % tymsgfpr1_1_1t_23
@@ -2148,16 +2148,16 @@ newpath 701 512 moveto
 707 521 720 543 730 561 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 727.084 562.958 moveto
+newpath 727.08 562.96 moveto
 735 570 lineto
-733.203 559.559 lineto
+733.2 559.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 727.084 562.958 moveto
+newpath 727.08 562.96 moveto
 735 570 lineto
-733.203 559.559 lineto
+733.2 559.56 lineto
 closepath stroke
 grestore
 % rcfpr0_0_1t_9
@@ -2174,26 +2174,26 @@ newpath 648 611 moveto
 658 608 686 599 708 593 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 709.427 596.226 moveto
+newpath 709.43 596.23 moveto
 718 590 lineto
-707.416 589.521 lineto
+707.42 589.52 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 709.427 596.226 moveto
+newpath 709.43 596.23 moveto
 718 590 lineto
-707.416 589.521 lineto
+707.42 589.52 lineto
 closepath stroke
 grestore
 % 354290
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-560 613 29 13.6118 ellipse_path stroke
+560 613 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-546.5 610.525 moveto 27 (354290) alignedtext
+9 /Times-Roman set_font
+547 610.4 moveto 26 (354290) alignedtext
 grestore
 % rcfpr0_0_1t_9->354290
 gsave
@@ -2229,26 +2229,26 @@ newpath 710 651 moveto
 714 642 725 621 733 605 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 736.137 606.56 moveto
+newpath 736.14 606.56 moveto
 737 596 lineto
-729.74 603.717 lineto
+729.74 603.72 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 736.137 606.56 moveto
+newpath 736.14 606.56 moveto
 737 596 lineto
-729.74 603.717 lineto
+729.74 603.72 lineto
 closepath stroke
 grestore
 % 379864
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-678 744 30 13.6118 ellipse_path stroke
+678 744 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-664.5 741.525 moveto 27 (379864) alignedtext
+9 /Times-Roman set_font
+664.5 741.4 moveto 27 (379864) alignedtext
 grestore
 % rcfpr1_1_1t_5->379864
 gsave
@@ -2258,16 +2258,16 @@ newpath 707 659 moveto
 704 670 694 700 686 720 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 682.521 719.416 moveto
+newpath 682.52 719.42 moveto
 683 730 lineto
-689.226 721.427 lineto
+689.23 721.43 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 682.521 719.416 moveto
+newpath 682.52 719.42 moveto
 683 730 lineto
-689.226 721.427 lineto
+689.23 721.43 lineto
 closepath stroke
 grestore
 % odfpr0_0_1t_8
@@ -2304,16 +2304,16 @@ newpath 635 587 moveto
 627 589 609 595 593 601 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 590.985 598.036 moveto
+newpath 590.98 598.04 moveto
 583 605 lineto
-593.585 604.536 lineto
+593.58 604.54 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 590.985 598.036 moveto
+newpath 590.98 598.04 moveto
 583 605 lineto
-593.585 604.536 lineto
+593.58 604.54 lineto
 closepath stroke
 grestore
 % odfpr1_1_1t_6
@@ -2356,16 +2356,16 @@ newpath 714 533 moveto
 717 538 724 550 730 561 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 727.084 562.958 moveto
+newpath 727.08 562.96 moveto
 735 570 lineto
-733.203 559.559 lineto
+733.2 559.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 727.084 562.958 moveto
+newpath 727.08 562.96 moveto
 735 570 lineto
-733.203 559.559 lineto
+733.2 559.56 lineto
 closepath stroke
 grestore
 % tymsgfpr1_1_1t_18
@@ -2382,16 +2382,16 @@ newpath 790 519 moveto
 792 528 799 548 804 564 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 800.774 565.427 moveto
+newpath 800.77 565.43 moveto
 807 574 lineto
-807.479 563.416 lineto
+807.48 563.42 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 800.774 565.427 moveto
+newpath 800.77 565.43 moveto
 807 574 lineto
-807.479 563.416 lineto
+807.48 563.42 lineto
 closepath stroke
 grestore
 % rcfpr1_1_1t_100
@@ -2408,26 +2408,26 @@ newpath 756 651 moveto
 762 643 779 623 793 608 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 796.049 609.831 moveto
+newpath 796.05 609.83 moveto
 800 600 lineto
-790.781 605.221 lineto
+790.78 605.22 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 796.049 609.831 moveto
+newpath 796.05 609.83 moveto
 800 600 lineto
-790.781 605.221 lineto
+790.78 605.22 lineto
 closepath stroke
 grestore
 % 382574
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-719 726 29 13.6118 ellipse_path stroke
+719 726 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-705.5 723.525 moveto 27 (382574) alignedtext
+9 /Times-Roman set_font
+706 723.4 moveto 26 (382574) alignedtext
 grestore
 % rcfpr1_1_1t_100->382574
 gsave
@@ -2437,16 +2437,16 @@ newpath 751 658 moveto
 747 667 737 688 729 704 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 725.863 702.44 moveto
+newpath 725.86 702.44 moveto
 725 713 lineto
-732.26 705.283 lineto
+732.26 705.28 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 725.863 702.44 moveto
+newpath 725.86 702.44 moveto
 725 713 lineto
-732.26 705.283 lineto
+732.26 705.28 lineto
 closepath stroke
 grestore
 % rcfpr1_1_1t_22
@@ -2483,16 +2483,16 @@ newpath 756 632 moveto
 752 644 737 679 728 703 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 724.464 702.415 moveto
+newpath 724.46 702.42 moveto
 724 713 lineto
-730.964 705.015 lineto
+730.96 705.02 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 724.464 702.415 moveto
+newpath 724.46 702.42 moveto
 724 713 lineto
-730.964 705.015 lineto
+730.96 705.02 lineto
 closepath stroke
 grestore
 % rcfpr1_1_1t_37
@@ -2509,16 +2509,16 @@ newpath 776 660 moveto
 781 651 792 627 800 609 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 803.203 610.441 moveto
+newpath 803.2 610.44 moveto
 805 600 lineto
-797.084 607.042 lineto
+797.08 607.04 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 803.203 610.441 moveto
+newpath 803.2 610.44 moveto
 805 600 lineto
-797.084 607.042 lineto
+797.08 607.04 lineto
 closepath stroke
 grestore
 % rcfpr1_1_1t_37->382574
@@ -2529,16 +2529,16 @@ newpath 771 667 moveto
 765 675 750 692 737 705 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 733.951 703.169 moveto
+newpath 733.95 703.17 moveto
 730 713 lineto
-739.219 707.779 lineto
+739.22 707.78 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 733.951 703.169 moveto
+newpath 733.95 703.17 moveto
 730 713 lineto
-739.219 707.779 lineto
+739.22 707.78 lineto
 closepath stroke
 grestore
 % odfpr1_1_1t_21
@@ -2555,16 +2555,16 @@ newpath 770 541 moveto
 775 547 784 557 793 567 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 790.454 569.404 moveto
+newpath 790.45 569.4 moveto
 800 574 lineto
-795.404 564.454 lineto
+795.4 564.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 790.454 569.404 moveto
+newpath 790.45 569.4 moveto
 800 574 lineto
-795.404 564.454 lineto
+795.4 564.45 lineto
 closepath stroke
 grestore
 % rcfpr1_1_1t_30->372568
@@ -2595,16 +2595,16 @@ newpath 893 376 moveto
 891 386 886 406 882 423 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 878.529 422.508 moveto
+newpath 878.53 422.51 moveto
 880 433 lineto
-885.393 423.881 lineto
+885.39 423.88 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 878.529 422.508 moveto
+newpath 878.53 422.51 moveto
 880 433 lineto
-885.393 423.881 lineto
+885.39 423.88 lineto
 closepath stroke
 grestore
 % tlfpr1_1_1t_20
@@ -2673,16 +2673,16 @@ newpath 758 464 moveto
 766 469 786 483 802 495 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 800.738 498.365 moveto
+newpath 800.74 498.37 moveto
 811 501 lineto
-804.621 492.541 lineto
+804.62 492.54 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 800.738 498.365 moveto
+newpath 800.74 498.37 moveto
 811 501 lineto
-804.621 492.541 lineto
+804.62 492.54 lineto
 closepath stroke
 grestore
 % rcfpr1_1_1t_11->379968
@@ -2693,16 +2693,16 @@ newpath 752 458 moveto
 747 447 732 418 722 397 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 724.916 395.042 moveto
+newpath 724.92 395.04 moveto
 717 388 lineto
-718.797 398.441 lineto
+718.8 398.44 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 724.916 395.042 moveto
+newpath 724.92 395.04 moveto
 717 388 lineto
-718.797 398.441 lineto
+718.8 398.44 lineto
 closepath stroke
 grestore
 % odfpr1_1_1t_9
@@ -2719,16 +2719,16 @@ newpath 765 443 moveto
 773 452 794 475 810 492 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 807.454 494.404 moveto
+newpath 807.45 494.4 moveto
 817 499 lineto
-812.404 489.454 lineto
+812.4 489.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 807.454 494.404 moveto
+newpath 807.45 494.4 moveto
 817 499 lineto
-812.404 489.454 lineto
+812.4 489.45 lineto
 closepath stroke
 grestore
 % odfpr1_1_1t_9->379968
@@ -2765,16 +2765,16 @@ newpath 799 454 moveto
 803 461 810 477 816 490 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 813.084 491.958 moveto
+newpath 813.08 491.96 moveto
 821 499 lineto
-819.203 488.559 lineto
+819.2 488.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 813.084 491.958 moveto
+newpath 813.08 491.96 moveto
 821 499 lineto
-819.203 488.559 lineto
+819.2 488.56 lineto
 closepath stroke
 grestore
 % rtafpr1_1_1g_14
@@ -2791,16 +2791,16 @@ newpath 1015 498 moveto
 1009 508 993 537 982 557 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 978.797 555.559 moveto
+newpath 978.8 555.56 moveto
 977 566 lineto
-984.916 558.958 lineto
+984.92 558.96 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 978.797 555.559 moveto
+newpath 978.8 555.56 moveto
 977 566 lineto
-984.916 558.958 lineto
+984.92 558.96 lineto
 closepath stroke
 grestore
 % rtafpr1_1_1t_64
@@ -2817,16 +2817,16 @@ newpath 1051 498 moveto
 1040 509 1009 539 988 560 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 985.596 557.454 moveto
+newpath 985.6 557.45 moveto
 981 567 lineto
-990.546 562.404 lineto
+990.55 562.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 985.596 557.454 moveto
+newpath 985.6 557.45 moveto
 981 567 lineto
-990.546 562.404 lineto
+990.55 562.4 lineto
 closepath stroke
 grestore
 % rtafpr1_1_2t_18->376956
@@ -2837,16 +2837,16 @@ newpath 1078 517 moveto
 1065 524 1025 548 997 563 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 995.042 560.084 moveto
+newpath 995.04 560.08 moveto
 988 568 lineto
-998.441 566.203 lineto
+998.44 566.2 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 995.042 560.084 moveto
+newpath 995.04 560.08 moveto
 988 568 lineto
-998.441 566.203 lineto
+998.44 566.2 lineto
 closepath stroke
 grestore
 % rtafpr1_1_3t_30
@@ -2863,16 +2863,16 @@ newpath 976 510 moveto
 975 519 973 539 972 555 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 968.512 554.701 moveto
+newpath 968.51 554.7 moveto
 971 565 lineto
-975.478 555.398 lineto
+975.48 555.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 968.512 554.701 moveto
+newpath 968.51 554.7 moveto
 971 565 lineto
-975.478 555.398 lineto
+975.48 555.4 lineto
 closepath stroke
 grestore
 % rtafpr1_1_1t_14
@@ -2889,16 +2889,16 @@ newpath 828 867 moveto
 832 854 841 815 847 790 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 850.479 790.584 moveto
+newpath 850.48 790.58 moveto
 850 780 lineto
-843.774 788.573 lineto
+843.77 788.57 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 850.479 790.584 moveto
+newpath 850.48 790.58 moveto
 850 780 lineto
-843.774 788.573 lineto
+843.77 788.57 lineto
 closepath stroke
 grestore
 % rtafpr1_1_1t_20
@@ -2915,16 +2915,16 @@ newpath 807 843 moveto
 813 834 829 807 840 788 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 843.203 789.441 moveto
+newpath 843.2 789.44 moveto
 845 779 lineto
-837.084 786.042 lineto
+837.08 786.04 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 843.203 789.441 moveto
+newpath 843.2 789.44 moveto
 845 779 lineto
-837.084 786.042 lineto
+837.08 786.04 lineto
 closepath stroke
 grestore
 % fcfpr2_0_1t_1
@@ -2941,16 +2941,16 @@ newpath 1075 1019 moveto
 1077 1010 1084 993 1090 978 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1093.54 978.585 moveto
+newpath 1093.54 978.58 moveto
 1094 968 lineto
-1087.04 975.985 lineto
+1087.04 975.98 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1093.54 978.585 moveto
+newpath 1093.54 978.58 moveto
 1094 968 lineto
-1087.04 975.985 lineto
+1087.04 975.98 lineto
 closepath stroke
 grestore
 % fcfpr2_0_1t_2
@@ -2967,26 +2967,26 @@ newpath 1038 1031 moveto
 1045 1021 1066 994 1082 976 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 1085.05 977.831 moveto
+newpath 1085.05 977.83 moveto
 1089 968 lineto
-1079.78 973.221 lineto
+1079.78 973.22 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 1085.05 977.831 moveto
+newpath 1085.05 977.83 moveto
 1089 968 lineto
-1079.78 973.221 lineto
+1079.78 973.22 lineto
 closepath stroke
 grestore
 % 379212
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-1099 1112 29 13.6118 ellipse_path stroke
+1099 1112 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-1085.5 1109.53 moveto 27 (379212) alignedtext
+9 /Times-Roman set_font
+1085.5 1109.4 moveto 27 (379212) alignedtext
 grestore
 % pagfpr1_1_1t_23
 gsave

diff --git a/rtest/nshare/viewport_neato1.png b/rtest/nshare/viewport_neato1.png
index cdabc0403cfd9ba7f3d16426c721b493e2bcde0d..a7d5232a08b0a92b4e5a7e7265a6dc1571e19828 100644 (file)
Binary files a/rtest/nshare/viewport_neato1.png and b/rtest/nshare/viewport_neato1.png differ

diff --git a/rtest/nshare/viewport_neato1.ps b/rtest/nshare/viewport_neato1.ps
index 0b5fc93d438277ed82c5860106764c9b45923281..96ac55d3c9b8734264d55dc8171184db64f96f6f 100644 (file)
--- a/rtest/nshare/viewport_neato1.ps
+++ b/rtest/nshare/viewport_neato1.ps
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0
-%%Creator: Graphviz version 2.16 (Sat Nov 10 02:02:40 UTC 2007)
+%%Creator: Graphviz version 2.17 (Mon Mar 10 18:55:03 UTC 2008)
 %%For: (ellson) John Ellson
 %%Title: G
 %%Pages: (atend)
@@ -189,10 +189,10 @@ gsave
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-560 613 29 13.6118 ellipse_path stroke
+560 613 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-546.5 610.525 moveto 27 (354290) alignedtext
+9 /Times-Roman set_font
+547 610.4 moveto 26 (354290) alignedtext
 grestore
 % rcfpr0_0_1t_9->354290
 gsave
@@ -222,16 +222,16 @@ newpath 635 587 moveto
 627 589 609 595 593 601 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 590.985 598.036 moveto
+newpath 590.98 598.04 moveto
 583 605 lineto
-593.585 604.536 lineto
+593.58 604.54 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 590.985 598.036 moveto
+newpath 590.98 598.04 moveto
 583 605 lineto
-593.585 604.536 lineto
+593.58 604.54 lineto
 closepath stroke
 grestore
 % tlfpr1_0_4g_4
@@ -248,26 +248,26 @@ newpath 479 618 moveto
 486 617 504 616 521 616 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 521.398 619.478 moveto
+newpath 521.4 619.48 moveto
 531 615 lineto
-520.701 612.512 lineto
+520.7 612.51 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 521.398 619.478 moveto
+newpath 521.4 619.48 moveto
 531 615 lineto
-520.701 612.512 lineto
+520.7 612.51 lineto
 closepath stroke
 grestore
 % 358471
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-385 598 29 13.6118 ellipse_path stroke
+385 598 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-371.5 595.525 moveto 27 (358471) alignedtext
+9 /Times-Roman set_font
+372 595.4 moveto 26 (358471) alignedtext
 grestore
 % tlfpr1_0_4g_4->358471
 gsave
@@ -277,26 +277,26 @@ newpath 471 617 moveto
 462 615 441 611 422 606 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 422.492 602.529 moveto
+newpath 422.49 602.53 moveto
 412 604 lineto
-421.119 609.393 lineto
+421.12 609.39 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 422.492 602.529 moveto
+newpath 422.49 602.53 moveto
 412 604 lineto
-421.119 609.393 lineto
+421.12 609.39 lineto
 closepath stroke
 grestore
 % 375024
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-490 676 29 13.6118 ellipse_path stroke
+490 676 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-476.5 673.525 moveto 27 (375024) alignedtext
+9 /Times-Roman set_font
+477 673.4 moveto 26 (375024) alignedtext
 grestore
 % tlfpr1_0_4g_4->375024
 gsave
@@ -306,26 +306,26 @@ newpath 476 623 moveto
 478 629 481 641 484 652 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 480.774 653.427 moveto
+newpath 480.77 653.43 moveto
 487 662 lineto
-487.479 651.416 lineto
+487.48 651.42 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 480.774 653.427 moveto
+newpath 480.77 653.43 moveto
 487 662 lineto
-487.479 651.416 lineto
+487.48 651.42 lineto
 closepath stroke
 grestore
 % 375027
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-488 721 29 13.6118 ellipse_path stroke
+488 721 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-474.5 718.525 moveto 27 (375027) alignedtext
+9 /Times-Roman set_font
+474.5 718.4 moveto 27 (375027) alignedtext
 grestore
 % tlfpr1_0_4g_4->375027
 gsave
@@ -335,16 +335,16 @@ newpath 476 623 moveto
 477 636 482 673 485 697 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 481.522 697.398 moveto
+newpath 481.52 697.4 moveto
 486 707 lineto
-488.488 696.701 lineto
+488.49 696.7 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 481.522 697.398 moveto
+newpath 481.52 697.4 moveto
 486 707 lineto
-488.488 696.701 lineto
+488.49 696.7 lineto
 closepath stroke
 grestore
 % pagfpr1_1_1t_23
@@ -387,16 +387,16 @@ newpath 361 494 moveto
 365 508 373 548 380 574 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 376.607 574.881 moveto
+newpath 376.61 574.88 moveto
 382 584 lineto
-383.471 573.508 lineto
+383.47 573.51 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 376.607 574.881 moveto
+newpath 376.61 574.88 moveto
 382 584 lineto
-383.471 573.508 lineto
+383.47 573.51 lineto
 closepath stroke
 grestore
 % odfpr0_0_1t_7->353506
@@ -407,16 +407,16 @@ newpath 360 485 moveto
 361 476 362 458 362 442 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 365.488 442.299 moveto
+newpath 365.49 442.3 moveto
 363 432 lineto
-358.522 441.602 lineto
+358.52 441.6 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 365.488 442.299 moveto
+newpath 365.49 442.3 moveto
 363 432 lineto
-358.522 441.602 lineto
+358.52 441.6 lineto
 closepath stroke
 grestore
 % odfpr0_0_1t_7->370509
@@ -447,16 +447,16 @@ newpath 358 486 moveto
 355 475 344 447 336 427 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 338.964 424.985 moveto
+newpath 338.96 424.98 moveto
 332 417 lineto
-332.464 427.585 lineto
+332.46 427.58 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 338.964 424.985 moveto
+newpath 338.96 424.98 moveto
 332 417 lineto
-332.464 427.585 lineto
+332.46 427.58 lineto
 closepath stroke
 grestore
 % odfpr1_0_1t_36
@@ -473,16 +473,16 @@ newpath 397 538 moveto
 395 546 393 561 390 574 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 386.529 573.508 moveto
+newpath 386.53 573.51 moveto
 388 584 lineto
-393.393 574.881 lineto
+393.39 574.88 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 386.529 573.508 moveto
+newpath 386.53 573.51 moveto
 388 584 lineto
-393.393 574.881 lineto
+393.39 574.88 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_18
@@ -499,26 +499,26 @@ newpath 287 661 moveto
 299 654 334 631 360 614 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 361.375 617.268 moveto
+newpath 361.38 617.27 moveto
 368 609 lineto
-357.665 611.332 lineto
+357.66 611.33 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 361.375 617.268 moveto
+newpath 361.38 617.27 moveto
 368 609 lineto
-357.665 611.332 lineto
+357.66 611.33 lineto
 closepath stroke
 grestore
 % 354546
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-247 751 29 13.6118 ellipse_path stroke
+247 751 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-233.5 748.525 moveto 27 (354546) alignedtext
+9 /Times-Roman set_font
+234.5 748.4 moveto 25 (354546) alignedtext
 grestore
 % odfpr1_0_3t_18->354546
 gsave
@@ -528,26 +528,26 @@ newpath 281 667 moveto
 277 678 265 707 256 729 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 252.863 727.44 moveto
+newpath 252.86 727.44 moveto
 252 738 lineto
-259.26 730.283 lineto
+259.26 730.28 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 252.863 727.44 moveto
+newpath 252.86 727.44 moveto
 252 738 lineto
-259.26 730.283 lineto
+259.26 730.28 lineto
 closepath stroke
 grestore
 % 354757
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-325 753 29 13.6118 ellipse_path stroke
+325 753 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-311.5 750.525 moveto 27 (354757) alignedtext
+9 /Times-Roman set_font
+312 750.4 moveto 26 (354757) alignedtext
 grestore
 % odfpr1_0_3t_18->354757
 gsave
@@ -557,26 +557,26 @@ newpath 285 667 moveto
 290 678 304 709 315 730 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 311.74 731.283 moveto
+newpath 311.74 731.28 moveto
 319 739 lineto
-318.137 728.44 lineto
+318.14 728.44 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 311.74 731.283 moveto
+newpath 311.74 731.28 moveto
 319 739 lineto
-318.137 728.44 lineto
+318.14 728.44 lineto
 closepath stroke
 grestore
 % 354766
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-307 751 29 13.6118 ellipse_path stroke
+307 751 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-293.5 748.525 moveto 27 (354766) alignedtext
+9 /Times-Roman set_font
+294 748.4 moveto 26 (354766) alignedtext
 grestore
 % odfpr1_0_3t_18->354766
 gsave
@@ -586,26 +586,26 @@ newpath 284 668 moveto
 287 679 295 707 300 727 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 296.774 728.427 moveto
+newpath 296.77 728.43 moveto
 303 737 lineto
-303.479 726.416 lineto
+303.48 726.42 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 296.774 728.427 moveto
+newpath 296.77 728.43 moveto
 303 737 lineto
-303.479 726.416 lineto
+303.48 726.42 lineto
 closepath stroke
 grestore
 % 354771
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-287 741 29 13.6118 ellipse_path stroke
+287 741 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-273.5 738.525 moveto 27 (354771) alignedtext
+9 /Times-Roman set_font
+273.5 738.4 moveto 27 (354771) alignedtext
 grestore
 % odfpr1_0_3t_18->354771
 gsave
@@ -615,26 +615,26 @@ newpath 283 668 moveto
 284 677 285 699 285 717 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 281.522 717.398 moveto
+newpath 281.52 717.4 moveto
 286 727 lineto
-288.488 716.701 lineto
+288.49 716.7 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 281.522 717.398 moveto
+newpath 281.52 717.4 moveto
 286 727 lineto
-288.488 716.701 lineto
+288.49 716.7 lineto
 closepath stroke
 grestore
 % 354785
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-209 627 29 13.6118 ellipse_path stroke
+209 627 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-195.5 624.525 moveto 27 (354785) alignedtext
+9 /Times-Roman set_font
+196 624.4 moveto 26 (354785) alignedtext
 grestore
 % odfpr1_0_3t_18->354785
 gsave
@@ -644,26 +644,26 @@ newpath 279 661 moveto
 272 658 254 649 238 641 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 239.56 637.863 moveto
+newpath 239.56 637.86 moveto
 229 637 lineto
-236.717 644.26 lineto
+236.72 644.26 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 239.56 637.863 moveto
+newpath 239.56 637.86 moveto
 229 637 lineto
-236.717 644.26 lineto
+236.72 644.26 lineto
 closepath stroke
 grestore
 % 354878
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-204 642 29 13.6118 ellipse_path stroke
+204 642 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-190.5 639.525 moveto 27 (354878) alignedtext
+9 /Times-Roman set_font
+191 639.4 moveto 26 (354878) alignedtext
 grestore
 % odfpr1_0_3t_18->354878
 gsave
@@ -673,26 +673,26 @@ newpath 279 662 moveto
 271 660 255 656 239 652 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 239.584 648.521 moveto
+newpath 239.58 648.52 moveto
 229 649 lineto
-237.573 655.226 lineto
+237.57 655.23 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 239.584 648.521 moveto
+newpath 239.58 648.52 moveto
 229 649 lineto
-237.573 655.226 lineto
+237.57 655.23 lineto
 closepath stroke
 grestore
 % 355080
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-219 612 29 13.6118 ellipse_path stroke
+219 612 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-205.5 609.525 moveto 27 (355080) alignedtext
+9 /Times-Roman set_font
+206.5 609.4 moveto 25 (355080) alignedtext
 grestore
 % odfpr1_0_3t_18->355080
 gsave
@@ -718,10 +718,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-219 590 29 13.6118 ellipse_path stroke
+219 590 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-205.5 587.525 moveto 27 (355288) alignedtext
+9 /Times-Roman set_font
+206.5 587.4 moveto 25 (355288) alignedtext
 grestore
 % odfpr1_0_3t_18->355288
 gsave
@@ -731,26 +731,26 @@ newpath 280 659 moveto
 272 650 252 628 237 611 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 239.219 608.221 moveto
+newpath 239.22 608.22 moveto
 230 603 lineto
-233.951 612.831 lineto
+233.95 612.83 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 239.219 608.221 moveto
+newpath 239.22 608.22 moveto
 230 603 lineto
-233.951 612.831 lineto
+233.95 612.83 lineto
 closepath stroke
 grestore
 % 355800
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-296 620 29 13.6118 ellipse_path stroke
+296 620 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-282.5 617.525 moveto 27 (355800) alignedtext
+9 /Times-Roman set_font
+283.5 617.4 moveto 25 (355800) alignedtext
 grestore
 % odfpr1_0_3t_18->355800
 gsave
@@ -760,26 +760,26 @@ newpath 284 659 moveto
 285 655 287 649 289 643 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 292.479 643.584 moveto
+newpath 292.48 643.58 moveto
 292 633 lineto
-285.774 641.573 lineto
+285.77 641.57 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 292.479 643.584 moveto
+newpath 292.48 643.58 moveto
 292 633 lineto
-285.774 641.573 lineto
+285.77 641.57 lineto
 closepath stroke
 grestore
 % 356116
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-353 668 29 13.6118 ellipse_path stroke
+353 668 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-339.5 665.525 moveto 27 (356116) alignedtext
+9 /Times-Roman set_font
+340 665.4 moveto 26 (356116) alignedtext
 grestore
 % odfpr1_0_3t_18->356116
 gsave
@@ -789,26 +789,26 @@ newpath 287 663 moveto
 292 663 303 664 314 665 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 313.701 668.488 moveto
+newpath 313.7 668.49 moveto
 324 666 lineto
-314.398 661.522 lineto
+314.4 661.52 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 313.701 668.488 moveto
+newpath 313.7 668.49 moveto
 324 666 lineto
-314.398 661.522 lineto
+314.4 661.52 lineto
 closepath stroke
 grestore
 % 356741
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-318 602 29 13.6118 ellipse_path stroke
+318 602 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-304.5 599.525 moveto 27 (356741) alignedtext
+9 /Times-Roman set_font
+305 599.4 moveto 26 (356741) alignedtext
 grestore
 % odfpr1_0_3t_18->356741
 gsave
@@ -818,26 +818,26 @@ newpath 285 659 moveto
 289 652 298 637 305 624 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 308.203 625.441 moveto
+newpath 308.2 625.44 moveto
 310 615 lineto
-302.084 622.042 lineto
+302.08 622.04 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 308.203 625.441 moveto
+newpath 308.2 625.44 moveto
 310 615 lineto
-302.084 622.042 lineto
+302.08 622.04 lineto
 closepath stroke
 grestore
 % 357340
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-350 686 29 13.6118 ellipse_path stroke
+350 686 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-336.5 683.525 moveto 27 (357340) alignedtext
+9 /Times-Roman set_font
+337 683.4 moveto 26 (357340) alignedtext
 grestore
 % odfpr1_0_3t_18->357340
 gsave
@@ -847,26 +847,26 @@ newpath 287 664 moveto
 293 666 305 671 317 675 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 316.416 678.479 moveto
+newpath 316.42 678.48 moveto
 327 678 lineto
-318.427 671.774 lineto
+318.43 671.77 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 316.416 678.479 moveto
+newpath 316.42 678.48 moveto
 327 678 lineto
-318.427 671.774 lineto
+318.43 671.77 lineto
 closepath stroke
 grestore
 % 357538
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-311 691 29 13.6118 ellipse_path stroke
+311 691 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-297.5 688.525 moveto 27 (357538) alignedtext
+9 /Times-Roman set_font
+298.5 688.4 moveto 25 (357538) alignedtext
 grestore
 % odfpr1_0_3t_18->357538
 gsave
@@ -876,26 +876,26 @@ newpath 286 666 moveto
 288 668 290 670 292 672 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 289.454 674.404 moveto
+newpath 289.45 674.4 moveto
 299 679 lineto
-294.404 669.454 lineto
+294.4 669.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 289.454 674.404 moveto
+newpath 289.45 674.4 moveto
 299 679 lineto
-294.404 669.454 lineto
+294.4 669.45 lineto
 closepath stroke
 grestore
 % 357769
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-324 710 29 13.6118 ellipse_path stroke
+324 710 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-310.5 707.525 moveto 27 (357769) alignedtext
+9 /Times-Roman set_font
+310.5 707.4 moveto 27 (357769) alignedtext
 grestore
 % odfpr1_0_3t_18->357769
 gsave
@@ -905,26 +905,26 @@ newpath 286 666 moveto
 290 671 298 681 306 689 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 303.781 691.779 moveto
+newpath 303.78 691.78 moveto
 313 697 lineto
-309.049 687.169 lineto
+309.05 687.17 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 303.781 691.779 moveto
+newpath 303.78 691.78 moveto
 313 697 lineto
-309.049 687.169 lineto
+309.05 687.17 lineto
 closepath stroke
 grestore
 % 357793
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-265 625 29 13.6118 ellipse_path stroke
+265 625 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-251.5 622.525 moveto 27 (357793) alignedtext
+9 /Times-Roman set_font
+252 622.4 moveto 26 (357793) alignedtext
 grestore
 % odfpr1_0_3t_18->357793
 gsave
@@ -934,26 +934,26 @@ newpath 281 659 moveto
 280 656 278 652 276 647 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 278.916 645.042 moveto
+newpath 278.92 645.04 moveto
 271 638 lineto
-272.797 648.441 lineto
+272.8 648.44 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 278.916 645.042 moveto
+newpath 278.92 645.04 moveto
 271 638 lineto
-272.797 648.441 lineto
+272.8 648.44 lineto
 closepath stroke
 grestore
 % 358155
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-355 704 29 13.6118 ellipse_path stroke
+355 704 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-341.5 701.525 moveto 27 (358155) alignedtext
+9 /Times-Roman set_font
+343 701.4 moveto 24 (358155) alignedtext
 grestore
 % odfpr1_0_3t_18->358155
 gsave
@@ -963,26 +963,26 @@ newpath 287 665 moveto
 294 670 312 680 327 688 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 325.559 691.203 moveto
+newpath 325.56 691.2 moveto
 336 693 lineto
-328.958 685.084 lineto
+328.96 685.08 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 325.559 691.203 moveto
+newpath 325.56 691.2 moveto
 336 693 lineto
-328.958 685.084 lineto
+328.96 685.08 lineto
 closepath stroke
 grestore
 % 358157
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-344 721 29 13.6118 ellipse_path stroke
+344 721 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-330.5 718.525 moveto 27 (358157) alignedtext
+9 /Times-Roman set_font
+331 718.4 moveto 26 (358157) alignedtext
 grestore
 % odfpr1_0_3t_18->358157
 gsave
@@ -992,26 +992,26 @@ newpath 286 666 moveto
 294 673 310 688 324 702 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 321.454 704.404 moveto
+newpath 321.45 704.4 moveto
 331 709 lineto
-326.404 699.454 lineto
+326.4 699.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 321.454 704.404 moveto
+newpath 321.45 704.4 moveto
 331 709 lineto
-326.404 699.454 lineto
+326.4 699.45 lineto
 closepath stroke
 grestore
 % 358159
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-317 582 29 13.6118 ellipse_path stroke
+317 582 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-303.5 579.525 moveto 27 (358159) alignedtext
+9 /Times-Roman set_font
+304.5 579.4 moveto 25 (358159) alignedtext
 grestore
 % odfpr1_0_3t_18->358159
 gsave
@@ -1021,26 +1021,26 @@ newpath 285 659 moveto
 289 649 300 624 307 605 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 310.536 605.585 moveto
+newpath 310.54 605.58 moveto
 311 595 lineto
-304.036 602.985 lineto
+304.04 602.98 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 310.536 605.585 moveto
+newpath 310.54 605.58 moveto
 311 595 lineto
-304.036 602.985 lineto
+304.04 602.98 lineto
 closepath stroke
 grestore
 % 358584
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-274 599 29 13.6118 ellipse_path stroke
+274 599 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-260.5 596.525 moveto 27 (358584) alignedtext
+9 /Times-Roman set_font
+261.5 596.4 moveto 25 (358584) alignedtext
 grestore
 % odfpr1_0_3t_18->358584
 gsave
@@ -1050,26 +1050,26 @@ newpath 282 658 moveto
 281 651 279 636 277 623 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 280.478 622.602 moveto
+newpath 280.48 622.6 moveto
 276 613 lineto
-273.512 623.299 lineto
+273.51 623.3 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 280.478 622.602 moveto
+newpath 280.48 622.6 moveto
 276 613 lineto
-273.512 623.299 lineto
+273.51 623.3 lineto
 closepath stroke
 grestore
 % 360104
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-281 696 30 13.6118 ellipse_path stroke
+281 696 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-267.5 693.525 moveto 27 (360104) alignedtext
+9 /Times-Roman set_font
+268 693.4 moveto 26 (360104) alignedtext
 grestore
 % odfpr1_0_3t_18->360104
 gsave
@@ -1079,26 +1079,26 @@ newpath 283 668 moveto
 283 669 283 671 283 672 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 279.512 671.701 moveto
+newpath 279.51 671.7 moveto
 282 682 lineto
-286.478 672.398 lineto
+286.48 672.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 279.512 671.701 moveto
+newpath 279.51 671.7 moveto
 282 682 lineto
-286.478 672.398 lineto
+286.48 672.4 lineto
 closepath stroke
 grestore
 % 360144
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-253 658 30 13.6118 ellipse_path stroke
+253 658 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-239.5 655.525 moveto 27 (360144) alignedtext
+9 /Times-Roman set_font
+240 655.4 moveto 26 (360144) alignedtext
 grestore
 % odfpr1_0_3t_18->360144
 gsave
@@ -1124,10 +1124,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-278 568 29 13.6118 ellipse_path stroke
+278 568 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-264.5 565.525 moveto 27 (360672) alignedtext
+9 /Times-Roman set_font
+264.5 565.4 moveto 27 (360672) alignedtext
 grestore
 % odfpr1_0_3t_18->360672
 gsave
@@ -1153,10 +1153,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-296 582 30 13.6118 ellipse_path stroke
+296 582 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-282.5 579.525 moveto 27 (360839) alignedtext
+9 /Times-Roman set_font
+283 579.4 moveto 26 (360839) alignedtext
 grestore
 % odfpr1_0_3t_18->360839
 gsave
@@ -1166,26 +1166,26 @@ newpath 284 658 moveto
 286 648 289 624 292 606 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 295.471 606.492 moveto
+newpath 295.47 606.49 moveto
 294 596 lineto
-288.607 605.119 lineto
+288.61 605.12 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 295.471 606.492 moveto
+newpath 295.47 606.49 moveto
 294 596 lineto
-288.607 605.119 lineto
+288.61 605.12 lineto
 closepath stroke
 grestore
 % 371187
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-328 656 30 13.6118 ellipse_path stroke
+328 656 30.96 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-314.5 653.525 moveto 27 (371187) alignedtext
+9 /Times-Roman set_font
+314 653.4 moveto 28 (371187) alignedtext
 grestore
 % odfpr1_0_3t_18->371187
 gsave
@@ -1195,26 +1195,26 @@ newpath 287 662 moveto
 288 662 288 662 289 662 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 289.881 665.393 moveto
+newpath 289.88 665.39 moveto
 299 660 lineto
-288.508 658.529 lineto
+288.51 658.53 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 289.881 665.393 moveto
+newpath 289.88 665.39 moveto
 299 660 lineto
-288.508 658.529 lineto
+288.51 658.53 lineto
 closepath stroke
 grestore
 % 373300
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-240 571 30 13.6118 ellipse_path stroke
+240 571 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-226.5 568.525 moveto 27 (373300) alignedtext
+9 /Times-Roman set_font
+227 568.4 moveto 26 (373300) alignedtext
 grestore
 % odfpr1_0_3t_18->373300
 gsave
@@ -1224,26 +1224,26 @@ newpath 281 659 moveto
 276 648 261 615 250 593 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 253.26 591.717 moveto
+newpath 253.26 591.72 moveto
 246 584 lineto
-246.863 594.56 lineto
+246.86 594.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 253.26 591.717 moveto
+newpath 253.26 591.72 moveto
 246 584 lineto
-246.863 594.56 lineto
+246.86 594.56 lineto
 closepath stroke
 grestore
 % 375134
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-215 683 29 13.6118 ellipse_path stroke
+215 683 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-201.5 680.525 moveto 27 (375134) alignedtext
+9 /Times-Roman set_font
+202 680.4 moveto 26 (375134) alignedtext
 grestore
 % odfpr1_0_3t_18->375134
 gsave
@@ -1253,26 +1253,26 @@ newpath 279 664 moveto
 273 666 261 669 249 673 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 247.573 669.774 moveto
+newpath 247.57 669.77 moveto
 239 676 lineto
-249.584 676.479 lineto
+249.58 676.48 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 247.573 669.774 moveto
+newpath 247.57 669.77 moveto
 239 676 lineto
-249.584 676.479 lineto
+249.58 676.48 lineto
 closepath stroke
 grestore
 % 375319
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-271 768 29 13.6118 ellipse_path stroke
+271 768 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-257.5 765.525 moveto 27 (375319) alignedtext
+9 /Times-Roman set_font
+258 765.4 moveto 26 (375319) alignedtext
 grestore
 % odfpr1_0_3t_18->375319
 gsave
@@ -1282,26 +1282,26 @@ newpath 282 668 moveto
 281 681 276 719 274 744 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 270.512 743.701 moveto
+newpath 270.51 743.7 moveto
 273 754 lineto
-277.478 744.398 lineto
+277.48 744.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 270.512 743.701 moveto
+newpath 270.51 743.7 moveto
 273 754 lineto
-277.478 744.398 lineto
+277.48 744.4 lineto
 closepath stroke
 grestore
 % 375499
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-333 629 29 13.6118 ellipse_path stroke
+333 629 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-319.5 626.525 moveto 27 (375499) alignedtext
+9 /Times-Roman set_font
+320 626.4 moveto 26 (375499) alignedtext
 grestore
 % odfpr1_0_3t_18->375499
 gsave
@@ -1327,10 +1327,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-226 715 29 13.6118 ellipse_path stroke
+226 715 30.96 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-212.5 712.525 moveto 27 (377220) alignedtext
+9 /Times-Roman set_font
+212 712.4 moveto 28 (377220) alignedtext
 grestore
 % odfpr1_0_3t_18->377220
 gsave
@@ -1340,26 +1340,26 @@ newpath 280 666 moveto
 273 672 259 685 247 696 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 244.221 693.781 moveto
+newpath 244.22 693.78 moveto
 239 703 lineto
-248.831 699.049 lineto
+248.83 699.05 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 244.221 693.781 moveto
+newpath 244.22 693.78 moveto
 239 703 lineto
-248.831 699.049 lineto
+248.83 699.05 lineto
 closepath stroke
 grestore
 % 377562
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-190 684 29 13.6118 ellipse_path stroke
+190 684 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-176.5 681.525 moveto 27 (377562) alignedtext
+9 /Times-Roman set_font
+176.5 681.4 moveto 27 (377562) alignedtext
 grestore
 % odfpr1_0_3t_18->377562
 gsave
@@ -1369,26 +1369,26 @@ newpath 279 664 moveto
 270 666 247 671 226 676 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 225.119 672.607 moveto
+newpath 225.12 672.61 moveto
 216 678 lineto
-226.492 679.471 lineto
+226.49 679.47 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 225.119 672.607 moveto
+newpath 225.12 672.61 moveto
 216 678 lineto
-226.492 679.471 lineto
+226.49 679.47 lineto
 closepath stroke
 grestore
 % 378108
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-247 727 30 13.6118 ellipse_path stroke
+247 727 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-233.5 724.525 moveto 27 (378108) alignedtext
+9 /Times-Roman set_font
+233.5 724.4 moveto 27 (378108) alignedtext
 grestore
 % odfpr1_0_3t_18->378108
 gsave
@@ -1398,16 +1398,16 @@ newpath 281 667 moveto
 277 674 267 691 259 705 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 255.797 703.559 moveto
+newpath 255.8 703.56 moveto
 254 714 lineto
-261.916 706.958 lineto
+261.92 706.96 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 255.797 703.559 moveto
+newpath 255.8 703.56 moveto
 254 714 lineto
-261.916 706.958 lineto
+261.92 706.96 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21
@@ -1424,16 +1424,16 @@ newpath 360 622 moveto
 361 621 363 619 365 617 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 367.404 619.546 moveto
+newpath 367.4 619.55 moveto
 372 610 lineto
-362.454 614.596 lineto
+362.45 614.6 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 367.404 619.546 moveto
+newpath 367.4 619.55 moveto
 372 610 lineto
-362.454 614.596 lineto
+362.45 614.6 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->355800
@@ -1444,16 +1444,16 @@ newpath 353 625 moveto
 349 625 342 625 335 624 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 335.299 620.512 moveto
+newpath 335.3 620.51 moveto
 325 623 lineto
-334.602 627.478 lineto
+334.6 627.48 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 335.299 620.512 moveto
+newpath 335.3 620.51 moveto
 325 623 lineto
-334.602 627.478 lineto
+334.6 627.48 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->356116
@@ -1484,16 +1484,16 @@ newpath 353 623 moveto
 351 622 348 620 345 618 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 346.441 614.797 moveto
+newpath 346.44 614.8 moveto
 336 613 lineto
-343.042 620.916 lineto
+343.04 620.92 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 346.441 614.797 moveto
+newpath 346.44 614.8 moveto
 336 613 lineto
-343.042 620.916 lineto
+343.04 620.92 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->357340
@@ -1504,16 +1504,16 @@ newpath 356 630 moveto
 355 637 354 650 353 662 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 349.512 661.701 moveto
+newpath 349.51 661.7 moveto
 352 672 lineto
-356.478 662.398 lineto
+356.48 662.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 349.512 661.701 moveto
+newpath 349.51 661.7 moveto
 352 672 lineto
-356.478 662.398 lineto
+356.48 662.4 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->357538
@@ -1544,16 +1544,16 @@ newpath 355 630 moveto
 351 640 341 667 333 688 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 329.863 686.44 moveto
+newpath 329.86 686.44 moveto
 329 697 lineto
-336.26 689.283 lineto
+336.26 689.28 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 329.863 686.44 moveto
+newpath 329.86 686.44 moveto
 329 697 lineto
-336.26 689.283 lineto
+336.26 689.28 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->357793
@@ -1604,16 +1604,16 @@ newpath 356 630 moveto
 355 642 351 675 347 697 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 343.512 696.701 moveto
+newpath 343.51 696.7 moveto
 346 707 lineto
-350.478 697.398 lineto
+350.48 697.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 343.512 696.701 moveto
+newpath 343.51 696.7 moveto
 346 707 lineto
-350.478 697.398 lineto
+350.48 697.4 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->358159
@@ -1624,16 +1624,16 @@ newpath 354 622 moveto
 350 618 342 610 336 603 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 338.219 600.221 moveto
+newpath 338.22 600.22 moveto
 329 595 lineto
-332.951 604.831 lineto
+332.95 604.83 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 338.219 600.221 moveto
+newpath 338.22 600.22 moveto
 329 595 lineto
-332.951 604.831 lineto
+332.95 604.83 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->358584
@@ -1644,16 +1644,16 @@ newpath 353 624 moveto
 345 621 325 615 308 610 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 308.584 606.521 moveto
+newpath 308.58 606.52 moveto
 298 607 lineto
-306.573 613.226 lineto
+306.57 613.23 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 308.584 606.521 moveto
+newpath 308.58 606.52 moveto
 298 607 lineto
-306.573 613.226 lineto
+306.57 613.23 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->360104
@@ -1664,16 +1664,16 @@ newpath 354 628 moveto
 345 637 320 660 301 677 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 298.596 674.454 moveto
+newpath 298.6 674.45 moveto
 294 684 lineto
-303.546 679.404 lineto
+303.55 679.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 298.596 674.454 moveto
+newpath 298.6 674.45 moveto
 294 684 lineto
-303.546 679.404 lineto
+303.55 679.4 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->360144
@@ -1684,16 +1684,16 @@ newpath 353 626 moveto
 342 630 312 639 288 647 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 286.573 643.774 moveto
+newpath 286.57 643.77 moveto
 278 650 lineto
-288.584 650.479 lineto
+288.58 650.48 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 286.573 643.774 moveto
+newpath 286.57 643.77 moveto
 278 650 lineto
-288.584 650.479 lineto
+288.58 650.48 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->360672
@@ -1750,16 +1750,16 @@ newpath 163 793 moveto
 173 789 198 776 218 766 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 219.958 768.916 moveto
+newpath 219.96 768.92 moveto
 227 761 lineto
-216.559 762.797 lineto
+216.56 762.8 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 219.958 768.916 moveto
+newpath 219.96 768.92 moveto
 227 761 lineto
-216.559 762.797 lineto
+216.56 762.8 lineto
 closepath stroke
 grestore
 % rcfpr1_1_1t_61
@@ -1776,16 +1776,16 @@ newpath 221 840 moveto
 224 828 234 797 240 775 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 243.479 775.584 moveto
+newpath 243.48 775.58 moveto
 243 765 lineto
-236.774 773.573 lineto
+236.77 773.57 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 243.479 775.584 moveto
+newpath 243.48 775.58 moveto
 243 765 lineto
-236.774 773.573 lineto
+236.77 773.57 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_20
@@ -1802,16 +1802,16 @@ newpath 287 824 moveto
 282 815 269 791 259 773 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 261.916 771.042 moveto
+newpath 261.92 771.04 moveto
 254 764 lineto
-255.797 774.441 lineto
+255.8 774.44 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 261.916 771.042 moveto
+newpath 261.92 771.04 moveto
 254 764 lineto
-255.797 774.441 lineto
+255.8 774.44 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_20->354757
@@ -1822,16 +1822,16 @@ newpath 291 824 moveto
 295 815 306 793 314 775 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 317.203 776.441 moveto
+newpath 317.2 776.44 moveto
 319 766 lineto
-311.084 773.042 lineto
+311.08 773.04 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 317.203 776.441 moveto
+newpath 317.2 776.44 moveto
 319 766 lineto
-311.084 773.042 lineto
+311.08 773.04 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_20->354766
@@ -1842,16 +1842,16 @@ newpath 290 823 moveto
 292 814 298 792 302 774 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 305.471 774.492 moveto
+newpath 305.47 774.49 moveto
 304 764 lineto
-298.607 773.119 lineto
+298.61 773.12 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 305.471 774.492 moveto
+newpath 305.47 774.49 moveto
 304 764 lineto
-298.607 773.119 lineto
+298.61 773.12 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_20->354771
@@ -1888,16 +1888,16 @@ newpath 141 597 moveto
 148 599 164 607 179 613 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 177.44 616.137 moveto
+newpath 177.44 616.14 moveto
 188 617 lineto
-180.283 609.74 lineto
+180.28 609.74 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 177.44 616.137 moveto
+newpath 177.44 616.14 moveto
 188 617 lineto
-180.283 609.74 lineto
+180.28 609.74 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_23->354878
@@ -1928,16 +1928,16 @@ newpath 141 596 moveto
 148 598 166 601 182 604 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 181.508 607.471 moveto
+newpath 181.51 607.47 moveto
 192 606 lineto
-182.881 600.607 lineto
+182.88 600.61 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 181.508 607.471 moveto
+newpath 181.51 607.47 moveto
 192 606 lineto
-182.881 600.607 lineto
+182.88 600.61 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_23->355288
@@ -1948,16 +1948,16 @@ newpath 141 595 moveto
 148 594 165 593 180 593 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 180.398 596.478 moveto
+newpath 180.4 596.48 moveto
 190 592 lineto
-179.701 589.512 lineto
+179.7 589.51 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 180.398 596.478 moveto
+newpath 180.4 596.48 moveto
 190 592 lineto
-179.701 589.512 lineto
+179.7 589.51 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_24
@@ -1974,16 +1974,16 @@ newpath 153 571 moveto
 160 578 176 594 189 607 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 186.454 609.404 moveto
+newpath 186.45 609.4 moveto
 196 614 lineto
-191.404 604.454 lineto
+191.4 604.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 186.454 609.404 moveto
+newpath 186.45 609.4 moveto
 196 614 lineto
-191.404 604.454 lineto
+191.4 604.45 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_24->354878
@@ -2014,16 +2014,16 @@ newpath 154 570 moveto
 162 575 178 586 193 596 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 191.559 599.203 moveto
+newpath 191.56 599.2 moveto
 202 601 lineto
-194.958 593.084 lineto
+194.96 593.08 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 191.559 599.203 moveto
+newpath 191.56 599.2 moveto
 202 601 lineto
-194.958 593.084 lineto
+194.96 593.08 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_24->355288
@@ -2034,16 +2034,16 @@ newpath 154 569 moveto
 160 571 173 575 185 579 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 184.416 582.479 moveto
+newpath 184.42 582.48 moveto
 195 582 lineto
-186.427 575.774 lineto
+186.43 575.77 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 184.416 582.479 moveto
+newpath 184.42 582.48 moveto
 195 582 lineto
-186.427 575.774 lineto
+186.43 575.77 lineto
 closepath stroke
 grestore
 % odfpr2_0_03t_13
@@ -2060,16 +2060,16 @@ newpath 174 511 moveto
 180 521 196 549 206 568 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 203.084 569.958 moveto
+newpath 203.08 569.96 moveto
 211 577 lineto
-209.203 566.559 lineto
+209.2 566.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 203.084 569.958 moveto
+newpath 203.08 569.96 moveto
 211 577 lineto
-209.203 566.559 lineto
+209.2 566.56 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_5
@@ -2086,16 +2086,16 @@ newpath 229 490 moveto
 236 499 253 527 265 546 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 262.084 547.958 moveto
+newpath 262.08 547.96 moveto
 270 555 lineto
-268.203 544.559 lineto
+268.2 544.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 262.084 547.958 moveto
+newpath 262.08 547.96 moveto
 270 555 lineto
-268.203 544.559 lineto
+268.2 544.56 lineto
 closepath stroke
 grestore
 % tlfpr1_0_3g_5
@@ -2112,16 +2112,16 @@ newpath 199 493 moveto
 204 502 218 529 228 549 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 225.084 550.958 moveto
+newpath 225.08 550.96 moveto
 233 558 lineto
-231.203 547.559 lineto
+231.2 547.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 225.084 550.958 moveto
+newpath 225.08 550.96 moveto
 233 558 lineto
-231.203 547.559 lineto
+231.2 547.56 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_12
@@ -2138,16 +2138,16 @@ newpath 158 528 moveto
 167 533 191 546 211 556 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 209.559 559.203 moveto
+newpath 209.56 559.2 moveto
 220 561 lineto
-212.958 553.084 lineto
+212.96 553.08 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 209.559 559.203 moveto
+newpath 209.56 559.2 moveto
 220 561 lineto
-212.958 553.084 lineto
+212.96 553.08 lineto
 closepath stroke
 grestore
 % odfpr1_0_5t_18
@@ -2164,16 +2164,16 @@ newpath 123 705 moveto
 133 703 158 697 179 692 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 180.427 695.226 moveto
+newpath 180.43 695.23 moveto
 189 689 lineto
-178.416 688.521 lineto
+178.42 688.52 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 180.427 695.226 moveto
+newpath 180.43 695.23 moveto
 189 689 lineto
-178.416 688.521 lineto
+178.42 688.52 lineto
 closepath stroke
 grestore
 % rcfpr0_0_1t_10
@@ -2190,16 +2190,16 @@ newpath 303 853 moveto
 300 842 288 812 280 790 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 283.26 788.717 moveto
+newpath 283.26 788.72 moveto
 276 781 lineto
-276.863 791.56 lineto
+276.86 791.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 283.26 788.717 moveto
+newpath 283.26 788.72 moveto
 276 781 lineto
-276.863 791.56 lineto
+276.86 791.56 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_36
@@ -2216,16 +2216,16 @@ newpath 173 775 moveto
 183 774 210 773 232 771 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 232.398 774.478 moveto
+newpath 232.4 774.48 moveto
 242 770 lineto
-231.701 767.512 lineto
+231.7 767.51 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 232.398 774.478 moveto
+newpath 232.4 774.48 moveto
 242 770 lineto
-231.701 767.512 lineto
+231.7 767.51 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_36->377562
@@ -2236,16 +2236,16 @@ newpath 170 771 moveto
 173 759 180 729 185 708 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 188.471 708.492 moveto
+newpath 188.47 708.49 moveto
 187 698 lineto
-181.607 707.119 lineto
+181.61 707.12 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 188.471 708.492 moveto
+newpath 188.47 708.49 moveto
 187 698 lineto
-181.607 707.119 lineto
+181.61 707.12 lineto
 closepath stroke
 grestore
 % odfpr1_0_5t_17
@@ -2288,16 +2288,16 @@ newpath 240 848 moveto
 244 838 254 811 262 790 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 265.137 791.56 moveto
+newpath 265.14 791.56 moveto
 266 781 lineto
-258.74 788.717 lineto
+258.74 788.72 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 265.137 791.56 moveto
+newpath 265.14 791.56 moveto
 266 781 lineto
-258.74 788.717 lineto
+258.74 788.72 lineto
 closepath stroke
 grestore
 % odfpr1_0_5t_21
@@ -2314,16 +2314,16 @@ newpath 176 802 moveto
 182 792 201 759 213 737 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 216.203 738.441 moveto
+newpath 216.2 738.44 moveto
 218 728 lineto
-210.084 735.042 lineto
+210.08 735.04 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 216.203 738.441 moveto
+newpath 216.2 738.44 moveto
 218 728 lineto
-210.084 735.042 lineto
+210.08 735.04 lineto
 closepath stroke
 grestore
 % tlfpr1_0_3g_7
@@ -2340,16 +2340,16 @@ newpath 113 679 moveto
 120 680 136 681 151 681 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 150.701 684.488 moveto
+newpath 150.7 684.49 moveto
 161 682 lineto
-151.398 677.522 lineto
+151.4 677.52 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 150.701 684.488 moveto
+newpath 150.7 684.49 moveto
 161 682 lineto
-151.398 677.522 lineto
+151.4 677.52 lineto
 closepath stroke
 grestore
 % tlfpr1_1_1t_3
@@ -2392,26 +2392,26 @@ newpath 111 635 moveto
 120 641 144 656 163 668 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 161.559 671.203 moveto
+newpath 161.56 671.2 moveto
 172 673 lineto
-164.958 665.084 lineto
+164.96 665.08 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 161.559 671.203 moveto
+newpath 161.56 671.2 moveto
 172 673 lineto
-164.958 665.084 lineto
+164.96 665.08 lineto
 closepath stroke
 grestore
 % 354221
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-30 606 29 13.6118 ellipse_path stroke
+30 606 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-16.5 603.525 moveto 27 (354221) alignedtext
+9 /Times-Roman set_font
+17 603.4 moveto 26 (354221) alignedtext
 grestore
 % odfpr1_0_5t_20->354221
 gsave
@@ -2421,16 +2421,16 @@ newpath 103 632 moveto
 96 630 78 623 63 617 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 63.584 613.521 moveto
+newpath 63.58 613.52 moveto
 53 614 lineto
-61.5725 620.226 lineto
+61.57 620.23 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 63.584 613.521 moveto
+newpath 63.58 613.52 moveto
 53 614 lineto
-61.5725 620.226 lineto
+61.57 620.23 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_6
@@ -2447,16 +2447,16 @@ newpath 204 821 moveto
 210 809 226 773 237 749 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 240.137 750.56 moveto
+newpath 240.14 750.56 moveto
 241 740 lineto
-233.74 747.717 lineto
+233.74 747.72 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 240.137 750.56 moveto
+newpath 240.14 750.56 moveto
 241 740 lineto
-233.74 747.717 lineto
+233.74 747.72 lineto
 closepath stroke
 grestore
 endpage

diff --git a/rtest/nshare/viewport_neato2.png b/rtest/nshare/viewport_neato2.png
index 7d59fb45bde5964b870d1a6c29d125f83bf8d103..ca3f93e481db22c4d2d78825f81484fa974bed1a 100644 (file)
Binary files a/rtest/nshare/viewport_neato2.png and b/rtest/nshare/viewport_neato2.png differ

diff --git a/rtest/nshare/viewport_neato2.ps b/rtest/nshare/viewport_neato2.ps
index a48275e4b98b6d3820cfe791ffc6db5b21b6fbc2..b821d3d01d636efae705588b71eb12087f72e551 100644 (file)
--- a/rtest/nshare/viewport_neato2.ps
+++ b/rtest/nshare/viewport_neato2.ps
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0
-%%Creator: Graphviz version 2.16 (Sat Nov 10 02:02:40 UTC 2007)
+%%Creator: Graphviz version 2.17 (Mon Mar 10 18:55:03 UTC 2008)
 %%For: (ellson) John Ellson
 %%Title: G
 %%Pages: (atend)
@@ -189,10 +189,10 @@ gsave
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-385 598 29 13.6118 ellipse_path stroke
+385 598 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-371.5 595.525 moveto 27 (358471) alignedtext
+9 /Times-Roman set_font
+372 595.4 moveto 26 (358471) alignedtext
 grestore
 % odfpr0_0_1t_7->358471
 gsave
@@ -202,16 +202,16 @@ newpath 361 494 moveto
 365 508 373 548 380 574 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 376.607 574.881 moveto
+newpath 376.61 574.88 moveto
 382 584 lineto
-383.471 573.508 lineto
+383.47 573.51 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 376.607 574.881 moveto
+newpath 376.61 574.88 moveto
 382 584 lineto
-383.471 573.508 lineto
+383.47 573.51 lineto
 closepath stroke
 grestore
 % odfpr1_0_1t_36->358471
@@ -222,16 +222,16 @@ newpath 397 538 moveto
 395 546 393 561 390 574 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 386.529 573.508 moveto
+newpath 386.53 573.51 moveto
 388 584 lineto
-393.393 574.881 lineto
+393.39 574.88 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 386.529 573.508 moveto
+newpath 386.53 573.51 moveto
 388 584 lineto
-393.393 574.881 lineto
+393.39 574.88 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_18
@@ -248,26 +248,26 @@ newpath 287 661 moveto
 299 654 334 631 360 614 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 361.375 617.268 moveto
+newpath 361.38 617.27 moveto
 368 609 lineto
-357.665 611.332 lineto
+357.66 611.33 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 361.375 617.268 moveto
+newpath 361.38 617.27 moveto
 368 609 lineto
-357.665 611.332 lineto
+357.66 611.33 lineto
 closepath stroke
 grestore
 % 354546
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-247 751 29 13.6118 ellipse_path stroke
+247 751 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-233.5 748.525 moveto 27 (354546) alignedtext
+9 /Times-Roman set_font
+234.5 748.4 moveto 25 (354546) alignedtext
 grestore
 % odfpr1_0_3t_18->354546
 gsave
@@ -277,26 +277,26 @@ newpath 281 667 moveto
 277 678 265 707 256 729 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 252.863 727.44 moveto
+newpath 252.86 727.44 moveto
 252 738 lineto
-259.26 730.283 lineto
+259.26 730.28 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 252.863 727.44 moveto
+newpath 252.86 727.44 moveto
 252 738 lineto
-259.26 730.283 lineto
+259.26 730.28 lineto
 closepath stroke
 grestore
 % 354757
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-325 753 29 13.6118 ellipse_path stroke
+325 753 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-311.5 750.525 moveto 27 (354757) alignedtext
+9 /Times-Roman set_font
+312 750.4 moveto 26 (354757) alignedtext
 grestore
 % odfpr1_0_3t_18->354757
 gsave
@@ -306,26 +306,26 @@ newpath 285 667 moveto
 290 678 304 709 315 730 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 311.74 731.283 moveto
+newpath 311.74 731.28 moveto
 319 739 lineto
-318.137 728.44 lineto
+318.14 728.44 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 311.74 731.283 moveto
+newpath 311.74 731.28 moveto
 319 739 lineto
-318.137 728.44 lineto
+318.14 728.44 lineto
 closepath stroke
 grestore
 % 354766
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-307 751 29 13.6118 ellipse_path stroke
+307 751 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-293.5 748.525 moveto 27 (354766) alignedtext
+9 /Times-Roman set_font
+294 748.4 moveto 26 (354766) alignedtext
 grestore
 % odfpr1_0_3t_18->354766
 gsave
@@ -335,26 +335,26 @@ newpath 284 668 moveto
 287 679 295 707 300 727 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 296.774 728.427 moveto
+newpath 296.77 728.43 moveto
 303 737 lineto
-303.479 726.416 lineto
+303.48 726.42 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 296.774 728.427 moveto
+newpath 296.77 728.43 moveto
 303 737 lineto
-303.479 726.416 lineto
+303.48 726.42 lineto
 closepath stroke
 grestore
 % 354771
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-287 741 29 13.6118 ellipse_path stroke
+287 741 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-273.5 738.525 moveto 27 (354771) alignedtext
+9 /Times-Roman set_font
+273.5 738.4 moveto 27 (354771) alignedtext
 grestore
 % odfpr1_0_3t_18->354771
 gsave
@@ -364,26 +364,26 @@ newpath 283 668 moveto
 284 677 285 699 285 717 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 281.522 717.398 moveto
+newpath 281.52 717.4 moveto
 286 727 lineto
-288.488 716.701 lineto
+288.49 716.7 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 281.522 717.398 moveto
+newpath 281.52 717.4 moveto
 286 727 lineto
-288.488 716.701 lineto
+288.49 716.7 lineto
 closepath stroke
 grestore
 % 354785
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-209 627 29 13.6118 ellipse_path stroke
+209 627 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-195.5 624.525 moveto 27 (354785) alignedtext
+9 /Times-Roman set_font
+196 624.4 moveto 26 (354785) alignedtext
 grestore
 % odfpr1_0_3t_18->354785
 gsave
@@ -393,26 +393,26 @@ newpath 279 661 moveto
 272 658 254 649 238 641 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 239.56 637.863 moveto
+newpath 239.56 637.86 moveto
 229 637 lineto
-236.717 644.26 lineto
+236.72 644.26 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 239.56 637.863 moveto
+newpath 239.56 637.86 moveto
 229 637 lineto
-236.717 644.26 lineto
+236.72 644.26 lineto
 closepath stroke
 grestore
 % 354878
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-204 642 29 13.6118 ellipse_path stroke
+204 642 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-190.5 639.525 moveto 27 (354878) alignedtext
+9 /Times-Roman set_font
+191 639.4 moveto 26 (354878) alignedtext
 grestore
 % odfpr1_0_3t_18->354878
 gsave
@@ -422,26 +422,26 @@ newpath 279 662 moveto
 271 660 255 656 239 652 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 239.584 648.521 moveto
+newpath 239.58 648.52 moveto
 229 649 lineto
-237.573 655.226 lineto
+237.57 655.23 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 239.584 648.521 moveto
+newpath 239.58 648.52 moveto
 229 649 lineto
-237.573 655.226 lineto
+237.57 655.23 lineto
 closepath stroke
 grestore
 % 355080
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-219 612 29 13.6118 ellipse_path stroke
+219 612 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-205.5 609.525 moveto 27 (355080) alignedtext
+9 /Times-Roman set_font
+206.5 609.4 moveto 25 (355080) alignedtext
 grestore
 % odfpr1_0_3t_18->355080
 gsave
@@ -467,10 +467,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-219 590 29 13.6118 ellipse_path stroke
+219 590 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-205.5 587.525 moveto 27 (355288) alignedtext
+9 /Times-Roman set_font
+206.5 587.4 moveto 25 (355288) alignedtext
 grestore
 % odfpr1_0_3t_18->355288
 gsave
@@ -480,26 +480,26 @@ newpath 280 659 moveto
 272 650 252 628 237 611 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 239.219 608.221 moveto
+newpath 239.22 608.22 moveto
 230 603 lineto
-233.951 612.831 lineto
+233.95 612.83 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 239.219 608.221 moveto
+newpath 239.22 608.22 moveto
 230 603 lineto
-233.951 612.831 lineto
+233.95 612.83 lineto
 closepath stroke
 grestore
 % 355800
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-296 620 29 13.6118 ellipse_path stroke
+296 620 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-282.5 617.525 moveto 27 (355800) alignedtext
+9 /Times-Roman set_font
+283.5 617.4 moveto 25 (355800) alignedtext
 grestore
 % odfpr1_0_3t_18->355800
 gsave
@@ -509,26 +509,26 @@ newpath 284 659 moveto
 285 655 287 649 289 643 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 292.479 643.584 moveto
+newpath 292.48 643.58 moveto
 292 633 lineto
-285.774 641.573 lineto
+285.77 641.57 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 292.479 643.584 moveto
+newpath 292.48 643.58 moveto
 292 633 lineto
-285.774 641.573 lineto
+285.77 641.57 lineto
 closepath stroke
 grestore
 % 356116
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-353 668 29 13.6118 ellipse_path stroke
+353 668 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-339.5 665.525 moveto 27 (356116) alignedtext
+9 /Times-Roman set_font
+340 665.4 moveto 26 (356116) alignedtext
 grestore
 % odfpr1_0_3t_18->356116
 gsave
@@ -538,26 +538,26 @@ newpath 287 663 moveto
 292 663 303 664 314 665 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 313.701 668.488 moveto
+newpath 313.7 668.49 moveto
 324 666 lineto
-314.398 661.522 lineto
+314.4 661.52 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 313.701 668.488 moveto
+newpath 313.7 668.49 moveto
 324 666 lineto
-314.398 661.522 lineto
+314.4 661.52 lineto
 closepath stroke
 grestore
 % 356741
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-318 602 29 13.6118 ellipse_path stroke
+318 602 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-304.5 599.525 moveto 27 (356741) alignedtext
+9 /Times-Roman set_font
+305 599.4 moveto 26 (356741) alignedtext
 grestore
 % odfpr1_0_3t_18->356741
 gsave
@@ -567,26 +567,26 @@ newpath 285 659 moveto
 289 652 298 637 305 624 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 308.203 625.441 moveto
+newpath 308.2 625.44 moveto
 310 615 lineto
-302.084 622.042 lineto
+302.08 622.04 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 308.203 625.441 moveto
+newpath 308.2 625.44 moveto
 310 615 lineto
-302.084 622.042 lineto
+302.08 622.04 lineto
 closepath stroke
 grestore
 % 357340
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-350 686 29 13.6118 ellipse_path stroke
+350 686 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-336.5 683.525 moveto 27 (357340) alignedtext
+9 /Times-Roman set_font
+337 683.4 moveto 26 (357340) alignedtext
 grestore
 % odfpr1_0_3t_18->357340
 gsave
@@ -596,26 +596,26 @@ newpath 287 664 moveto
 293 666 305 671 317 675 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 316.416 678.479 moveto
+newpath 316.42 678.48 moveto
 327 678 lineto
-318.427 671.774 lineto
+318.43 671.77 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 316.416 678.479 moveto
+newpath 316.42 678.48 moveto
 327 678 lineto
-318.427 671.774 lineto
+318.43 671.77 lineto
 closepath stroke
 grestore
 % 357538
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-311 691 29 13.6118 ellipse_path stroke
+311 691 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-297.5 688.525 moveto 27 (357538) alignedtext
+9 /Times-Roman set_font
+298.5 688.4 moveto 25 (357538) alignedtext
 grestore
 % odfpr1_0_3t_18->357538
 gsave
@@ -625,26 +625,26 @@ newpath 286 666 moveto
 288 668 290 670 292 672 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 289.454 674.404 moveto
+newpath 289.45 674.4 moveto
 299 679 lineto
-294.404 669.454 lineto
+294.4 669.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 289.454 674.404 moveto
+newpath 289.45 674.4 moveto
 299 679 lineto
-294.404 669.454 lineto
+294.4 669.45 lineto
 closepath stroke
 grestore
 % 357769
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-324 710 29 13.6118 ellipse_path stroke
+324 710 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-310.5 707.525 moveto 27 (357769) alignedtext
+9 /Times-Roman set_font
+310.5 707.4 moveto 27 (357769) alignedtext
 grestore
 % odfpr1_0_3t_18->357769
 gsave
@@ -654,26 +654,26 @@ newpath 286 666 moveto
 290 671 298 681 306 689 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 303.781 691.779 moveto
+newpath 303.78 691.78 moveto
 313 697 lineto
-309.049 687.169 lineto
+309.05 687.17 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 303.781 691.779 moveto
+newpath 303.78 691.78 moveto
 313 697 lineto
-309.049 687.169 lineto
+309.05 687.17 lineto
 closepath stroke
 grestore
 % 357793
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-265 625 29 13.6118 ellipse_path stroke
+265 625 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-251.5 622.525 moveto 27 (357793) alignedtext
+9 /Times-Roman set_font
+252 622.4 moveto 26 (357793) alignedtext
 grestore
 % odfpr1_0_3t_18->357793
 gsave
@@ -683,26 +683,26 @@ newpath 281 659 moveto
 280 656 278 652 276 647 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 278.916 645.042 moveto
+newpath 278.92 645.04 moveto
 271 638 lineto
-272.797 648.441 lineto
+272.8 648.44 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 278.916 645.042 moveto
+newpath 278.92 645.04 moveto
 271 638 lineto
-272.797 648.441 lineto
+272.8 648.44 lineto
 closepath stroke
 grestore
 % 358155
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-355 704 29 13.6118 ellipse_path stroke
+355 704 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-341.5 701.525 moveto 27 (358155) alignedtext
+9 /Times-Roman set_font
+343 701.4 moveto 24 (358155) alignedtext
 grestore
 % odfpr1_0_3t_18->358155
 gsave
@@ -712,26 +712,26 @@ newpath 287 665 moveto
 294 670 312 680 327 688 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 325.559 691.203 moveto
+newpath 325.56 691.2 moveto
 336 693 lineto
-328.958 685.084 lineto
+328.96 685.08 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 325.559 691.203 moveto
+newpath 325.56 691.2 moveto
 336 693 lineto
-328.958 685.084 lineto
+328.96 685.08 lineto
 closepath stroke
 grestore
 % 358157
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-344 721 29 13.6118 ellipse_path stroke
+344 721 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-330.5 718.525 moveto 27 (358157) alignedtext
+9 /Times-Roman set_font
+331 718.4 moveto 26 (358157) alignedtext
 grestore
 % odfpr1_0_3t_18->358157
 gsave
@@ -741,26 +741,26 @@ newpath 286 666 moveto
 294 673 310 688 324 702 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 321.454 704.404 moveto
+newpath 321.45 704.4 moveto
 331 709 lineto
-326.404 699.454 lineto
+326.4 699.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 321.454 704.404 moveto
+newpath 321.45 704.4 moveto
 331 709 lineto
-326.404 699.454 lineto
+326.4 699.45 lineto
 closepath stroke
 grestore
 % 358159
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-317 582 29 13.6118 ellipse_path stroke
+317 582 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-303.5 579.525 moveto 27 (358159) alignedtext
+9 /Times-Roman set_font
+304.5 579.4 moveto 25 (358159) alignedtext
 grestore
 % odfpr1_0_3t_18->358159
 gsave
@@ -770,26 +770,26 @@ newpath 285 659 moveto
 289 649 300 624 307 605 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 310.536 605.585 moveto
+newpath 310.54 605.58 moveto
 311 595 lineto
-304.036 602.985 lineto
+304.04 602.98 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 310.536 605.585 moveto
+newpath 310.54 605.58 moveto
 311 595 lineto
-304.036 602.985 lineto
+304.04 602.98 lineto
 closepath stroke
 grestore
 % 358584
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-274 599 29 13.6118 ellipse_path stroke
+274 599 29 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-260.5 596.525 moveto 27 (358584) alignedtext
+9 /Times-Roman set_font
+261.5 596.4 moveto 25 (358584) alignedtext
 grestore
 % odfpr1_0_3t_18->358584
 gsave
@@ -799,26 +799,26 @@ newpath 282 658 moveto
 281 651 279 636 277 623 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 280.478 622.602 moveto
+newpath 280.48 622.6 moveto
 276 613 lineto
-273.512 623.299 lineto
+273.51 623.3 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 280.478 622.602 moveto
+newpath 280.48 622.6 moveto
 276 613 lineto
-273.512 623.299 lineto
+273.51 623.3 lineto
 closepath stroke
 grestore
 % 360104
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-281 696 30 13.6118 ellipse_path stroke
+281 696 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-267.5 693.525 moveto 27 (360104) alignedtext
+9 /Times-Roman set_font
+268 693.4 moveto 26 (360104) alignedtext
 grestore
 % odfpr1_0_3t_18->360104
 gsave
@@ -828,26 +828,26 @@ newpath 283 668 moveto
 283 669 283 671 283 672 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 279.512 671.701 moveto
+newpath 279.51 671.7 moveto
 282 682 lineto
-286.478 672.398 lineto
+286.48 672.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 279.512 671.701 moveto
+newpath 279.51 671.7 moveto
 282 682 lineto
-286.478 672.398 lineto
+286.48 672.4 lineto
 closepath stroke
 grestore
 % 360144
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-253 658 30 13.6118 ellipse_path stroke
+253 658 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-239.5 655.525 moveto 27 (360144) alignedtext
+9 /Times-Roman set_font
+240 655.4 moveto 26 (360144) alignedtext
 grestore
 % odfpr1_0_3t_18->360144
 gsave
@@ -873,10 +873,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-278 568 29 13.6118 ellipse_path stroke
+278 568 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-264.5 565.525 moveto 27 (360672) alignedtext
+9 /Times-Roman set_font
+264.5 565.4 moveto 27 (360672) alignedtext
 grestore
 % odfpr1_0_3t_18->360672
 gsave
@@ -902,10 +902,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-296 582 30 13.6118 ellipse_path stroke
+296 582 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-282.5 579.525 moveto 27 (360839) alignedtext
+9 /Times-Roman set_font
+283 579.4 moveto 26 (360839) alignedtext
 grestore
 % odfpr1_0_3t_18->360839
 gsave
@@ -915,26 +915,26 @@ newpath 284 658 moveto
 286 648 289 624 292 606 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 295.471 606.492 moveto
+newpath 295.47 606.49 moveto
 294 596 lineto
-288.607 605.119 lineto
+288.61 605.12 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 295.471 606.492 moveto
+newpath 295.47 606.49 moveto
 294 596 lineto
-288.607 605.119 lineto
+288.61 605.12 lineto
 closepath stroke
 grestore
 % 371187
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-328 656 30 13.6118 ellipse_path stroke
+328 656 30.96 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-314.5 653.525 moveto 27 (371187) alignedtext
+9 /Times-Roman set_font
+314 653.4 moveto 28 (371187) alignedtext
 grestore
 % odfpr1_0_3t_18->371187
 gsave
@@ -944,26 +944,26 @@ newpath 287 662 moveto
 288 662 288 662 289 662 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 289.881 665.393 moveto
+newpath 289.88 665.39 moveto
 299 660 lineto
-288.508 658.529 lineto
+288.51 658.53 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 289.881 665.393 moveto
+newpath 289.88 665.39 moveto
 299 660 lineto
-288.508 658.529 lineto
+288.51 658.53 lineto
 closepath stroke
 grestore
 % 373300
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-240 571 30 13.6118 ellipse_path stroke
+240 571 30 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-226.5 568.525 moveto 27 (373300) alignedtext
+9 /Times-Roman set_font
+227 568.4 moveto 26 (373300) alignedtext
 grestore
 % odfpr1_0_3t_18->373300
 gsave
@@ -973,26 +973,26 @@ newpath 281 659 moveto
 276 648 261 615 250 593 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 253.26 591.717 moveto
+newpath 253.26 591.72 moveto
 246 584 lineto
-246.863 594.56 lineto
+246.86 594.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 253.26 591.717 moveto
+newpath 253.26 591.72 moveto
 246 584 lineto
-246.863 594.56 lineto
+246.86 594.56 lineto
 closepath stroke
 grestore
 % 375134
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-215 683 29 13.6118 ellipse_path stroke
+215 683 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-201.5 680.525 moveto 27 (375134) alignedtext
+9 /Times-Roman set_font
+202 680.4 moveto 26 (375134) alignedtext
 grestore
 % odfpr1_0_3t_18->375134
 gsave
@@ -1002,26 +1002,26 @@ newpath 279 664 moveto
 273 666 261 669 249 673 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 247.573 669.774 moveto
+newpath 247.57 669.77 moveto
 239 676 lineto
-249.584 676.479 lineto
+249.58 676.48 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 247.573 669.774 moveto
+newpath 247.57 669.77 moveto
 239 676 lineto
-249.584 676.479 lineto
+249.58 676.48 lineto
 closepath stroke
 grestore
 % 375319
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-271 768 29 13.6118 ellipse_path stroke
+271 768 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-257.5 765.525 moveto 27 (375319) alignedtext
+9 /Times-Roman set_font
+258 765.4 moveto 26 (375319) alignedtext
 grestore
 % odfpr1_0_3t_18->375319
 gsave
@@ -1031,26 +1031,26 @@ newpath 282 668 moveto
 281 681 276 719 274 744 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 270.512 743.701 moveto
+newpath 270.51 743.7 moveto
 273 754 lineto
-277.478 744.398 lineto
+277.48 744.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 270.512 743.701 moveto
+newpath 270.51 743.7 moveto
 273 754 lineto
-277.478 744.398 lineto
+277.48 744.4 lineto
 closepath stroke
 grestore
 % 375499
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-333 629 29 13.6118 ellipse_path stroke
+333 629 29.06 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-319.5 626.525 moveto 27 (375499) alignedtext
+9 /Times-Roman set_font
+320 626.4 moveto 26 (375499) alignedtext
 grestore
 % odfpr1_0_3t_18->375499
 gsave
@@ -1076,10 +1076,10 @@ grestore
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-226 715 29 13.6118 ellipse_path stroke
+226 715 30.96 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-212.5 712.525 moveto 27 (377220) alignedtext
+9 /Times-Roman set_font
+212 712.4 moveto 28 (377220) alignedtext
 grestore
 % odfpr1_0_3t_18->377220
 gsave
@@ -1089,26 +1089,26 @@ newpath 280 666 moveto
 273 672 259 685 247 696 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 244.221 693.781 moveto
+newpath 244.22 693.78 moveto
 239 703 lineto
-248.831 699.049 lineto
+248.83 699.05 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 244.221 693.781 moveto
+newpath 244.22 693.78 moveto
 239 703 lineto
-248.831 699.049 lineto
+248.83 699.05 lineto
 closepath stroke
 grestore
 % 377562
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-190 684 29 13.6118 ellipse_path stroke
+190 684 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-176.5 681.525 moveto 27 (377562) alignedtext
+9 /Times-Roman set_font
+176.5 681.4 moveto 27 (377562) alignedtext
 grestore
 % odfpr1_0_3t_18->377562
 gsave
@@ -1118,26 +1118,26 @@ newpath 279 664 moveto
 270 666 247 671 226 676 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 225.119 672.607 moveto
+newpath 225.12 672.61 moveto
 216 678 lineto
-226.492 679.471 lineto
+226.49 679.47 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 225.119 672.607 moveto
+newpath 225.12 672.61 moveto
 216 678 lineto
-226.492 679.471 lineto
+226.49 679.47 lineto
 closepath stroke
 grestore
 % 378108
 gsave
 1 setlinewidth
 0.000 0.000 0.000 nodecolor
-247 727 30 13.6118 ellipse_path stroke
+247 727 29.76 13.5 ellipse_path stroke
 0.000 0.000 0.000 nodecolor
-9.00 /Times-Roman set_font
-233.5 724.525 moveto 27 (378108) alignedtext
+9 /Times-Roman set_font
+233.5 724.4 moveto 27 (378108) alignedtext
 grestore
 % odfpr1_0_3t_18->378108
 gsave
@@ -1147,16 +1147,16 @@ newpath 281 667 moveto
 277 674 267 691 259 705 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 255.797 703.559 moveto
+newpath 255.8 703.56 moveto
 254 714 lineto
-261.916 706.958 lineto
+261.92 706.96 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 255.797 703.559 moveto
+newpath 255.8 703.56 moveto
 254 714 lineto
-261.916 706.958 lineto
+261.92 706.96 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21
@@ -1173,16 +1173,16 @@ newpath 360 622 moveto
 361 621 363 619 365 617 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 367.404 619.546 moveto
+newpath 367.4 619.55 moveto
 372 610 lineto
-362.454 614.596 lineto
+362.45 614.6 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 367.404 619.546 moveto
+newpath 367.4 619.55 moveto
 372 610 lineto
-362.454 614.596 lineto
+362.45 614.6 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->355800
@@ -1193,16 +1193,16 @@ newpath 353 625 moveto
 349 625 342 625 335 624 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 335.299 620.512 moveto
+newpath 335.3 620.51 moveto
 325 623 lineto
-334.602 627.478 lineto
+334.6 627.48 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 335.299 620.512 moveto
+newpath 335.3 620.51 moveto
 325 623 lineto
-334.602 627.478 lineto
+334.6 627.48 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->356116
@@ -1233,16 +1233,16 @@ newpath 353 623 moveto
 351 622 348 620 345 618 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 346.441 614.797 moveto
+newpath 346.44 614.8 moveto
 336 613 lineto
-343.042 620.916 lineto
+343.04 620.92 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 346.441 614.797 moveto
+newpath 346.44 614.8 moveto
 336 613 lineto
-343.042 620.916 lineto
+343.04 620.92 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->357340
@@ -1253,16 +1253,16 @@ newpath 356 630 moveto
 355 637 354 650 353 662 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 349.512 661.701 moveto
+newpath 349.51 661.7 moveto
 352 672 lineto
-356.478 662.398 lineto
+356.48 662.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 349.512 661.701 moveto
+newpath 349.51 661.7 moveto
 352 672 lineto
-356.478 662.398 lineto
+356.48 662.4 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->357538
@@ -1293,16 +1293,16 @@ newpath 355 630 moveto
 351 640 341 667 333 688 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 329.863 686.44 moveto
+newpath 329.86 686.44 moveto
 329 697 lineto
-336.26 689.283 lineto
+336.26 689.28 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 329.863 686.44 moveto
+newpath 329.86 686.44 moveto
 329 697 lineto
-336.26 689.283 lineto
+336.26 689.28 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->357793
@@ -1353,16 +1353,16 @@ newpath 356 630 moveto
 355 642 351 675 347 697 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 343.512 696.701 moveto
+newpath 343.51 696.7 moveto
 346 707 lineto
-350.478 697.398 lineto
+350.48 697.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 343.512 696.701 moveto
+newpath 343.51 696.7 moveto
 346 707 lineto
-350.478 697.398 lineto
+350.48 697.4 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->358159
@@ -1373,16 +1373,16 @@ newpath 354 622 moveto
 350 618 342 610 336 603 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 338.219 600.221 moveto
+newpath 338.22 600.22 moveto
 329 595 lineto
-332.951 604.831 lineto
+332.95 604.83 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 338.219 600.221 moveto
+newpath 338.22 600.22 moveto
 329 595 lineto
-332.951 604.831 lineto
+332.95 604.83 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->358584
@@ -1393,16 +1393,16 @@ newpath 353 624 moveto
 345 621 325 615 308 610 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 308.584 606.521 moveto
+newpath 308.58 606.52 moveto
 298 607 lineto
-306.573 613.226 lineto
+306.57 613.23 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 308.584 606.521 moveto
+newpath 308.58 606.52 moveto
 298 607 lineto
-306.573 613.226 lineto
+306.57 613.23 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->360104
@@ -1413,16 +1413,16 @@ newpath 354 628 moveto
 345 637 320 660 301 677 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 298.596 674.454 moveto
+newpath 298.6 674.45 moveto
 294 684 lineto
-303.546 679.404 lineto
+303.55 679.4 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 298.596 674.454 moveto
+newpath 298.6 674.45 moveto
 294 684 lineto
-303.546 679.404 lineto
+303.55 679.4 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->360144
@@ -1433,16 +1433,16 @@ newpath 353 626 moveto
 342 630 312 639 288 647 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 286.573 643.774 moveto
+newpath 286.57 643.77 moveto
 278 650 lineto
-288.584 650.479 lineto
+288.58 650.48 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 286.573 643.774 moveto
+newpath 286.57 643.77 moveto
 278 650 lineto
-288.584 650.479 lineto
+288.58 650.48 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_21->360672
@@ -1499,16 +1499,16 @@ newpath 163 793 moveto
 173 789 198 776 218 766 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 219.958 768.916 moveto
+newpath 219.96 768.92 moveto
 227 761 lineto
-216.559 762.797 lineto
+216.56 762.8 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 219.958 768.916 moveto
+newpath 219.96 768.92 moveto
 227 761 lineto
-216.559 762.797 lineto
+216.56 762.8 lineto
 closepath stroke
 grestore
 % rcfpr1_1_1t_61
@@ -1525,16 +1525,16 @@ newpath 221 840 moveto
 224 828 234 797 240 775 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 243.479 775.584 moveto
+newpath 243.48 775.58 moveto
 243 765 lineto
-236.774 773.573 lineto
+236.77 773.57 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 243.479 775.584 moveto
+newpath 243.48 775.58 moveto
 243 765 lineto
-236.774 773.573 lineto
+236.77 773.57 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_20
@@ -1551,16 +1551,16 @@ newpath 287 824 moveto
 282 815 269 791 259 773 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 261.916 771.042 moveto
+newpath 261.92 771.04 moveto
 254 764 lineto
-255.797 774.441 lineto
+255.8 774.44 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 261.916 771.042 moveto
+newpath 261.92 771.04 moveto
 254 764 lineto
-255.797 774.441 lineto
+255.8 774.44 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_20->354757
@@ -1571,16 +1571,16 @@ newpath 291 824 moveto
 295 815 306 793 314 775 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 317.203 776.441 moveto
+newpath 317.2 776.44 moveto
 319 766 lineto
-311.084 773.042 lineto
+311.08 773.04 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 317.203 776.441 moveto
+newpath 317.2 776.44 moveto
 319 766 lineto
-311.084 773.042 lineto
+311.08 773.04 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_20->354766
@@ -1591,16 +1591,16 @@ newpath 290 823 moveto
 292 814 298 792 302 774 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 305.471 774.492 moveto
+newpath 305.47 774.49 moveto
 304 764 lineto
-298.607 773.119 lineto
+298.61 773.12 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 305.471 774.492 moveto
+newpath 305.47 774.49 moveto
 304 764 lineto
-298.607 773.119 lineto
+298.61 773.12 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_20->354771
@@ -1637,16 +1637,16 @@ newpath 141 597 moveto
 148 599 164 607 179 613 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 177.44 616.137 moveto
+newpath 177.44 616.14 moveto
 188 617 lineto
-180.283 609.74 lineto
+180.28 609.74 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 177.44 616.137 moveto
+newpath 177.44 616.14 moveto
 188 617 lineto
-180.283 609.74 lineto
+180.28 609.74 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_23->354878
@@ -1677,16 +1677,16 @@ newpath 141 596 moveto
 148 598 166 601 182 604 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 181.508 607.471 moveto
+newpath 181.51 607.47 moveto
 192 606 lineto
-182.881 600.607 lineto
+182.88 600.61 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 181.508 607.471 moveto
+newpath 181.51 607.47 moveto
 192 606 lineto
-182.881 600.607 lineto
+182.88 600.61 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_23->355288
@@ -1697,16 +1697,16 @@ newpath 141 595 moveto
 148 594 165 593 180 593 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 180.398 596.478 moveto
+newpath 180.4 596.48 moveto
 190 592 lineto
-179.701 589.512 lineto
+179.7 589.51 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 180.398 596.478 moveto
+newpath 180.4 596.48 moveto
 190 592 lineto
-179.701 589.512 lineto
+179.7 589.51 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_24
@@ -1723,16 +1723,16 @@ newpath 153 571 moveto
 160 578 176 594 189 607 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 186.454 609.404 moveto
+newpath 186.45 609.4 moveto
 196 614 lineto
-191.404 604.454 lineto
+191.4 604.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 186.454 609.404 moveto
+newpath 186.45 609.4 moveto
 196 614 lineto
-191.404 604.454 lineto
+191.4 604.45 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_24->354878
@@ -1763,16 +1763,16 @@ newpath 154 570 moveto
 162 575 178 586 193 596 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 191.559 599.203 moveto
+newpath 191.56 599.2 moveto
 202 601 lineto
-194.958 593.084 lineto
+194.96 593.08 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 191.559 599.203 moveto
+newpath 191.56 599.2 moveto
 202 601 lineto
-194.958 593.084 lineto
+194.96 593.08 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_24->355288
@@ -1783,16 +1783,16 @@ newpath 154 569 moveto
 160 571 173 575 185 579 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 184.416 582.479 moveto
+newpath 184.42 582.48 moveto
 195 582 lineto
-186.427 575.774 lineto
+186.43 575.77 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 184.416 582.479 moveto
+newpath 184.42 582.48 moveto
 195 582 lineto
-186.427 575.774 lineto
+186.43 575.77 lineto
 closepath stroke
 grestore
 % odfpr2_0_03t_13->355288
@@ -1803,16 +1803,16 @@ newpath 174 511 moveto
 180 521 196 549 206 568 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 203.084 569.958 moveto
+newpath 203.08 569.96 moveto
 211 577 lineto
-209.203 566.559 lineto
+209.2 566.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 203.084 569.958 moveto
+newpath 203.08 569.96 moveto
 211 577 lineto
-209.203 566.559 lineto
+209.2 566.56 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_5->360672
@@ -1823,16 +1823,16 @@ newpath 229 490 moveto
 236 499 253 527 265 546 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 262.084 547.958 moveto
+newpath 262.08 547.96 moveto
 270 555 lineto
-268.203 544.559 lineto
+268.2 544.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 262.084 547.958 moveto
+newpath 262.08 547.96 moveto
 270 555 lineto
-268.203 544.559 lineto
+268.2 544.56 lineto
 closepath stroke
 grestore
 % tlfpr1_0_3g_5->373300
@@ -1843,16 +1843,16 @@ newpath 199 493 moveto
 204 502 218 529 228 549 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 225.084 550.958 moveto
+newpath 225.08 550.96 moveto
 233 558 lineto
-231.203 547.559 lineto
+231.2 547.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 225.084 550.958 moveto
+newpath 225.08 550.96 moveto
 233 558 lineto
-231.203 547.559 lineto
+231.2 547.56 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_12->373300
@@ -1863,16 +1863,16 @@ newpath 158 528 moveto
 167 533 191 546 211 556 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 209.559 559.203 moveto
+newpath 209.56 559.2 moveto
 220 561 lineto
-212.958 553.084 lineto
+212.96 553.08 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 209.559 559.203 moveto
+newpath 209.56 559.2 moveto
 220 561 lineto
-212.958 553.084 lineto
+212.96 553.08 lineto
 closepath stroke
 grestore
 % odfpr1_0_5t_18->375134
@@ -1883,16 +1883,16 @@ newpath 123 705 moveto
 133 703 158 697 179 692 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 180.427 695.226 moveto
+newpath 180.43 695.23 moveto
 189 689 lineto
-178.416 688.521 lineto
+178.42 688.52 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 180.427 695.226 moveto
+newpath 180.43 695.23 moveto
 189 689 lineto
-178.416 688.521 lineto
+178.42 688.52 lineto
 closepath stroke
 grestore
 % rcfpr0_0_1t_10
@@ -1909,16 +1909,16 @@ newpath 303 853 moveto
 300 842 288 812 280 790 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 283.26 788.717 moveto
+newpath 283.26 788.72 moveto
 276 781 lineto
-276.863 791.56 lineto
+276.86 791.56 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 283.26 788.717 moveto
+newpath 283.26 788.72 moveto
 276 781 lineto
-276.863 791.56 lineto
+276.86 791.56 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_36
@@ -1935,16 +1935,16 @@ newpath 173 775 moveto
 183 774 210 773 232 771 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 232.398 774.478 moveto
+newpath 232.4 774.48 moveto
 242 770 lineto
-231.701 767.512 lineto
+231.7 767.51 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 232.398 774.478 moveto
+newpath 232.4 774.48 moveto
 242 770 lineto
-231.701 767.512 lineto
+231.7 767.51 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_36->377562
@@ -1955,16 +1955,16 @@ newpath 170 771 moveto
 173 759 180 729 185 708 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 188.471 708.492 moveto
+newpath 188.47 708.49 moveto
 187 698 lineto
-181.607 707.119 lineto
+181.61 707.12 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 188.471 708.492 moveto
+newpath 188.47 708.49 moveto
 187 698 lineto
-181.607 707.119 lineto
+181.61 707.12 lineto
 closepath stroke
 grestore
 % odfpr1_0_5t_17
@@ -2007,16 +2007,16 @@ newpath 240 848 moveto
 244 838 254 811 262 790 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 265.137 791.56 moveto
+newpath 265.14 791.56 moveto
 266 781 lineto
-258.74 788.717 lineto
+258.74 788.72 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 265.137 791.56 moveto
+newpath 265.14 791.56 moveto
 266 781 lineto
-258.74 788.717 lineto
+258.74 788.72 lineto
 closepath stroke
 grestore
 % odfpr1_0_5t_21
@@ -2033,16 +2033,16 @@ newpath 176 802 moveto
 182 792 201 759 213 737 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 216.203 738.441 moveto
+newpath 216.2 738.44 moveto
 218 728 lineto
-210.084 735.042 lineto
+210.08 735.04 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 216.203 738.441 moveto
+newpath 216.2 738.44 moveto
 218 728 lineto
-210.084 735.042 lineto
+210.08 735.04 lineto
 closepath stroke
 grestore
 % tlfpr1_0_3g_7->377562
@@ -2053,16 +2053,16 @@ newpath 113 679 moveto
 120 680 136 681 151 681 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 150.701 684.488 moveto
+newpath 150.7 684.49 moveto
 161 682 lineto
-151.398 677.522 lineto
+151.4 677.52 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 150.701 684.488 moveto
+newpath 150.7 684.49 moveto
 161 682 lineto
-151.398 677.522 lineto
+151.4 677.52 lineto
 closepath stroke
 grestore
 % tlfpr1_1_1t_3
@@ -2099,16 +2099,16 @@ newpath 111 635 moveto
 120 641 144 656 163 668 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 161.559 671.203 moveto
+newpath 161.56 671.2 moveto
 172 673 lineto
-164.958 665.084 lineto
+164.96 665.08 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 161.559 671.203 moveto
+newpath 161.56 671.2 moveto
 172 673 lineto
-164.958 665.084 lineto
+164.96 665.08 lineto
 closepath stroke
 grestore
 % odfpr1_0_3t_6
@@ -2125,16 +2125,16 @@ newpath 204 821 moveto
 210 809 226 773 237 749 curveto
 stroke
 0.000 0.000 0.000 edgecolor
-newpath 240.137 750.56 moveto
+newpath 240.14 750.56 moveto
 241 740 lineto
-233.74 747.717 lineto
+233.74 747.72 lineto
 closepath fill
 1 setlinewidth
 solid
 0.000 0.000 0.000 edgecolor
-newpath 240.137 750.56 moveto
+newpath 240.14 750.56 moveto
 241 740 lineto
-233.74 747.717 lineto
+233.74 747.72 lineto
 closepath stroke
 grestore
 endpage