merge with candidate package

Combinatorial_map/doc_tex/Combinatorial_map/Combinatorial_map.tex

@@ -29,7 +29,7 @@ are \emph{adjacent} if there is an $(i-1)$-cell incident to both $c$
 and $c'$.  You can see an example of a 2D object and a 3D object in
 Figure~\ref{fig-exemple-3Dmanifold} showing some cells of the
 subdivision and some adjacency and incidence relations.
-\begin{figure}[h]
+\begin{figure}[ht]
   \begin{ccTexOnly}
     \begin{center}
       \includegraphics[width=.3\textwidth]
@@ -76,7 +76,7 @@ $d_0$ \emph{belongs} to $c$, and that $c$ \emph{contains} $d_0$.  Let
 us look at the example in Figure~\ref{fig-exemple-combi-maps} showing
 the 2D and 3D combinatorial maps describing the two objects given in
 Figure~\ref{fig-exemple-3Dmanifold}.
-\begin{figure}[h]
+\begin{figure}[ht]
   \begin{ccTexOnly}
     \begin{center}
       \includegraphics[width=.3\textwidth]
@@ -647,7 +647,7 @@ objects as those shown in Figure~\ref{fig-nonquasi-manifold} by
 combinatorial maps.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{figure}[h]
+\begin{figure}[ht]
   \begin{ccTexOnly}
     \begin{center}
       \includegraphics[width=.22\textwidth]
@@ -687,7 +687,7 @@ $\mb{i}$'s, with $0 \leq i \leq d$ correspond to a quasi-manifold?  As
 we can see in Figure~\ref{fig-pb-carte}, the answer is no.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{figure}[h]
+\begin{figure}[ht]
   \begin{ccTexOnly}
     \begin{center}
       \includegraphics[width=.4\textwidth]

Combinatorial_map/doc_tex/Combinatorial_map/fig/insert-edge.fig

@@ -10,250 +10,250 @@ Single
 0 32 #000000
 0 33 #535353
 0 35 #9f9f9f
-5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 2168.443 2256.374 1419 132 2029 8 2682 63
+5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 5408.909 6107.505 3539 800 5061 491 6690 628
-	2 0 1.00 120.00 120.00
+	2 0 1.00 299.29 299.29
-5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 1891.677 303.799 2555 1369 1956 1557 1303 1412
+5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 4718.675 1229.214 6373 3885 4879 4354 3250 3992
-	2 0 1.00 120.00 120.00
+	2 0 1.00 299.29 299.29
-6 3 5 1352 1513
+6 7 483 3372 4244
-6 269 12 1312 974
+6 671 500 3272 2900
 2 1 0 1 32 0 960 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 380 823 1219 904
+	 948 2523 3040 2725
 2 1 0 1 35 0 953 0 -1 0.000 1 0 7 0 0 2
-	 781 974 795 863
+	 1948 2900 1983 2623
 2 1 0 1 35 0 770 0 -1 0.000 1 0 7 0 0 2
-	 1312 572 1237 525
+	 3272 1897 3085 1780
 2 1 0 1 32 0 703 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1255 119 358 49
+	 3130 767 893 593
 2 1 0 1 35 0 667 0 -1 0.000 1 0 7 0 0 2
-	 787 39 802 84
+	 1963 568 2000 680
 2 1 0 1 35 0 860 0 -1 0.000 1 0 7 0 0 2
-	 269 480 369 449
+	 671 1668 920 1590
 2 1 0 3 32 0 872 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 358 49 380 823
+	 893 593 948 2523
 2 1 0 3 32 0 791 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1219 904 1255 119
+	 3040 2725 3130 767
 -6
-6 3 78 303 1342
+6 7 665 756 3817
 2 1 0 1 35 0 762 0 -1 0.000 1 0 7 0 0 2
-	 262 1165 176 1085
+	 653 3376 439 3176
 2 1 0 1 35 0 323 0 -1 0.000 1 0 7 0 0 2
-	 98 995 31 936
+	 244 2952 77 2805
 2 1 0 1 35 0 445 0 -1 0.000 1 0 7 0 0 2
-	 223 199 137 275
+	 556 967 342 1156
 2 1 0 1 33 0 349 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 5 498 55 1342
+	 12 1713 137 3817
 2 1 0 1 33 0 448 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 254 78 5 498
+	 634 665 12 1713
 2 1 0 1 33 0 839 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 283 856 254 78
+	 706 2605 634 665
 2 1 0 1 33 0 740 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 55 1342 283 856
+	 137 3817 706 2605
 -6
-6 95 5 1283 599
+6 237 483 3200 1964
 2 1 0 1 35 0 334 0 -1 0.000 1 0 7 0 0 2
-	 1283 371 1193 278
+	 3200 1396 2976 1164
 2 1 0 1 35 0 71 0 -1 0.000 1 0 7 0 0 2
-	 586 599 605 464
+	 1462 1964 1509 1628
 2 1 0 1 33 0 409 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 95 419 335 5
+	 237 1516 836 483
 2 1 0 1 33 0 631 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 335 5 1249 74
+	 836 483 3115 655
 2 1 0 1 33 0 83 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1128 510 95 419
+	 2814 1742 237 1516
 2 1 0 1 33 0 305 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1249 74 1128 510
+	 3115 655 2814 1742
 -6
-6 165 899 1242 1513
+6 412 2713 3098 4244
 2 1 0 1 35 0 667 0 -1 0.000 1 0 7 0 0 2
-	 1242 1195 1152 1259
+	 3098 3451 2873 3610
 2 1 0 1 35 0 444 0 -1 0.000 1 0 7 0 0 2
-	 595 1457 651 1436
+	 1484 4104 1624 4052
 2 1 0 1 33 0 757 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 364 933 165 1383
+	 908 2797 412 3920
 2 1 0 1 33 0 945 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1206 1016 364 933
+	 3008 3004 908 2797
 2 1 0 1 33 0 483 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 169 1375 1112 1481
+	 422 3900 2774 4164
 2 1 0 1 33 0 670 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1101 1481 1206 1016
+	 2746 4164 3008 3004
 -6
-6 34 538 1205 1512
+6 85 1812 3006 4241
 2 1 0 1 32 0 176 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1112 647 1081 1512
+	 2774 2084 2696 4241
 2 1 0 1 35 0 206 0 -1 0.000 1 0 7 0 0 2
-	 1205 1054 1096 1096
+	 3006 3099 2734 3204
 2 1 0 3 32 0 58 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 73 553 1112 647
+	 182 1850 2774 2084
 2 1 0 1 32 0 285 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 120 1404 73 553
+	 299 3972 182 1850
 2 1 0 1 32 0 403 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1081 1512 120 1404
+	 2696 4241 299 3972
 -6
-6 1164 163 1352 1467
+6 2903 877 3372 4129
 2 1 0 1 33 0 740 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1334 163 1292 955
+	 3327 877 3223 2852
 2 1 0 1 33 0 635 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1292 955 1186 1467
+	 3223 2852 2958 4129
 2 1 0 1 33 0 222 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1186 1467 1225 608
+	 2958 4129 3055 1987
 2 1 0 1 33 0 327 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 1225 608 1334 163
+	 3055 1987 3327 877
 -6
 -6
-6 2541 -18 3890 1556
+6 6338 426 9703 4351
-6 2807 51 3744 967
+6 7001 598 9338 2882
 2 1 0 1 32 0 962 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2893 836 3729 917
+	 7216 2555 9301 2757
 2 1 0 1 35 0 949 0 -1 0.000 1 0 7 0 0 2
-	 3319 967 3306 876
+	 8278 2882 8246 2655
 2 1 0 1 35 0 831 0 -1 0.000 1 0 7 0 0 2
-	 3364 457 3309 502
+	 8391 1610 8253 1722
 2 1 0 1 32 0 876 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2869 66 2893 836
+	 7156 635 7216 2555
 2 1 0 1 35 0 859 0 -1 0.000 1 0 7 0 0 2
