Update regression test files

diff --git a/rtest/share/mike.dot b/rtest/share/mike.dot
index db8d8b87d6596f8d93666feab120aea6ca704161..9dca0c45493f327c8fdaa4fedf0b100aaffa2e63 100644 (file)
--- a/rtest/share/mike.dot
+++ b/rtest/share/mike.dot
@@ -46,7 +46,7 @@ digraph mike {
        l -> C [pos="e,251,108 261,144 259,136 256,127 254,118"];
        c -> C [pos="e,235,106 205,146 212,137 221,125 229,114"];
        W -> X [pos="e,61,396 52,432 54,424 56,415 58,406"];
-       W -> D [pos="e,131,26 40,433 29,406 10,353 10,306 10,306 10,306 10,162 10,121 4,103 29,72 36,63 89,42 122,29"];
+       W -> D [pos="e,132,27 40,433 29,406 10,353 10,306 10,306 10,306 10,162 10,121 4,103 29,72 35,64 87,44 122,31"];
        V -> W [pos="e,50,468 55,504 54,496 53,487 52,478"];
        T -> U [pos="e,320,391 249,437 266,426 292,409 312,397"];
        Q -> T [pos="e,218,466 187,506 194,497 204,485 212,474"];

diff --git a/rtest/share/newarrows.dot b/rtest/share/newarrows.dot
index a6bc3c41e5ccb1292ec0ec1fc8e93aa24d3de240..a1caa449f22e4b810dd69e49c1cab95d2746bb60 100644 (file)
--- a/rtest/share/newarrows.dot
+++ b/rtest/share/newarrows.dot
@@ -26,23 +26,23 @@ digraph G {
                o [width="0.50", pos="774,306", height="0.50"];
                p [width="0.50", pos="828,306", height="0.50"];
                q [width="0.50", pos="882,306", height="0.50"];
-               a -> Z [arrowtail=none, taillabel=none, pos="32,295 36,292 41,290 45,288 214,212 446,180 450,180", tail_lp="47,269"];
-               b -> Z [arrowtail=normal, taillabel=normal, pos="s,86,295 95,290 96,289 98,289 99,288 245,218 444,181 450,180", tail_lp="104,271"];
-               c -> Z [arrowtail=inv, taillabel=inv, pos="s,141,295 150,290 151,289 152,289 153,288 277,225 445,181 450,180", tail_lp="159,271"];
-               d -> Z [arrowtail=dot, taillabel=dot, pos="s,195,295 202,291 204,290 205,289 207,288 309,232 446,182 450,180", tail_lp="212,271"];
-               e -> Z [arrowtail=odot, taillabel=odot, pos="s,249,296 256,291 257,290 259,289 261,288 343,238 447,182 450,180", tail_lp="264,270"];
-               f -> Z [arrowtail=invdot, taillabel=invdot, pos="s,302,295 316,284 362,248 447,183 450,180", tail_lp="316,268"];
-               g -> Z [arrowtail=invodot, taillabel=invodot, pos="s,354,292 366,278 397,242 448,182 450,180", tail_lp="362,263"];
-               h -> Z [arrowtail=open, taillabel=open, pos="s,403,289 407,280 423,244 449,182 450,180", tail_lp="402,259"];
-               i -> Z [arrowtail=halfopen, taillabel=halfopen, arrowhead=inv, headlabel=samehead, pos="s,450,288 e,450,180 450,278 450,251 450,209 450,190", head_lp="463,207", tail_lp="437,261"];
-               j -> Z [arrowtail=empty, taillabel=empty, pos="s,497,289 493,280 477,244 451,182 450,180", tail_lp="474,269"];
-               k -> Z [arrowtail=invempty, taillabel=invempty, pos="s,546,292 539,284 509,249 452,182 450,180", tail_lp="519,280"];
-               l -> Z [arrowtail=diamond, taillabel=diamond, pos="s,598,295 589,288 544,253 453,183 450,180", tail_lp="569,288"];
-               m -> Z [arrowtail=odiamond, taillabel=odiamond, pos="s,651,296 641,289 640,289 640,288 639,288 557,238 453,182 450,180", tail_lp="621,291"];
-               n -> Z [arrowtail=box, taillabel=box, pos="s,705,295 696,290 695,289 694,289 693,288 591,232 454,182 450,180", tail_lp="675,293"];
-               o -> Z [arrowtail=obox, taillabel=obox, pos="s,759,295 750,290 749,289 748,289 747,288 623,225 455,181 450,180", tail_lp="729,293"];
-               p -> Z [arrowtail=tee, taillabel=tee, pos="s,814,295 809,292 806,291 804,289 801,288 655,218 456,181 450,180", tail_lp="784,292"];
-               q -> Z [arrowtail=crow, taillabel=crow, pos="s,868,295 859,290 858,289 856,289 855,288 686,212 454,180 450,180", tail_lp="838,293"];
+               a -> Z [arrowtail=none, taillabel=none, pos="32,295 36,292 41,290 45,288 215,211 450,180 450,180", tail_lp="47,269"];
+               b -> Z [arrowtail=normal, taillabel=normal, pos="s,86,295 95,290 96,289 98,289 99,288 247,217 450,180 450,180", tail_lp="104,271"];
+               c -> Z [arrowtail=inv, taillabel=inv, pos="s,141,295 150,290 151,289 152,289 153,288 279,224 450,180 450,180", tail_lp="159,271"];
+               d -> Z [arrowtail=dot, taillabel=dot, pos="s,195,295 202,291 204,290 205,289 207,288 311,231 450,180 450,180", tail_lp="212,271"];
+               e -> Z [arrowtail=odot, taillabel=odot, pos="s,249,296 256,291 257,290 259,289 261,288 344,237 450,180 450,180", tail_lp="264,270"];
+               f -> Z [arrowtail=invdot, taillabel=invdot, pos="s,302,295 316,284 363,248 450,180 450,180", tail_lp="316,268"];
+               g -> Z [arrowtail=invodot, taillabel=invodot, pos="s,354,292 366,278 397,241 450,180 450,180", tail_lp="362,263"];
+               h -> Z [arrowtail=open, taillabel=open, pos="s,403,289 407,279 423,243 450,180 450,180", tail_lp="401,259"];
+               i -> Z [arrowtail=halfopen, taillabel=halfopen, arrowhead=inv, headlabel=samehead, pos="s,450,288 e,450,180 450,278 450,250 450,209 450,190", head_lp="463,207", tail_lp="437,261"];
+               j -> Z [arrowtail=empty, taillabel=empty, pos="s,497,289 493,279 477,243 450,180 450,180", tail_lp="475,268"];
+               k -> Z [arrowtail=invempty, taillabel=invempty, pos="s,546,292 539,284 508,248 450,180 450,180", tail_lp="519,280"];
+               l -> Z [arrowtail=diamond, taillabel=diamond, pos="s,598,295 588,288 543,252 450,180 450,180", tail_lp="568,290"];
+               m -> Z [arrowtail=odiamond, taillabel=odiamond, pos="s,651,296 641,289 640,289 640,288 639,288 556,237 450,180 450,180", tail_lp="621,291"];
+               n -> Z [arrowtail=box, taillabel=box, pos="s,705,295 696,290 695,289 694,289 693,288 589,231 450,180 450,180", tail_lp="675,293"];
+               o -> Z [arrowtail=obox, taillabel=obox, pos="s,759,295 750,290 749,289 748,289 747,288 621,224 450,180 450,180", tail_lp="729,293"];
+               p -> Z [arrowtail=tee, taillabel=tee, pos="s,814,295 809,292 806,291 804,289 801,288 653,217 450,180 450,180", tail_lp="784,292"];
+               q -> Z [arrowtail=crow, taillabel=crow, pos="s,868,295 859,290 858,289 856,289 855,288 685,211 450,180 450,180", tail_lp="838,293"];
        }
        {
                graph [bb=""];
@@ -66,22 +66,22 @@ digraph G {
                O [width="0.50", pos="774,18", height="0.50"];
                P [width="0.50", pos="828,18", height="0.50"];
                Q [width="0.50", pos="882,18", height="0.50"];
-               Z -> A [arrowhead=none, headlabel=none, pos="450,144 446,143 214,111 45,36 41,34 36,31 32,29", head_lp="62,30"];
-               Z -> B [arrowhead=normal, headlabel=normal, pos="e,87,29 450,144 444,143 245,105 99,36 98,35 97,35 96,34", head_lp="117,31"];
-               Z -> C [arrowhead=inv, headlabel=inv, pos="e,141,28 450,144 445,143 277,98 153,36 152,35 150,35 149,34", head_lp="170,34"];
-               Z -> D [arrowhead=dot, headlabel=dot, pos="e,195,28 450,144 446,142 309,91 207,36 205,35 203,34 202,33", head_lp="224,33"];
-               Z -> E [arrowhead=odot, headlabel=odot, pos="e,249,28 450,144 447,142 343,85 261,36 259,35 257,34 256,32", head_lp="279,30"];
-               Z -> F [arrowhead=invdot, headlabel=invdot, pos="e,302,29 450,144 446,141 362,75 316,40", head_lp="331,36"];
-               Z -> G [arrowhead=invodot, headlabel=invodot, pos="e,354,32 450,144 448,141 397,82 366,46", head_lp="381,44"];
-               Z -> H [arrowhead=open, headlabel=open, pos="e,403,35 450,144 448,141 422,80 407,44", head_lp="426,55"];
+               Z -> A [arrowhead=none, headlabel=none, pos="450,144 450,144 215,112 45,36 41,34 36,31 32,29", head_lp="62,30"];
+               Z -> B [arrowhead=normal, headlabel=normal, pos="e,87,29 450,144 450,144 247,106 99,36 98,35 97,35 96,34", head_lp="117,31"];
+               Z -> C [arrowhead=inv, headlabel=inv, pos="e,141,28 450,144 450,144 279,99 153,36 152,35 150,35 149,34", head_lp="170,34"];
+               Z -> D [arrowhead=dot, headlabel=dot, pos="e,195,28 450,144 450,144 311,92 207,36 205,35 203,34 202,33", head_lp="224,33"];
+               Z -> E [arrowhead=odot, headlabel=odot, pos="e,249,28 450,144 450,144 344,86 261,36 259,35 257,34 256,32", head_lp="279,30"];
+               Z -> F [arrowhead=invdot, headlabel=invdot, pos="e,302,29 450,144 450,144 363,76 316,40", head_lp="331,36"];
+               Z -> G [arrowhead=invodot, headlabel=invodot, pos="e,354,32 450,144 450,144 397,83 366,46", head_lp="381,44"];
+               Z -> H [arrowhead=open, headlabel=open, pos="e,403,35 450,144 450,144 423,81 407,45", head_lp="425,56"];
                Z -> I [arrowtail=inv, taillabel=sametail, arrowhead=halfopen, headlabel=halfopen, pos="s,450,144 e,450,36 450,134 450,115 450,74 450,46", head_lp="463,63", tail_lp="437,117"];
-               Z -> J [arrowhead=empty, headlabel=empty, pos="e,497,35 450,144 452,141 478,80 493,44", head_lp="498,65"];
-               Z -> K [arrowhead=invempty, headlabel=invempty, pos="e,546,32 450,144 452,141 509,75 539,40", head_lp="538,61"];
-               Z -> L [arrowhead=diamond, headlabel=diamond, pos="e,598,29 450,144 454,141 544,71 588,36", head_lp="583,55"];
-               Z -> M [arrowhead=odiamond, headlabel=odiamond, pos="e,651,28 450,144 453,142 557,85 639,36 640,36 640,35 641,35", head_lp="636,54"];
-               Z -> N [arrowhead=box, headlabel=box, pos="e,705,28 450,144 454,142 591,91 693,36 694,35 696,35 697,34", head_lp="691,54"];
-               Z -> O [arrowhead=obox, headlabel=obox, pos="e,759,28 450,144 455,143 623,98 747,36 748,35 750,35 751,34", head_lp="745,54"];
-               Z -> P [arrowhead=tee, headlabel=tee, pos="e,813,29 450,144 456,143 655,105 801,36 804,35 806,33 809,32", head_lp="799,55"];
-               Z -> Q [arrowhead=crow, headlabel=crow, pos="e,868,29 450,144 454,143 686,111 855,36 856,35 858,35 859,34", head_lp="850,53"];
+               Z -> J [arrowhead=empty, headlabel=empty, pos="e,497,35 450,144 450,144 477,81 493,45", head_lp="499,65"];
+               Z -> K [arrowhead=invempty, headlabel=invempty, pos="e,546,32 450,144 450,144 508,76 539,40", head_lp="538,61"];
+               Z -> L [arrowhead=diamond, headlabel=diamond, pos="e,598,29 450,144 450,144 543,72 588,36", head_lp="583,55"];
+               Z -> M [arrowhead=odiamond, headlabel=odiamond, pos="e,651,28 450,144 450,144 556,86 639,36 640,36 640,35 641,35", head_lp="636,54"];
+               Z -> N [arrowhead=box, headlabel=box, pos="e,705,28 450,144 450,144 589,92 693,36 694,35 696,35 697,34", head_lp="691,54"];
+               Z -> O [arrowhead=obox, headlabel=obox, pos="e,759,28 450,144 450,144 621,99 747,36 748,35 750,35 751,34", head_lp="745,54"];
+               Z -> P [arrowhead=tee, headlabel=tee, pos="e,813,29 450,144 450,144 653,106 801,36 804,35 806,33 809,32", head_lp="799,55"];
+               Z -> Q [arrowhead=crow, headlabel=crow, pos="e,868,29 450,144 450,144 685,112 855,36 856,35 858,35 859,34", head_lp="850,53"];
        }
 }

diff --git a/rtest/share/ngk10_4.dot b/rtest/share/ngk10_4.dot
index 5c50c431d95c5d90bed2b68deddd5c39ee3b23f9..fd3299d4ea67a5d2785ad7f8a9ac360cdfc7823f 100644 (file)
--- a/rtest/share/ngk10_4.dot
+++ b/rtest/share/ngk10_4.dot
@@ -60,20 +60,20 @@ graph G {
        10 -- 19 [f=5, pos="382,648 382,637 382,623 382,612"];
        10 -- 33 [f=1, pos="361,655 356,653 351,650 346,648 315,632 279,615 256,604"];
        12 -- 8 [f=1, pos="316,1660 333,1648 358,1628 375,1616"];
-       12 -- 36 [f=5, pos="325,1674 443,1671 903,1660 1041,1620 1121,1596 1206,1613 1206,1530 1206,1530 1206,1530 1206,738 1206,569 1155,512 1228,360 1238,\
-337 1247,328 1263,318"];
-       12 -- 17 [f=16, pos="275,1664 216,1626 180,1604 179,1530 179,1530 179,1530 179,810 180,726 230,719 274,648 328,559 399,554 399,450 399,450 399,450 39\
+       12 -- 36 [f=5, pos="325,1674 443,1671 903,1660 1041,1620 1121,1596 1206,1613 1206,1530 1206,1530 1206,1530 1206,738 1206,569 1153,511 1228,360 1236,\
+343 1252,328 1265,319"];
+       12 -- 17 [f=16, pos="278,1662 244,1640 180,1591 179,1530 179,1530 179,1530 179,810 180,726 230,719 274,648 328,559 399,554 399,450 399,450 399,450 39\
 9,378 399,332 391,279 386,252"];
        13 -- 38 [f=1, pos="1047,1668 1022,1661 986,1647 969,1620 938,1572 978,1368 978,1314 978,1314 978,1314 978,954 978,908 970,855 965,828"];
        13 -- 24 [f=19, pos="1079,1692 1080,1703 1080,1717 1079,1728"];
        24 -- 49 [f=1, pos="1099,1741 1145,1733 1236,1714 1258,1692 1286,1662 1282,1643 1282,1602 1282,1602 1282,1602 1282,882 1282,680 1156,457 1118,395"];
        24 -- 13 [f=1, pos="1067,1728 1066,1717 1066,1703 1067,1692"];
-       24 -- 47 [f=12, pos="1098,1738 1145,1721 1244,1677 1244,1602 1244,1602 1244,1602 1244,882 1244,745 1241,711 1231,576 1224,487 1209,466 1209,378 1209,\
+       24 -- 47 [f=12, pos="1098,1738 1145,1721 1244,1677 1244,1602 1244,1602 1244,1602 1244,882 1244,745 1240,711 1230,576 1223,487 1209,466 1209,378 1209,\
 378 1209,378 1209,234 1209,158 1111,114 1064,98"];
        24 -- 12 [f=19, pos="1046,1743 926,1733 444,1688 325,1677"];
        25 -- 27 [f=1, pos="501,577 507,566 515,551 521,539"];
        25 -- 12 [f=1, pos="485,612 451,701 298,1108 298,1242 298,1530 298,1530 298,1530 298,1575 298,1628 298,1656"];
-       27 -- 12 [f=1, pos="506,531 483,542 474,550 456,576 426,617 451,645 418,684 395,709 370,692 350,720 227,882 251,965 251,1170 251,1530 251,1530 251,1\
+       27 -- 12 [f=1, pos="508,533 492,542 470,557 456,576 425,616 451,645 418,684 395,709 370,692 350,720 227,882 251,965 251,1170 251,1530 251,1530 251,1\
 530 251,1578 275,1630 288,1657"];
        27 -- 14 [f=8, pos="546,537 607,596 828,809 888,867"];
        29 -- 10 [f=1, pos="512,728 483,714 433,690 404,677"];
@@ -83,7 +83,7 @@ graph G {
        38 -- 29 [f=1, pos="935,806 859,793 637,755 560,742"];
        38 -- 35 [f=15, pos="982,799 998,789 1018,775 1030,756 1073,685 1076,582 1076,540"];
        2 -- 42 [f=2, pos="1045,1452 989,1438 853,1406 797,1392"];
-       2 -- 35 [f=3, pos="1075,1440 1082,1412 1092,1359 1092,1314 1092,1314 1092,1314 1092,666 1092,625 1086,615 1082,576 1080,559 1081,551 1079,540"];
+       2 -- 35 [f=3, pos="1075,1440 1082,1412 1092,1359 1092,1314 1092,1314 1092,1314 1092,666 1092,620 1084,567 1079,540"];
        2 -- 11 [f=19, pos="1067,1440 1062,1412 1054,1359 1054,1314 1054,1314 1054,1314 1054,882 1054,840 1043,831 1030,792 1010,734 978,726 978,666 978,666\
  978,666 978,378 978,326 939,274 917,249"];
        14 -- 18 [f=2, pos="906,864 908,845 913,815 925,792 934,773 941,772 954,756 983,717 1016,714 1016,666 1016,666 1016,666 1016,594 1016,548 1027,495 1\
@@ -99,9 +99,9 @@ graph G {
        31 -- 25 [f=14, pos="699,1008 680,961 626,826 570,720 548,679 519,634 503,611"];
        37 -- 26 [f=2, pos="697,1224 698,1213 699,1199 699,1188"];
        37 -- 16 [f=14, pos="683,1258 676,1269 666,1283 659,1296 617,1371 589,1472 578,1512"];
-       39 -- 50 [f=2, pos="820,936 818,924 818,917 816,900 798,796 779,771 779,666 779,666 779,666 779,594 779,381 604,165 553,106"];
+       39 -- 50 [f=2, pos="821,936 809,891 779,769 779,666 779,666 779,666 779,594 779,381 604,165 553,106"];
        39 -- 14 [f=2, pos="842,939 856,927 875,909 888,897"];
-       39 -- 18 [f=17, pos="834,936 860,878 940,695 940,666 940,666 940,666 940,594 940,524 969,503 1020,463"];
+       39 -- 18 [f=17, pos="834,936 860,878 940,695 940,666 940,666 940,666 940,594 940,537 992,487 1021,464"];
        39 -- 47 [f=10, pos="825,936 819,835 795,345 866,216 899,154 976,115 1016,99"];
        41 -- 31 [f=2, pos="702,1080 703,1069 704,1055 705,1044"];
        41 -- 8 [f=16, pos="689,1115 682,1125 673,1139 665,1152 554,1325 532,1372 426,1548 418,1560 410,1574 403,1585"];
@@ -116,10 +116,9 @@ graph G {
        6 -- 28 [f=10, pos="331,443 384,430 507,398 560,385"];
        9 -- 6 [f=2, pos="306,504 306,493 306,479 306,468"];
        9 -- 16 [f=1, pos="298,539 286,569 264,631 274,684 304,844 493,1211 540,1368 555,1419 566,1481 571,1512"];
-       15 -- 16 [f=2, pos="194,324 189,372 177,504 198,612 201,624 513,1396 564,1513"];
+       15 -- 16 [f=2, pos="194,324 189,372 177,504 198,612 218,711 515,1395 566,1513"];
        15 -- 48 [f=2, pos="207,289 215,278 225,262 232,251"];
-       16 -- 50 [f=2, pos="553,1519 541,1507 540,1495 529,1476 384,1247 218,1224 217,954 217,954 217,954 217,810 218,596 0,566 51,360 102,156 417,104 512,9\
-3"];
+       16 -- 50 [f=2, pos="561,1514 497,1435 218,1087 217,954 217,954 217,954 217,810 218,596 0,566 51,360 102,156 417,104 512,93"];
        16 -- 32 [f=14, pos="597,1520 629,1507 689,1482 721,1468"];
        16 -- 39 [f=8, pos="601,1529 673,1525 864,1502 864,1386 864,1386 864,1386 864,1098 864,1051 845,998 834,972"];
        20 -- 33 [f=2, pos="294,651 281,639 263,621 250,609"];
@@ -132,18 +131,17 @@ graph G {
        4 -- 12 [f=16, pos="127,1737 164,1723 237,1697 274,1683"];
        17 -- 21 [f=4, pos="394,218 403,206 416,190 425,178"];
        19 -- 35 [f=4, pos="407,587 421,583 439,578 456,576 683,539 961,526 1048,523"];
-       19 -- 15 [f=9, pos="384,576 389,533 393,425 342,360 312,324 256,312 223,308"];
+       19 -- 15 [f=9, pos="384,576 389,533 395,424 342,360 312,324 256,312 223,308"];
        19 -- 43 [f=4, pos="402,582 417,572 437,557 451,540 507,469 542,365 555,324"];
-       21 -- 19 [f=4, pos="437,180 437,208 437,261 437,306 437,450 437,450 437,450 437,491 428,501 413,540 406,558 401,566 394,578"];
+       21 -- 19 [f=4, pos="437,180 437,208 437,261 437,306 437,450 437,450 437,450 437,499 409,551 393,577"];
        21 -- 50 [f=4, pos="456,149 474,136 502,116 520,103"];
        23 -- 36 [f=4, pos="1269,360 1272,349 1276,335 1279,324"];
        34 -- 23 [f=4, pos="1264,432 1264,421 1264,407 1264,396"];
        34 -- 24 [f=11, pos="1272,467 1287,503 1320,589 1320,666 1320,1602 1320,1602 1320,1602 1320,1643 1325,1663 1296,1692 1268,1719 1153,1736 1100,1743"];
        35 -- 34 [f=4, pos="1099,513 1135,499 1204,473 1240,459"];
-       35 -- 16 [f=6, pos="1088,538 1093,549 1092,559 1098,576 1112,615 1130,623 1130,666 1130,1386 1130,1386 1130,1386 1130,1427 1138,1448 1107,1476 1070,\
-1507 720,1518 672,1524 654,1525 649,1526 632,1528 622,1528 611,1529 601,1529"];
+       35 -- 16 [f=6, pos="1086,539 1102,565 1130,617 1130,666 1130,1386 1130,1386 1130,1386 1130,1427 1138,1449 1107,1476 1068,1509 704,1525 601,1529"];
        35 -- 18 [f=16, pos="1066,505 1061,493 1053,479 1048,467"];
-       36 -- 46 [f=4, pos="1291,289 1302,258 1321,193 1300,144 1281,101 1265,93 1224,72 1119,17 1080,36 965,20"];
+       36 -- 46 [f=4, pos="1291,289 1302,258 1321,193 1300,144 1281,101 1265,93 1224,72 1178,48 1027,28 965,21"];
        5 -- 7 [f=1, pos="1004,1584 1003,1573 1002,1559 1001,1548"];
        5 -- 36 [f=6, pos="1029,1594 1074,1576 1168,1531 1168,1458 1168,1458 1168,1458 1168,738 1168,604 1269,598 1300,468 1310,421 1306,407 1300,360 1298,\
 348 1294,334 1291,324"];
@@ -155,10 +153,10 @@ graph G {
        11 -- 50 [f=1, pos="879,225 814,199 628,125 563,99"];
        22 -- 46 [f=1, pos="1163,83 1115,69 1011,39 963,25"];
        28 -- 43 [f=1, pos="579,360 575,349 570,335 566,324"];
-       28 -- 8 [f=18, pos="588,396 590,406 593,420 594,432 597,480 595,493 582,540 545,663 479,681 479,810 479,1026 479,1026 479,1026 479,1162 374,1177 374\
+       28 -- 8 [f=18, pos="588,396 590,406 593,420 594,432 597,480 596,493 583,540 546,663 479,681 479,810 479,1026 479,1026 479,1026 479,1162 374,1177 374\
 ,1314 374,1458 374,1458 374,1458 374,1503 383,1556 389,1584"];
-       32 -- 28 [f=1, pos="725,1445 684,1411 675,1388 659,1332 575,1047 703,962 703,666 703,666 703,666 703,522 703,461 639,412 605,390"];
-       32 -- 39 [f=13, pos="766,1447 784,1436 793,1427 807,1404 827,1368 826,1354 826,1314 826,1314 826,1314 826,1098 826,1053 826,1000 826,972"];
+       32 -- 28 [f=1, pos="729,1443 709,1421 672,1377 659,1332 572,1048 703,962 703,666 703,666 703,666 703,522 703,461 639,412 605,390"];
+       32 -- 39 [f=13, pos="764,1446 778,1436 796,1421 807,1404 827,1368 826,1354 826,1314 826,1314 826,1314 826,1098 826,1053 826,1000 826,972"];
        32 -- 42 [f=15, pos="751,1440 755,1429 760,1415 765,1404"];
        40 -- 22 [f=1, pos="1248,147 1235,135 1217,117 1204,105"];
        40 -- 47 [f=1, pos="1242,151 1236,149 1229,146 1223,144 1167,123 1100,105 1064,96"];