-	 2807 473 2881 464
+	 7001 1650 7186 1628
 2 1 0 2 32 0 839 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3729 917 2869 66
+	 9301 2757 7156 635
 -6
-6 2541 71 2841 1335
+6 6338 648 7086 3800
 2 1 0 1 35 0 758 0 -1 0.000 1 0 7 0 0 2
-	 2800 1158 2714 1078
+	 6984 3358 6769 3159
 2 1 0 1 35 0 338 0 -1 0.000 1 0 7 0 0 2
-	 2606 1012 2569 929
+	 6500 2994 6408 2787
 2 1 0 1 35 0 449 0 -1 0.000 1 0 7 0 0 2
-	 2761 192 2675 268
+	 6887 949 6672 1139
 2 1 0 1 33 0 356 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2543 491 2593 1335
+	 6343 1695 6468 3800
 2 1 0 1 33 0 452 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2792 71 2543 491
+	 6964 648 6343 1695
 2 1 0 1 33 0 834 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2821 849 2792 71
+	 7036 2588 6964 648
 2 1 0 1 33 0 737 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2593 1335 2821 849
+	 6468 3800 7036 2588
 -6
-6 2633 -2 3821 566
+6 6567 466 9531 1882
 2 1 0 1 35 0 660 0 -1 0.000 1 0 7 0 0 2
-	 3368 52 3325 32
+	 8401 600 8293 550
 2 1 0 1 35 0 341 0 -1 0.000 1 0 7 0 0 2
-	 3821 364 3731 271
+	 9531 1378 9306 1146
 2 1 0 1 35 0 77 0 -1 0.000 1 0 7 0 0 2
-	 3157 566 3143 457
+	 7874 1882 7839 1610
 2 1 0 1 33 0 414 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2633 412 2873 -2
+	 6567 1498 7166 466
 2 1 0 1 33 0 96 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3666 503 2633 412
+	 9144 1725 6567 1498
 2 1 0 1 33 0 631 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2873 -2 3787 67
+	 7166 466 9446 638
 2 1 0 1 33 0 313 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3787 67 3666 503
+	 9446 638 9144 1725
 -6
-6 2685 892 3764 1556
+6 6697 2695 9388 4351
 2 1 0 1 35 0 455 0 -1 0.000 1 0 7 0 0 2
-	 3102 1472 3151 1471
+	 7737 4142 7859 4139
 2 1 0 1 33 0 754 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2902 926 2685 1418
+	 7238 2780 6697 4007
 2 1 0 1 33 0 936 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3744 1009 2902 926
+	 9338 2987 7238 2780
 2 1 0 1 33 0 669 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3628 1524 3744 1009
+	 9049 4271 9338 2987
 2 1 0 1 33 0 487 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2685 1418 3628 1524
+	 6697 4007 9049 4271
 -6
-6 2908 -18 3863 891
+6 7253 426 9635 2693
 2 1 0 1 32 0 689 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3824 88 2923 18
+	 9538 690 7291 515
 2 1 0 1 32 0 776 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3785 876 3824 88
+	 9441 2655 9538 690
 2 1 0 3 32 0 818 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2923 18 3785 876
+	 7291 515 9441 2655
 -6
 2 1 0 1 32 0 422 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3652 1535 2630 1419
+	 9109 4299 6560 4009
 2 1 0 1 32 0 307 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2630 1419 2581 572
+	 6560 4009 6438 1897
 2 1 0 3 32 0 259 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2581 572 3191 1150
+	 6438 1897 7959 3339
 2 1 0 1 32 0 57 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 2642 520 3685 614
+	 6590 1767 9191 2002
 2 1 0 1 32 0 173 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3685 614 3652 1540
+	 9191 2002 9109 4311
 2 1 0 1 35 0 209 0 -1 0.000 1 0 7 0 0 2
-	 3743 1047 3667 1065
+	 9336 3082 9146 3127
 2 1 0 1 35 0 248 0 -1 0.000 1 0 7 0 0 2
-	 2893 873 2956 825
+	 7216 2648 7373 2528
 2 1 0 1 35 0 761 0 -1 0.000 1 0 7 0 0 2
-	 3804 495 3850 565
+	 9488 1705 9603 1880
 2 1 0 1 35 0 666 0 -1 0.000 1 0 7 0 0 2
-	 3690 1252 3780 1188
+	 9204 3593 9428 3433
 2 1 0 1 33 0 232 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3724 1460 3763 601
+	 9289 4112 9386 1969
 2 1 0 1 33 0 737 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3872 156 3830 948
+	 9658 860 9553 2835
 2 1 0 1 33 0 635 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3830 948 3724 1460
+	 9553 2835 9289 4112
 2 1 0 1 33 0 334 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3763 601 3872 156
+	 9386 1969 9658 860
 2 1 0 2 32 0 231 0 -1 0.000 1 0 7 1 0 3
-	0 0 1.00 90.00 90.00
+	0 0 1.00 224.47 224.47
-	 3186 1142 3229 1083 2642 520
+	 7947 3319 8054 3171 6590 1767
-4 0 0 50 -1 0 10 0.0000 4 105 225 2840 1197 dh4\001
+4 0 0 50 -1 0 25 0.0000 4 262 561 7084 3456 dh4\001
-4 0 0 50 -1 0 10 0.0000 4 105 225 3243 318 dh5\001
+4 0 0 50 -1 0 25 0.0000 4 262 561 8089 1264 dh5\001
 -6
-4 0 0 50 -1 0 7 0.0000 4 120 1620 1596 1692 remove_cell<CMap,1>(cm,dh4)\001
+4 0 0 50 -1 0 18 0.0000 4 255 3645 3981 4690 remove_cell<CMap,1>(cm,dh4)\001
-4 0 0 50 -1 0 7 0.0000 4 120 1620 1674 1830 remove_cell<CMap,1>(cm,dh5)\001
+4 0 0 50 -1 0 18 0.0000 4 255 3645 4175 5034 remove_cell<CMap,1>(cm,dh5)\001
-4 0 0 50 -1 0 10 0.0000 4 105 225 632 784 dh1\001
+4 0 0 50 -1 0 25 0.0000 4 262 561 1576 2426 dh1\001
-4 0 0 50 -1 0 7 0.0000 4 120 2565 1041 -68 dh5=insert_cell_1_in_cell_2<CMap>(cm,dh2,dh3)\001
+4 0 0 50 -1 0 18 0.0000 4 255 5745 2597 301 dh5=insert_cell_1_in_cell_2<CMap>(cm,dh2,dh3)\001
-4 0 0 50 -1 0 7 0.0000 4 120 2835 907 -209 dh4=insert_dangling_cell_1_in_cell_2<CMap>(cm,dh1)\001
+4 0 0 50 -1 0 25 0.0000 4 262 561 2327 1271 dh3\001
-4 0 0 50 -1 0 10 0.0000 4 105 225 933 321 dh3\001
+4 0 0 50 -1 0 25 0.0000 4 262 561 978 1261 dh2\001
-4 0 0 50 -1 0 10 0.0000 4 105 225 392 317 dh2\001
+4 0 0 50 -1 0 18 0.0000 4 255 6390 2262 -51 dh4=insert_dangling_cell_1_in_cell_2<CMap>(cm,dh1)\001

Combinatorial_map/doc_tex/Combinatorial_map/fig/insert-facet.fig

@@ -10,315 +10,315 @@ Single
 0 32 #000000
 0 33 #535353
 0 35 #9f9f9f
-5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 2218.118 -389.912 2939 1510 2244 1642 1411 1475
+5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 4971.667 -536.322 6607 3765 5031 4065 3142 3686
-	2 0 1.00 120.00 120.00
+	2 0 1.00 272.07 272.07
-5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 2100.010 1452.417 1543 172 2217 61 2703 193
+5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 4704.050 3630.931 3441 732 4970 480 6072 780
-	2 0 1.00 120.00 120.00
+	2 0 1.00 272.07 272.07
-6 117 15 1466 1590
+6 208 376 3267 3947
-6 383 100 1305 1001
+6 811 569 2902 2612
 2 1 0 1 35 0 949 0 -1 0.000 1 0 7 0 0 2
-	 895 1001 882 910
+	 1972 2612 1943 2405
 2 1 0 1 35 0 831 0 -1 0.000 1 0 7 0 0 2
-	 940 491 885 536
+	 2074 1455 1950 1557
 2 1 0 1 35 0 859 0 -1 0.000 1 0 7 0 0 2
-	 383 507 457 498
+	 811 1492 979 1471
 2 1 0 1 33 0 876 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 445 100 469 870
+	 952 569 1006 2315
 2 1 0 1 33 0 839 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1305 951 445 100
+	 2902 2498 952 569
 2 1 0 1 33 0 962 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 469 870 1305 951
+	 1006 2315 2902 2498
 -6
-6 117 105 417 1369
+6 208 580 888 3446
 2 1 0 1 35 0 758 0 -1 0.000 1 0 7 0 0 2
-	 376 1192 290 1112
+	 795 3045 600 2863
 2 1 0 1 35 0 338 0 -1 0.000 1 0 7 0 0 2
-	 182 1046 145 963
+	 356 2714 272 2525
 2 1 0 1 35 0 449 0 -1 0.000 1 0 7 0 0 2
-	 337 226 251 302
+	 707 854 512 1027
 2 1 0 1 33 0 356 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 119 525 169 1369
+	 213 1532 326 3446
 2 1 0 1 33 0 452 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 368 105 119 525
+	 777 580 213 1532
 2 1 0 1 33 0 834 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 397 883 368 105
+	 843 2344 777 580
 2 1 0 1 33 0 737 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 169 1369 397 883
+	 326 3446 843 2344
 -6
-6 194 17 1397 600
+6 383 381 3110 1702
 2 1 0 1 35 0 660 0 -1 0.000 1 0 7 0 0 2
-	 944 86 901 66
+	 2083 537 1986 492
 2 1 0 1 35 0 341 0 -1 0.000 1 0 7 0 0 2
-	 1397 398 1307 305
+	 3110 1244 2906 1034
 2 1 0 1 35 0 77 0 -1 0.000 1 0 7 0 0 2
-	 733 600 719 491
+	 1605 1702 1573 1455
 2 1 0 1 33 0 96 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1242 537 209 446
+	 2759 1560 417 1353
 2 1 0 1 33 0 631 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 449 32 1363 101
+	 961 415 3033 571
 2 1 0 1 33 0 313 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1363 101 1242 537
+	 3033 571 2759 1560
 2 1 0 3 32 0 414 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 209 446 449 32
+	 417 1353 961 415
 -6
-6 203 539 1319 1532
+6 403 1564 2934 3815
 2 1 0 1 35 0 248 0 -1 0.000 1 0 7 0 0 2
-	 673 1096 736 1048
+	 1469 2827 1612 2718
 2 1 0 1 35 0 209 0 -1 0.000 1 0 7 0 0 2
-	 1319 1081 1243 1099
+	 2934 2793 2761 2834
 2 1 0 3 32 0 231 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1227 1517 218 554
+	 2725 3781 437 1598
 2 1 0 1 33 0 57 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 218 554 1261 648
+	 437 1598 2802 1811
 2 1 0 1 33 0 173 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1261 648 1227 1517
+	 2802 1811 2725 3781
 -6
-6 1266 190 1466 1509
+6 2813 773 3267 3763
 2 1 0 1 35 0 761 0 -1 0.000 1 0 7 0 0 2
-	 1380 529 1426 599
+	 3072 1541 3176 1700
 2 1 0 1 35 0 666 0 -1 0.000 1 0 7 0 0 2
-	 1266 1286 1356 1222
+	 2813 3258 3017 3113
 2 1 0 1 33 0 232 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1300 1494 1339 635
+	 2890 3729 2979 1782
 2 1 0 1 33 0 737 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1448 190 1406 982
+	 3226 773 3131 2568
 2 1 0 1 33 0 334 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1339 635 1448 190
+	 2979 1782 3226 773
 2 1 0 3 32 0 635 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1406 982 1300 1494
+	 3131 2568 2890 3729
 -6
-6 261 926 1340 1590
+6 535 2441 2981 3947
 2 1 0 1 35 0 455 0 -1 0.000 1 0 7 0 0 2
-	 678 1506 727 1505
+	 1480 3756 1591 3754
 2 1 0 1 33 0 754 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 478 960 261 1452
+	 1027 2519 535 3634
 2 1 0 1 33 0 936 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1320 1043 478 960
+	 2936 2707 1027 2519
 2 1 0 1 33 0 669 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1204 1558 1320 1043
+	 2673 3874 2936 2707
 2 1 0 1 33 0 487 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 261 1452 1204 1558
+	 535 3634 2673 3874
 -6
-6 118 606 1163 1560
+6 211 1716 2580 3879
 2 1 0 1 33 0 259 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 157 606 1163 1560
+	 299 1716 2580 3879
 2 1 0 1 33 0 422 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1163 1560 206 1453
+	 2580 3879 410 3636
 2 1 0 1 33 0 307 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 206 1453 157 606
+	 410 3636 299 1716
 -6
-6 484 15 1439 925
+6 1040 376 3206 2439
 2 1 0 3 32 0 818 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 499 52 1361 910
+	 1074 460 3029 2405
 2 1 0 1 33 0 689 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1400 122 499 52
+	 3117 619 1074 460
 2 1 0 1 33 0 776 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 1361 910 1400 122
+	 3029 2405 3117 619
 -6
 -6
-6 2688 -130 4559 1872
+6 6038 47 10280 4586
-6 2688 257 4250 1872
+6 6038 925 9579 4586
-6 2758 275 3706 1113
+6 6196 966 8346 2865
 2 1 0 1 35 0 924 0 -1 0.000 1 0 7 0 0 2
-	 3342 1082 3278 991
+	 7520 2795 7375 2589
 2 1 0 1 35 0 781 0 -1 0.000 1 0 7 0 0 2
-	 3330 610 3265 596
+	 7493 1725 7346 1693
 2 1 0 1 35 0 692 0 -1 0.000 1 0 7 0 0 2
-	 2762 753 2795 713
+	 6205 2049 6280 1959
 2 1 0 1 33 0 713 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 2758 275 2828 1113
+	 6196 966 6355 2865
 2 1 0 1 33 0 784 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3706 875 2758 275
+	 8346 2326 6196 966
 2 1 0 1 33 0 927 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 2828 1113 3706 875
+	 6355 2865 8346 2326
 -6
-6 2688 309 3256 1789
+6 6038 1043 7325 4398
 2 1 0 1 35 0 648 0 -1 0.000 1 0 7 0 0 2
-	 3068 1503 2971 1455
+	 6899 3750 6679 3641
 2 1 0 1 35 0 234 0 -1 0.000 1 0 7 0 0 2
-	 3256 1439 3144 1364
+	 7325 3605 7071 3434
 2 1 0 1 35 0 303 0 -1 0.000 1 0 7 0 0 2
-	 3012 556 2909 582
+	 6772 1603 6539 1662
 2 1 0 1 33 0 658 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 2798 1158 2724 309
+	 6287 2967 6119 1043
 2 1 0 1 33 0 278 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 2724 309 3120 892
+	 6119 1043 7017 2364
 2 1 0 1 33 0 234 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3120 892 3165 1789
+	 7017 2364 7119 4398
 2 1 0 1 33 0 614 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3165 1789 2798 1158
+	 7119 4398 6287 2967
 -6
-6 2791 257 4247 1469
+6 6271 925 9572 3673
 2 1 0 1 35 0 819 0 -1 0.000 1 0 7 0 0 2
-	 3986 1230 3989 1157
+	 8981 3131 8987 2965
 2 1 0 1 35 0 350 0 -1 0.000 1 0 7 0 0 2
-	 3785 1282 3770 1182
+	 8525 3249 8491 3022
 2 1 0 2 32 0 347 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 4232 1454 3229 863
+	 9538 3639 7264 2299
 2 1 0 2 32 0 747 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 2821 287 3772 891
+	 6339 993 8495 2362
 2 1 0 2 32 0 796 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3772 891 4232 1454
+	 8495 2362 9538 3639
 2 1 0 4 32 0 298 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3229 863 2821 287
+	 7264 2299 6339 993
 -6
-6 2893 963 4226 1835
+6 6502 2525 9525 4502
 2 1 0 1 35 0 535 0 -1 0.000 1 0 7 0 0 2
-	 3774 1702 3759 1678
+	 8500 4201 8466 4146
 2 1 0 1 33 0 660 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 2893 1207 3266 1835
+	 6502 3079 7348 4502
 2 1 0 1 33 0 917 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3771 963 2893 1207
+	 8493 2525 6502 3079
 2 1 0 1 33 0 822 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 4226 1529 3771 963
+	 9525 3809 8493 2525
 2 1 0 1 33 0 564 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3266 1835 4226 1529
+	 7348 4502 9525 3809
 -6
-6 3198 968 4250 1872
+6 7194 2537 9579 4586
 2 1 0 1 33 0 215 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3272 1862 3239 968
+	 7362 4564 7287 2537
 2 1 0 1 33 0 309 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3239 968 4250 1549
+	 7287 2537 9579 3854
 2 1 0 1 33 0 500 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 4250 1549 3272 1862
+	 9579 3854 7362 4564
 -6
 -6
-6 2927 -130 4559 1390
+6 6579 47 10280 3493
-6 2927 177 4369 1380
+6 6579 743 9849 3471
 2 1 0 1 35 0 284 0 -1 0.000 1 0 7 0 0 2
-	 3133 364 3138 457
+	 7047 1167 7058 1378
 2 1 0 1 35 0 335 0 -1 0.000 1 0 7 0 0 2
-	 3979 1110 3897 1087
+	 8965 2859 8779 2806
 2 1 0 1 35 0 805 0 -1 0.000 1 0 7 0 0 2
-	 4191 1048 4107 1072
+	 9445 2718 9255 2772
 2 1 0 1 35 0 769 0 -1 0.000 1 0 7 0 0 2
-	 3439 441 3448 522
+	 7740 1342 7761 1526
 2 1 0 2 32 0 337 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3361 759 4354 1365
+	 7563 2063 9815 3437
 2 1 0 2 32 0 788 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 4354 1365 3886 809
+	 9815 3437 8754 2176
 2 1 0 2 32 0 739 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3886 809 2942 192
+	 8754 2176 6613 777
 2 1 0 2 32 0 287 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 2942 192 3361 759
+	 6613 777 7563 2063
 -6
-6 3925 -44 4559 1338
+6 8842 242 10280 3376
 2 1 0 1 35 0 445 0 -1 0.000 1 0 7 0 0 2
-	 4477 966 4481 919
+	 10094 2532 10103 2426
 2 1 0 1 35 0 494 0 -1 0.000 1 0 7 0 0 2
-	 4159 123 4245 191
+	 9373 621 9568 775
 2 1 0 1 33 0 803 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3966 787 4441 1338
+	 8935 2126 10012 3376
 2 1 0 1 33 0 841 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3997 -44 3966 787
+	 9005 242 8935 2126
 2 1 0 1 33 0 506 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 4525 457 3997 -44
+	 10203 1378 9005 242
 2 1 0 1 33 0 468 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 4441 1338 4525 457
+	 10012 3376 10203 1378
 -6
-6 2936 -130 4437 680
+6 6600 47 10003 1884
 2 1 0 1 35 0 127 0 -1 0.000 1 0 7 0 0 2
-	 3998 634 3914 521
+	 9008 1779 8817 1523
 2 1 0 1 33 0 252 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3358 663 2936 102
+	 7557 1845 6600 573
 2 1 0 1 33 0 577 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 2936 102 3913 -111
+	 6600 573 8815 90
 2 1 0 1 33 0 457 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3913 -111 4437 388
+	 8815 90 10003 1222
 2 1 0 1 33 0 131 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 4437 388 3358 663
+	 10003 1222 7557 1845
 -6
-6 3442 481 4521 1390
+6 7747 1433 10194 3493
 2 1 0 1 33 0 288 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 4436 1390 3442 780
+	 10001 3493 7747 2110
 2 1 0 1 33 0 116 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3442 780 4521 497
+	 7747 2110 10194 1469
 2 1 0 1 33 0 404 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 4521 497 4436 1390
+	 10194 1469 10001 3493
 -6
-6 2938 -101 3981 731
+6 6604 113 8969 1999
 2 1 0 1 35 0 610 0 -1 0.000 1 0 7 0 0 2
-	 3438 -8 3430 1
+	 7738 324 7720 344
 2 1 0 1 35 0 854 0 -1 0.000 1 0 7 0 0 2
-	 3981 390 3885 333
+	 8969 1226 8752 1097
 2 1 0 1 33 0 639 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3897 -101 2938 108
+	 8779 113 6604 587
 2 1 0 1 33 0 855 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 3874 731 3897 -101
+	 8727 1999 8779 113
 2 1 0 1 33 0 769 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 204.05 204.05
-	 2938 108 3874 731
+	 6604 587 8727 1999
 -6
 -6
-4 0 0 50 -1 0 10 0.0000 4 105 225 2800 753 dh5\001
+4 0 0 50 -1 0 23 0.0000 4 238 510 6291 2049 dh5\001
 -6
-4 0 0 50 -1 0 10 0.0000 4 105 225 1396 1258 dh4\001
+4 0 0 50 -1 0 23 0.0000 4 238 510 3108 3194 dh4\001
-4 0 0 50 -1 0 8 0.0000 4 120 1785 1715 -27 std::vector{dh1,dh2,dh3,dh4})\001
+4 0 0 50 -1 0 18 0.0000 4 272 4047 3831 281 std::vector{dh1,dh2,dh3,dh4})\001
-4 0 0 50 -1 0 10 0.0000 4 105 225 896 1166 dh1\001
+4 0 0 50 -1 0 23 0.0000 4 238 510 1974 2986 dh1\001
-4 0 0 50 -1 0 10 0.0000 4 105 225 83 209 dh2\001
+4 0 0 50 -1 0 23 0.0000 4 238 510 131 816 dh2\001
-4 0 0 50 -1 0 10 0.0000 4 105 225 770 286 dh3\001
+4 0 0 50 -1 0 23 0.0000 4 238 510 1689 991 dh3\001
-4 0 0 50 -1 0 8 0.0000 4 120 2430 957 -173 dh5=insert_cell_2_in_cell_3<CMap>(cm,\001
+4 0 0 50 -1 0 18 0.0000 4 255 4740 2113 -50 dh5=insert_cell_2_in_cell_3<CMap>(cm,\001
-4 0 0 50 -1 0 8 0.0000 4 120 1740 1331 1801 remove_cell<CMap,2>(cm,d5)\001
+4 0 0 50 -1 0 18 0.0000 4 272 3945 2961 4425 remove_cell<CMap,2>(cm,d5)\001

Combinatorial_map/doc_tex/Combinatorial_map/fig/insert-vertex.fig

@@ -13,405 +13,405 @@ Single
 0 35 #575757
 0 36 #5e5e5e
 0 37 #535353
-5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 3593.929 1678.859 4549 3233 3589 3503 2652 3241
+5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 5034.114 1280.771 6474 3631 5027 4037 3614 3643
-	2 0 1.00 120.00 120.00
+	2 0 1.00 180.89 180.89
-5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 3510.007 2604.125 2657 1270 3475 1021 4395 1291
+5 1 0 2 0 7 50 -1 -1 0.000 0 0 1 0 4908.415 2680.822 3622 672 4855 296 6242 703
-	2 0 1.00 120.00 120.00
+	2 0 1.00 180.89 180.89
-6 86 1002 3580 3427
+6 -253 268 5013 3923
-6 86 1002 2284 3327
+6 -253 268 3060 3772
-6 285 2352 2077 3327
+6 47 2303 2748 3772
 2 1 0 1 36 0 842 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 933 2372 285 2960
+	 1024 2333 47 3219
 2 1 0 1 36 0 922 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2077 2639 933 2372
+	 2748 2735 1024 2333
 2 1 0 1 36 0 687 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 1556 3313 2077 2639
+	 1963 3751 2748 2735
 2 1 0 1 36 0 607 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 285 2960 1556 3313
+	 47 3219 1963 3751
 -6
-6 934 1052 2231 2509
+6 1025 343 2980 2539
 2 1 0 1 36 0 925 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 965 1080 981 2233
+	 1072 385 1096 2123
 2 1 0 1 36 0 775 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2193 1275 965 1080
+	 2922 679 1072 385
 2 1 0 1 36 0 783 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2122 2489 2193 1275
+	 2816 2509 2922 679
 2 1 0 1 36 0 933 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 981 2233 2122 2489
+	 1096 2123 2816 2509
 -6
-6 86 1097 856 2827
+6 -253 411 908 3018
 2 1 0 1 36 0 840 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 174 2827 837 2255
+	 -121 3018 879 2156
 2 1 0 1 36 0 913 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 837 2255 809 1097
+	 879 2156 837 411
 2 1 0 1 36 0 667 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 809 1097 86 1535
+	 837 411 -253 1070
 2 1 0 1 36 0 595 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 86 1535 174 2827
+	 -253 1070 -121 3018
 -6
-6 1676 1318 2284 3236
+6 2143 744 3060 3635
 2 1 0 2 32 0 450 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 1725 1855 2269 1333
+	 2217 1553 3037 766
 2 1 0 1 36 0 365 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 1681 3236 1725 1855
+	 2151 3635 2217 1553
 2 1 0 1 36 0 656 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2191 2564 1681 3236
+	 2920 2622 2151 3635
 2 1 0 1 36 0 741 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2269 1333 2191 2564
+	 3037 766 2920 2622
 -6
-6 191 1002 2188 1726
+6 -95 268 2915 1358
 2 1 0 1 36 0 635 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 191 1432 909 1002
+	 -95 916 987 268
 2 1 0 1 36 0 351 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 1594 1696 191 1432
+	 2020 1313 -95 916
 2 1 0 1 36 0 731 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 909 1002 2158 1196
+	 987 268 2870 560
 2 1 0 4 32 0 448 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2158 1196 1594 1696
+	 2870 560 2020 1313
 -6
-6 86 1603 1551 3271
+6 -253 1174 1955 3688
 2 1 0 1 36 0 545 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 211 2914 125 1603
+	 -65 3150 -195 1174
 2 1 0 1 36 0 333 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 125 1603 1532 1883
+	 -195 1174 1926 1596
 2 1 0 1 36 0 345 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 1532 1883 1505 3271
+	 1926 1596 1885 3688
 2 1 0 1 36 0 557 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 1505 3271 211 2914
+	 1885 3688 -65 3150
 -6
 -6
-6 1801 1278 3580 3427
+6 2332 684 5013 3923
-6 1997 2682 3566 3427
+6 2628 2800 4993 3923
 2 1 0 1 36 0 635 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2475 2730 1997 3427
+	 3348 2872 2628 3923
 2 1 0 1 36 0 596 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 3566 2705 2475 2730
+	 4993 2835 3348 2872
 2 1 0 1 36 0 420 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 1997 3427 3566 2705
+	 2628 3923 4993 2835
 -6
-6 2425 1357 3553 2597
+6 3273 803 4972 2671
 2 1 0 1 36 0 730 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2561 1357 2462 2592
+	 3478 803 3328 2664
 2 1 0 1 36 0 517 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 3553 2548 2561 1357
+	 4972 2598 3478 803
 2 1 0 1 36 0 606 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2462 2592 3553 2548
+	 3328 2664 4972 2598
 -6
-6 1801 1348 2459 3289
+6 2332 789 3324 3715
 2 1 0 2 32 0 421 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2422 1363 1904 1897
+	 3268 811 2487 1616
 2 1 0 1 36 0 334 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 1904 1897 1841 3289
+	 2487 1616 2393 3715
 2 1 0 1 36 0 632 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 1841 3289 2329 2604
+	 2393 3715 3128 2682
 2 1 0 1 36 0 719 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2329 2604 2422 1363
+	 3128 2682 3268 811
 -6
-6 1934 1969 3525 3375
+6 2532 1725 4930 3845
 2 1 0 1 36 0 297 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 1934 3375 2001 1969
+	 2532 3845 2633 1725
 2 1 0 1 36 0 257 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2001 1969 3525 2641
+	 2633 1725 4930 2738
 2 1 0 1 36 0 381 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 3525 2641 1934 3375
+	 4930 2738 2532 3845
 -6
-6 2050 1278 3580 2497
+6 2707 684 5013 2521
 2 1 0 1 36 0 481 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2575 1293 3580 2497
+	 3498 706 5013 2521
 2 1 0 1 36 0 269 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 3580 2497 2065 1820
+	 5013 2521 2730 1500
 2 1 0 2 32 0 398 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 2065 1820 2575 1293
+	 2730 1500 3498 706
 -6
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 1
-	 2294 2942
+	 3075 3191
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 2966 2539 2971 2738
+	 4088 2584 4096 2884
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 2691 2990 2766 3114
+	 3673 3264 3786 3451
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 1862 2514 1980 2554
+	 2424 2547 2602 2607
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 2724 2096 2631 2281
+	 3723 1916 3583 2195
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 2983 1904 3070 1848
+	 4114 1627 4245 1542
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 2345 2023 2529 2060
+	 3152 1806 3429 1862
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 2058 2931 2310 3017
+	 2719 3175 3100 3305
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 2162 1612 2273 1606
+	 2876 1186 3044 1178
 -6
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 1059 1586 950 1805
+	 1214 1148 1050 1478
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 479 2521 670 2646
+	 339 2557 627 2746
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 1475 2313 1431 2521
+	 1840 2244 1774 2557
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 1787 2969 1891 2969
+	 2311 3232 2468 3232
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 955 3095 829 3128
+	 1057 3422 867 3472
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 1453 1070 1513 1196
+	 1807 370 1897 560
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 1896 1404 2050 1595
+	 2475 874 2707 1161
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 3
-	 615 1168 615 1196 615 1223
+	 545 517 545 560 545 601
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 4
-	 101 2159 128 2170 145 2198 172 2209
+	 -230 2012 -190 2028 -165 2070 -124 2087
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 801 1646 965 1601
+	 825 1238 1072 1170
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 1501 2470 1743 2477
+	 1880 2480 2244 2491
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 2115 1946 2252 1962
+	 2805 1690 3012 1714
-4 0 0 50 -1 0 10 0.0000 4 105 225 1636 1395 dh1\001
+4 0 0 50 -1 0 15 0.0000 4 158 340 2083 860 dh1\001
 -6
-6 4031 1106 7525 3531
+6 5693 424 10960 4080
-6 4031 1106 6225 3431
+6 5693 424 9001 3929
-6 4230 2456 6022 3431
+6 5993 2459 8694 3929
 2 1 0 1 36 0 842 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4878 2476 4230 3064
+	 6970 2490 5993 3375
 2 1 0 1 36 0 922 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6022 2743 4878 2476
+	 8694 2892 6970 2490
 2 1 0 1 36 0 687 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5501 3417 6022 2743
+	 7909 3908 8694 2892
 2 1 0 1 36 0 607 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4230 3064 5501 3417
+	 5993 3375 7909 3908
 -6
-6 4879 1156 6176 2613
+6 6972 500 8926 2696
 2 1 0 1 36 0 925 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4910 1184 4926 2337
+	 7018 542 7043 2279
 2 1 0 1 36 0 775 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6138 1379 4910 1184
+	 8869 835 7018 542
 2 1 0 1 36 0 783 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6067 2593 6138 1379
+	 8762 2666 8869 835
 2 1 0 1 36 0 933 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4926 2337 6067 2593
+	 7043 2279 8762 2666
 -6
-6 4031 1201 4801 2931
+6 5693 568 6854 3175
 2 1 0 1 36 0 840 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4119 2931 4782 2359
+	 5827 3175 6826 2313
 2 1 0 1 36 0 913 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4782 2359 4754 1201
+	 6826 2313 6783 568
 2 1 0 1 36 0 667 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4754 1201 4031 1639
+	 6783 568 5693 1227
 2 1 0 1 36 0 595 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4031 1639 4119 2931
+	 5693 1227 5827 3175
 -6
-6 5621 1426 6225 3340
+6 8090 906 9001 3792
 2 1 0 2 32 0 450 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5670 1959 5973 1669
+	 8164 1710 8621 1272
 2 1 0 1 36 0 365 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5626 3340 5670 1959
+	 8098 3792 8164 1710
 2 1 0 1 36 0 656 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6136 2668 5626 3340
+	 8866 2779 8098 3792
 2 1 0 1 36 0 741 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6214 1437 6136 2668
+	 8984 923 8866 2779
 2 1 0 2 32 0 450 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5971 1670 6210 1441
+	 8618 1275 8978 929
 -6
-6 4136 1106 6118 1830
+6 5851 424 8839 1515
 2 1 0 1 36 0 635 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4136 1536 4854 1106
+	 5851 1073 6934 424
 2 1 0 1 36 0 351 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5539 1800 4136 1536
+	 7967 1470 5851 1073
 2 1 0 1 36 0 731 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4854 1106 6103 1300
+	 6934 424 8817 717
 2 1 0 4 32 0 448 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5855 1522 5539 1800
+	 8443 1051 7967 1470
 2 1 0 2 32 0 448 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6103 1303 5855 1522
+	 8817 721 8443 1051
 -6
-6 4031 1707 5496 3375
+6 5693 1330 7901 3845
 2 1 0 1 36 0 545 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4156 3018 4070 1707
+	 5881 3306 5752 1330
 2 1 0 1 36 0 333 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 4070 1707 5477 1987
+	 5752 1330 7873 1752
 2 1 0 1 36 0 345 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5477 1987 5450 3375
+	 7873 1752 7833 3845
 2 1 0 1 36 0 557 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5450 3375 4156 3018
+	 7833 3845 5881 3306
 -6
 -6
-6 5746 1382 7525 3531
+6 8279 840 10960 4080
-6 5942 2786 7511 3531
+6 8574 2956 10939 4080
 2 1 0 1 36 0 635 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6420 2834 5942 3531
+	 9295 3029 8574 4080
 2 1 0 1 36 0 596 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 7511 2809 6420 2834
+	 10939 2992 9295 3029
 2 1 0 1 36 0 420 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5942 3531 7511 2809
+	 8574 4080 10939 2992
 -6
-6 6370 1461 7498 2701
+6 9220 959 10920 2828
 2 1 0 1 36 0 730 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6506 1461 6407 2696
+	 9424 959 9275 2821
 2 1 0 1 36 0 517 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 7498 2652 6506 1461
+	 10920 2754 9424 959
 2 1 0 1 36 0 606 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6407 2696 7498 2652
+	 9275 2821 10920 2754
 -6
-6 5746 1462 6404 3393
+6 8279 961 9270 3872
 2 1 0 2 32 0 421 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6124 1719 5849 2001
+	 8848 1348 8434 1773
 2 1 0 1 36 0 334 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5849 2001 5786 3393
+	 8434 1773 8339 3872
 2 1 0 1 36 0 632 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5786 3393 6274 2708
+	 8339 3872 9075 2839
 2 1 0 1 36 0 719 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6274 2708 6367 1467
+	 9075 2839 9214 968
 2 1 0 2 32 0 421 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6357 1477 6122 1721
+	 9199 983 8846 1351
 -6
-6 5879 2073 7470 3479
+6 8479 1882 10878 4002
 2 1 0 1 36 0 297 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5879 3479 5946 2073
+	 8479 4002 8580 1882
 2 1 0 1 36 0 257 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 5946 2073 7470 2745
+	 8580 1882 10878 2895
 2 1 0 1 36 0 381 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 7470 2745 5879 3479
+	 10878 2895 8479 4002
 -6
-6 5999 1382 7525 2601
+6 8660 840 10960 2678
 2 1 0 1 36 0 481 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6520 1397 7525 2601
+	 9445 863 10960 2678
 2 1 0 1 36 0 269 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 7525 2601 6010 1924
+	 10960 2678 8676 1657
 2 1 0 2 32 0 398 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6255 1671 6520 1397
+	 9046 1276 9445 863
 2 1 0 2 32 0 398 0 -1 0.000 1 0 7 1 0 2
-	0 0 1.00 90.00 90.00
+	0 0 1.00 135.67 135.67
-	 6014 1917 6254 1670
+	 8683 1646 9045 1275
 -6
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 1
-	 6239 3046
+	 9022 3348
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 6911 2643 6916 2842
+	 10035 2741 10043 3041
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 6636 3094 6711 3218
+	 9621 3421 9733 3608
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 5807 2618 5925 2658
+	 8371 2704 8548 2764
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 6669 2200 6576 2385
+	 9670 2073 9530 2352
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 6928 2008 7015 1952
+	 10060 1784 10191 1699
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 6290 2127 6474 2164
+	 9098 1963 9376 2019
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 6003 3035 6255 3121
+	 8666 3332 9046 3461
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 6107 1716 6218 1710
+	 8823 1343 8990 1335
 -6
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 5004 1690 4895 1909
+	 7160 1305 6996 1635
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 4424 2625 4615 2750
+	 6285 2714 6573 2902
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 5420 2417 5376 2625
+	 7787 2401 7721 2714
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 5732 3073 5836 3073
+	 8257 3389 8414 3389
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 4900 3199 4774 3232
+	 7003 3579 6813 3629
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 5398 1174 5458 1300
+	 7754 527 7844 717
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 3
-	 4560 1272 4560 1300 4560 1327
+	 6491 674 6491 717 6491 757
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 4
-	 4046 2263 4073 2274 4090 2302 4117 2313
+	 5716 2169 5757 2185 5783 2227 5823 2244
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 4746 1750 4910 1705
+	 6771 1395 7018 1327
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 5446 2574 5688 2581
+	 7826 2637 8191 2648
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 6060 2050 6197 2066
+	 8752 1847 8959 1871
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 5708 1624 5862 1815
+	 8222 1205 8454 1493
 2 1 0 1 33 36 45 -1 -1 0.000 0 0 -1 0 0 2
-	 5960 1389 6114 1580
+	 8601 850 8833 1138
-4 0 0 50 -1 0 10 0.0000 4 105 225 5423 1638 dh2\001
+4 0 0 50 -1 0 15 0.0000 4 158 340 7792 1226 dh2\001
 -6
-4 0 0 50 -1 0 12 0.0000 4 180 3810 2419 939 dh2=insert_cell_0_in_cell_1<CMap>(cm,dh1)\001
+4 0 0 50 -1 0 18 0.0000 4 271 5743 3264 172 dh2=insert_cell_0_in_cell_1<CMap>(cm,dh1)\001
-4 0 0 50 -1 0 12 0.0000 4 180 2595 2737 3703 remove_cell<CMap,0>(cm,dh2)\001
+4 0 0 50 -1 0 18 0.0000 4 255 3645 3743 4339 remove_cell<CMap,0>(cm,dh2)\001

Combinatorial_map/doc_tex/Combinatorial_map/fig/triangulation.fig

@@ -604,9 +604,9 @@ Single
 4 0 0 50 -1 0 19 0.0000 4 225 495 3979 2796 dh2\001
 4 0 0 50 -1 0 19 0.0000 4 225 495 8145 630 dh3\001
 4 0 0 50 -1 0 19 0.0000 4 225 495 9630 2565 dh4\001
-4 0 0 50 -1 0 16 0.0000 4 255 5205 3828 -89 dh3=insert_cell_0_in_cell_2<CMap>(cm,dh1)\001
+4 0 0 50 -1 0 18 0.0000 4 255 6900 4247 3944 Vector<Dart_handle>v1 = {Dart_of_cell_range<1,2>(dh3)}\001
-4 0 0 50 -1 0 16 0.0000 4 255 6735 4247 3944 Vector<Dart_handle>v1 = {Dart_of_cell_range<1,2>(dh3)}\001
+4 0 0 50 -1 0 18 0.0000 4 255 6900 4353 4232 Vector<Dart_handle>v2 = {Dart_of_cell_range<1,2>(dh4)}\001
-4 0 0 50 -1 0 16 0.0000 4 255 6735 4353 4232 Vector<Dart_handle>v2 = {Dart_of_cell_range<1,2>(dh4)}\001
+4 0 0 50 -1 -1 18 0.0000 4 255 4140 4790 4526 a in v1 U v2: remove_cell<1>(cm,a)\001
-4 0 0 50 -1 -1 16 0.0000 4 255 4005 4790 4526 a in v1 U v2: remove_cell<1>(cm,a)\001
+4 0 0 50 -1 32 21 0.0000 4 225 240 4565 4540 "\001
-4 0 0 50 -1 32 19 0.0000 4 210 225 4565 4540 "\001
+4 0 0 50 -1 0 18 0.0000 4 255 5265 4161 175 dh4=insert_cell_0_in_cell_2<CMap>(cm,dh2)\001
-4 0 0 50 -1 0 16 0.0000 4 255 5205 4161 175 dh4=insert_cell_0_in_cell_2<CMap>(cm,dh2)\001
+4 0 0 50 -1 0 18 0.0000 4 255 5265 3828 -89 dh3=insert_cell_0_in_cell_2<CMap>(cm,dh1)\001

Combinatorial_map/doc_tex/Combinatorial_map_ref/CellAttribute.tex

@@ -8,7 +8,7 @@
 %%RefPage: end of header, begin of main body
 % +------------------------------------------------------------------------+
 \begin{ccRefConcept}{CellAttribute}
-\ccRefLabel{CGAL::CellAttribute}
+%\ccRefLabel{CGAL::CellAttribute}
 
 \ccDefinition
   
@@ -104,8 +104,8 @@ dart of its associated cell, and can contain any information.
 
 \ccSeeAlso
 %\ccRefConceptPage{CGAL::AttributeFunctor}\\
-\ccRefConceptPage{CGAL::CombinatorialMap}\\
+\ccRefConceptPage{CombinatorialMap}\\
-\ccRefConceptPage{CGAL::CombinatorialMapItems}
+\ccRefConceptPage{CombinatorialMapItems}
 
 \end{ccRefConcept}
 % +------------------------------------------------------------------------+

Combinatorial_map/doc_tex/Combinatorial_map_ref/Cell_attribute.tex

@@ -17,7 +17,7 @@
 The class \ccRefName\ represents an attribute containing (or not) an information.
 
 \ccIsModel
-\ccRefConceptPage{CGAL::CellAttribute}
+\ccRefConceptPage{CellAttribute}
 
 \ccParameters
 \ccc{CMap} must be a model of the \ccc{CombinatorialMap}.\\

Combinatorial_map/doc_tex/Combinatorial_map_ref/CombinatorialMap.tex

@@ -8,7 +8,7 @@
 %%RefPage: end of header, begin of main body
 % +------------------------------------------------------------------------+
 \begin{ccRefConcept}{CombinatorialMap}
-\ccRefLabel{CGAL::CombinatorialMap}
+%\ccRefLabel{CGAL::CombinatorialMap}
 
 \ccDefinition
   

Combinatorial_map/doc_tex/Combinatorial_map_ref/CombinatorialMapItems.tex

@@ -9,7 +9,7 @@
 % +------------------------------------------------------------------------+
 
 \begin{ccRefConcept}{CombinatorialMapItems}
-\ccRefLabel{CGAL::CombinatorialMapItems}
+%\ccRefLabel{CGAL::CombinatorialMapItems}
 
 \ccDefinition
   
@@ -66,7 +66,7 @@ two types: \ccc{Dart} and \ccc{Attributes}.
 
 \ccExample
 The following examples show two possible models of the
-\ccc{CGAL::CombinatorialMapItems} concept: the first one for a 4D
+\ccc{CombinatorialMapItems} concept: the first one for a 4D
 combinatorial map without enabled attributes, the second one for a 3D
 combinatorial map with edge attributes enabled, and associated with a
 \ccc{Cell_attribute} containing an \ccc{int}.
@@ -107,8 +107,8 @@ struct Exemple_Item_3
 % \ccRefConceptPage{PolyhedronItems_3}\\
 % \ccRefIdfierPage{CGAL::HalfedgeDS_vertex_base<Refs>}\\
 % \ccRefIdfierPage{CGAL::HalfedgeDS_halfedge_base<Refs>}\\
-\ccRefConceptPage{CGAL::CombinatorialMap}\\
+\ccRefConceptPage{CombinatorialMap}\\
-\ccRefConceptPage{CGAL::Dart}
+\ccRefConceptPage{Dart}
 
 \end{ccRefConcept}
 % +------------------------------------------------------------------------+

Combinatorial_map/doc_tex/Combinatorial_map_ref/Combinatorial_map.tex

@@ -21,7 +21,7 @@ Darts and non void attributes are stored in memory using
 \ccc{CGAL::Compact_container}, using \ccc{Alloc} as allocator.
 
 \ccIsModel
-\ccRefConceptPage{CGAL::CombinatorialMap}
+\ccRefConceptPage{CombinatorialMap}
 
 \ccParameters
 \ccc{d} an integer for the dimension of the map.\\
@@ -62,8 +62,8 @@ map.
 Other methods have all a constant time complexity.
 
 \ccSeeAlso
-\ccRefConceptPage{CGAL::CombinatorialMapItems}\\
+\ccRefConceptPage{CombinatorialMapItems}\\
-\ccRefConceptPage{CGAL::Dart}\\
+\ccRefConceptPage{Dart}\\
 
 \end{ccRefClass}
 % +------------------------------------------------------------------------+

Combinatorial_map/doc_tex/Combinatorial_map_ref/Combinatorial_map_constructors.tex

@@ -10,7 +10,7 @@
 
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{make_edge<CMap>}
-\ccInclude{Combinatorial_map_constructors.h}\\
+\ccInclude{CGAL/Combinatorial_map_constructors.h}\\
 
 \ccFunction{template < class CMap >
             typename CMap::Dart_handle make_edge(CMap& cm);}
@@ -32,7 +32,7 @@
 \end{ccRefFunction}
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{make_combinatorial_polygon<CMap>}
-\ccInclude{Combinatorial_map_constructors.h}\\
+\ccInclude{CGAL/Combinatorial_map_constructors.h}\\
 
 \ccFunction{template < class CMap > typename CMap::Dart_handle
   make_combinatorial_polygon(CMap& cm, unsigned int alg);} 
@@ -54,7 +54,7 @@
 \end{ccRefFunction}
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{make_combinatorial_tetrahedron<CMap>}
-\ccInclude{Combinatorial_map_constructors.h}\\
+\ccInclude{CGAL/Combinatorial_map_constructors.h}\\
 
 \ccFunction{template < class CMap >
             typename CMap::Dart_handle make_combinatorial_tetrahedron(CMap& cm);}
@@ -77,7 +77,7 @@
 \end{ccRefFunction}
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{make_combinatorial_hexahedron<CMap>}
-\ccInclude{Combinatorial_map_constructors.h}\\
+\ccInclude{CGAL/Combinatorial_map_constructors.h}\\
 
 \ccFunction{template < class CMap >
             typename CMap::Dart_handle make_combinatorial_hexahedron(CMap& cm);}

Combinatorial_map/doc_tex/Combinatorial_map_ref/Combinatorial_map_min_items.tex

@@ -22,7 +22,7 @@ template argument for the dimension of the combinatorial map.
 In this class, no attribute is enabled.
 
 \ccIsModel
-\ccRefConceptPage{CGAL::CombinatorialMapItems}
+\ccRefConceptPage{CombinatorialMapItems}
 
 \ccExample
 

Combinatorial_map/doc_tex/Combinatorial_map_ref/Combinatorial_map_operations.tex

@@ -19,7 +19,7 @@
 % }
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{is_removable<CMap,i>}
-\ccInclude{Combinatorial_map_operations.h}\\
+\ccInclude{CGAL/Combinatorial_map_operations.h}\\
 \ccFunction{template <class CMap, unsigned int i>
     bool is_removable(const CMap& cm, typename CMap::Dart_const_handle dh);}
          {Returns true iff the $i$-cell containing \ccc{dh} can be removed,
@@ -35,7 +35,7 @@
 \end{ccRefFunction}
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{remove_cell<CMap,i>}
-\ccInclude{Combinatorial_map_operations.h}\\
+\ccInclude{CGAL/Combinatorial_map_operations.h}\\
 
 \ccFunction{template <class CMap, unsigned int i>
   unsigned int remove_cell(CMap& cm, typename CMap::Dart_handle dh);}
@@ -131,7 +131,7 @@
 \end{ccRefFunction}
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{is_insertable_cell_1_in_cell_2<CMap>}
-\ccInclude{Combinatorial_map_operations.h}\\
+\ccInclude{CGAL/Combinatorial_map_operations.h}\\
 
 \ccFunction{template < class CMap >
   bool is_insertable_cell_1_in_cell_2(const CMap & cm,
@@ -157,7 +157,7 @@
 \end{ccRefFunction}
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{is_insertable_cell_2_in_cell_3<CMap,InputIterator>}
-\ccInclude{Combinatorial_map_operations.h}\\
+\ccInclude{CGAL/Combinatorial_map_operations.h}\\
 
 \ccFunction{template <class CMap, class InputIterator>
   bool is_insertable_cell_2_in_cell_3(const CMap & cm, 
@@ -183,7 +183,7 @@
 \end{ccRefFunction}
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{insert_cell_0_in_cell_1<CMap>}
-\ccInclude{Combinatorial_map_operations.h}\\
+\ccInclude{CGAL/Combinatorial_map_operations.h}\\
 
 \ccFunction{template < class CMap >
   typename CMap::Dart_handle insert_cell_0_in_cell_1(CMap& cm,
@@ -217,7 +217,7 @@
 \end{ccRefFunction}
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{insert_cell_0_in_cell_2<CMap>}
-\ccInclude{Combinatorial_map_operations.h}\\
+\ccInclude{CGAL/Combinatorial_map_operations.h}\\
 
 \ccFunction{template <class CMap>
       typename CMap::Dart_handle insert_cell_0_in_cell_2(CMap & cm,
@@ -251,7 +251,7 @@
 \end{ccRefFunction}
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{insert_cell_1_in_cell_2<CMap>}
-\ccInclude{Combinatorial_map_operations.h}\\
+\ccInclude{CGAL/Combinatorial_map_operations.h}\\
 
 \ccFunction{template < class CMap >
   typename CMap::Dart_handle insert_cell_1_in_cell_2(CMap& cm,
@@ -286,7 +286,7 @@
 \end{ccRefFunction}
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{insert_dangling_cell_1_in_cell_2<CMap>}
-\ccInclude{Combinatorial_map_operations.h}\\
+\ccInclude{CGAL/Combinatorial_map_operations.h}\\
 
 \ccFunction{template < class CMap >
   typename CMap::Dart_handle insert_dangling_cell_1_in_cell_2(CMap& cm,
@@ -314,7 +314,7 @@ being attached only by one of its extremity to the 0-cell containing \ccc{dh}.
 \end{ccRefFunction}
 %--------------------------------------------------------------------------------
 \begin{ccRefFunction}{insert_cell_2_in_cell_3<CMap,InputIterator>}
-\ccInclude{Combinatorial_map_operations.h}\\
+\ccInclude{CGAL/Combinatorial_map_operations.h}\\
 
 \ccFunction{template <class CMap, class InputIterator>
   typename CMap::Dart_handle insert_cell_2_in_cell_3(CMap & cm,

Combinatorial_map/doc_tex/Combinatorial_map_ref/Dart.tex

@@ -8,7 +8,7 @@
 %%RefPage: end of header, begin of main body
 % +------------------------------------------------------------------------+
 \begin{ccRefConcept}{Dart}
-\ccRefLabel{CGAL::Dart}
+%\ccRefLabel{CGAL::Dart}
 
 \ccDefinition
   

Combinatorial_map/doc_tex/Combinatorial_map_ref/Dart_base.tex

@@ -21,7 +21,7 @@ associated to each dart by \ccc{Attribute_handle<i>}, one for each
 non void $i$-attribute.
 
 \ccIsModel
-\ccRefConceptPage{CGAL::Dart}
+\ccRefConceptPage{Dart}
 
 \ccParameters
 \ccc{d} an integer for the dimension of the dart.\\
@@ -53,7 +53,7 @@ $O(d+1)$.
 Other methods have all a constant time complexity.
 
 \ccSeeAlso
-\ccRefConceptPage{CGAL::CombinatorialMap}
+\ccRefConceptPage{CombinatorialMap}
 
 \end{ccRefClass}
 % +------------------------------------------------------------------------+

Combinatorial_map/doc_tex/Combinatorial_map_ref/intro.tex

@@ -5,13 +5,13 @@
 
 \subsection{Concepts}
 
-\ccRefConceptPage{CGAL::CombinatorialMap}\\
+\ccRefConceptPage{CombinatorialMap}\\
-\ccRefConceptPage{CGAL::Dart}\\
+\ccRefConceptPage{Dart}\\
 %\ccRefConceptPage{CGAL::CombinatorialMapWithPoints}
-\ccRefConceptPage{CGAL::CellAttribute}\\
+\ccRefConceptPage{CellAttribute}\\
 %\ccRefConceptPage{CGAL::CellAttributeWithPoint}
 %\ccRefConceptPage{CGAL::AttributeFunctor}
-\ccRefConceptPage{CGAL::CombinatorialMapItems}
+\ccRefConceptPage{CombinatorialMapItems}
 %\ccRefConceptPage{CGAL::CombinatorialMapWithPointsItems}
 %\ccRefConceptPage{CGAL::CombinatorialMapWithPointsTraits}
 

Combinatorial_map/examples/Combinatorial_map/CMakeLists.txt

@@ -39,7 +39,7 @@ if ( CGAL_FOUND )
   create_single_source_cgal_program( "map_3_with_colored_facets.cpp" )
   create_single_source_cgal_program( "map_3_operations.cpp" )
   create_single_source_cgal_program( "map_3_marks.cpp" )
-  create_single_source_cgal_program( "test-tuple.cc" )
+#  create_single_source_cgal_program( "test-tuple.cc" )
 else()
   
     message(STATUS "This program requires the CGAL library, and will not be compiled.")

Combinatorial_map/examples/Combinatorial_map/test-tuple.cc

@@ -12,6 +12,8 @@ struct Convert_void<void>
 
 #ifndef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
 template<typename ... Items>
+struct Convert_tuple_with_void;
+template<typename ... Items>
 struct Convert_tuple_with_void<CGAL::cpp0x::tuple<Items...> >
 {
   typedef CGAL::cpp0x::tuple<typename Convert_void<Items>::type... > type;

Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h

@@ -60,6 +60,8 @@ namespace CGAL
 	typedef CGAL::cpp0x::tuple<typename Convert_void<Items>::type... > type;
 	};
     
+        template<typename ... T>
+        struct My_length;    
         template<typename T1, typename ... T>
 	struct My_length<CGAL::cpp0x::tuple<T1, T...> >
 	{