wip

diff --git a/dm.fig b/dm.fig
index 092fac9dbe3a899be9a9a4aeaa289533c392edd2..e7d835bb54bdac74c69b4dcc4d69caa8884ed2b5 100644 (file)
--- a/dm.fig
+++ b/dm.fig
@@ -7,63 +7,55 @@ A4
 Single
 -2
 1200 2
-6 3195 -2805 3390 -2610
-4 0 0 30 -1 14 20 0.0000 4 195 195 3195 -2610 D\001
--6
 6 4590 -2820 4785 -2565
 4 0 0 40 -1 14 20 0.0000 4 255 195 4590 -2610 @\001
 -6
-6 5490 -2760 5685 -2610
-4 0 0 40 -1 14 20 0.0000 4 150 195 5490 -2610 e\001
--6
-1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 900 -2700 225 225 900 -2700 1125 -2700
-1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1800 -2700 225 225 1800 -2700 2025 -2700
-1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 2070 -3600 225 225 2070 -3600 2295 -3600
-1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 2340 -4500 225 225 2340 -4500 2565 -4500
-1 3 0 2 0 7 21 -1 20 0.000 1 0.0000 2610 -5400 225 225 2610 -5400 2835 -5400
 1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400
 1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 6120 -4500 225 225 6120 -4500 6345 -4500
 1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 5850 -3600 225 225 5850 -3600 6075 -3600
-1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 4680 -2700 225 225 4680 -2700 4905 -2700
 1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 5580 -2700 225 225 5580 -2700 5805 -2700
 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3600 -3600 225 225 3600 -3600 3825 -3600
 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3870 -4500 225 225 3870 -4500 4095 -4500
 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 4140 -5400 225 225 4140 -5400 4365 -5400
+1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 4680 -2700 225 225 4680 -2700 4905 -2700
+1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 4365 -1575 225 225 4365 -1575 4590 -1575
+1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 360 -2700 225 225 360 -2700 585 -2700
+1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1260 -2700 225 225 1260 -2700 1485 -2700
+1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1530 -3600 225 225 1530 -3600 1755 -3600
+1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1800 -4500 225 225 1800 -4500 2025 -4500
+1 3 0 2 0 7 21 -1 20 0.000 1 0.0000 2070 -5400 225 225 2070 -5400 2295 -5400
 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3330 -2700 225 225 3330 -2700 3555 -2700
-2 1 0 2 0 7 22 -1 20 0.000 0 0 -1 0 0 2
-        2340 -4500 2610 -5400
 2 1 0 2 0 7 32 -1 -1 0.000 0 0 7 0 0 3
-        1980 -2700 3330 -2700 4140 -5400
-2 1 0 2 0 7 12 -1 -1 0.000 0 0 -1 0 0 3
-        450 -2700 1800 -2700 2340 -4500
-2 1 1 2 0 7 12 -1 -1 6.000 0 0 7 0 0 2
-        450 -2700 0 -2700
+        1305 -2700 3330 -2700 4140 -5400
 2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 2
         4410 -1800 4664 -2691
 2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 3
         3375 -2700 5580 -2700 6390 -5400
-2 2 0 2 0 7 120 -1 -1 0.000 0 0 7 0 0 5
-        1485 -5310 2295 -5310 2295 -5490 1485 -5490 1485 -5310
 2 2 0 2 0 7 130 -1 -1 0.000 0 0 7 0 0 5
         3015 -5310 3825 -5310 3825 -5490 3015 -5490 3015 -5310
-2 2 0 2 0 7 110 -1 -1 0.000 0 0 7 0 0 5
-        1215 -4410 2025 -4410 2025 -4590 1215 -4590 1215 -4410
 2 2 0 2 0 7 140 -1 -1 0.000 0 0 7 0 0 5
         5265 -5310 6075 -5310 6075 -5490 5265 -5490 5265 -5310
+2 3 0 2 0 7 40 -1 -1 0.000 0 0 7 0 0 6
+        4635 -1575 4725 -1440 5265 -1440 5265 -1710 4725 -1710 4635 -1575
+2 1 0 2 0 7 22 -1 20 0.000 0 0 -1 0 0 2
+        1800 -4500 2070 -5400
+2 1 0 2 0 7 12 -1 -1 0.000 0 0 -1 0 0 3
+        -90 -2700 1260 -2700 1800 -4500
+2 1 1 2 0 7 12 -1 -1 6.000 0 0 7 0 0 2
+        -90 -2700 -540 -2700
+2 2 0 2 0 7 120 -1 -1 0.000 0 0 7 0 0 5
+        945 -5310 1755 -5310 1755 -5490 945 -5490 945 -5310
+2 2 0 2 0 7 110 -1 -1 0.000 0 0 7 0 0 5
+        675 -4410 1485 -4410 1485 -4590 675 -4590 675 -4410
 3 2 0 2 0 7 42 -1 -1 0.000 0 0 0 3
-        3780 -1575 3195 -1935 2700 -1530
-        0.000 -1.000 0.000
-3 2 0 2 0 7 42 -1 -1 0.000 0 0 0 3
-        2700 -1530 2115 -1890 1620 -1485
+        3510 -1260 2925 -1620 2430 -1215
         0.000 -1.000 0.000
 3 2 0 2 0 7 42 -1 20 0.000 0 0 0 3
-        4860 -1620 4275 -1980 3780 -1575
+        4725 -1215 4005 -1665 3510 -1260
+        0.000 -1.000 0.000
+3 2 0 2 0 7 42 -1 -1 0.000 0 0 0 3
+        2430 -1215 1845 -1575 1350 -1170
         0.000 -1.000 0.000
-4 0 0 10 -1 14 20 0.0000 4 210 195 2250 -4410 2\001
-4 0 0 10 -1 14 20 0.0000 4 195 195 810 -2610 A\001
-4 0 0 10 -1 14 20 0.0000 4 195 195 1710 -2610 B\001
-4 0 0 10 -1 14 20 0.0000 4 210 195 1980 -3510 1\001
-4 0 0 20 -1 14 20 0.0000 4 210 390 2430 -5310 D3\001
 4 0 0 40 -1 14 20 0.0000 4 210 195 6255 -5310 2\001
 4 0 0 40 -1 14 20 0.0000 4 210 195 5715 -3510 1\001
 4 0 0 40 -1 14 20 0.0000 4 90 195 6390 -5310 "\001
@@ -77,9 +69,17 @@ Single
 4 0 0 30 -1 14 20 0.0000 4 90 195 3330 -2610 '\001
 4 0 0 30 -1 14 20 0.0000 4 210 195 3465 -3510 1\001
 4 0 0 30 -1 14 20 0.0000 4 90 195 3555 -3510 '\001
-4 0 0 40 -1 16 20 0.0000 4 315 2895 1710 -1215 Upstream git history\001
-4 0 0 10 -1 16 20 0.0000 4 240 1650 405 -2160 Breakwater\001
 4 0 0 130 -1 14 12 0.0000 4 120 720 3060 -5355 master\001
-4 0 0 120 -1 14 12 0.0000 4 120 720 1530 -5355 master\001
-4 0 0 110 -1 14 12 0.0000 4 120 720 1260 -4455 master\001
 4 0 0 140 -1 14 12 0.0000 4 120 720 5310 -5355 master\001
+4 0 0 40 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001
+4 0 0 10 -1 14 20 0.0000 4 210 195 1710 -4410 2\001
+4 0 0 10 -1 14 20 0.0000 4 195 195 270 -2610 A\001
+4 0 0 10 -1 14 20 0.0000 4 195 195 1170 -2610 B\001
+4 0 0 10 -1 14 20 0.0000 4 210 195 1440 -3510 1\001
+4 0 0 10 -1 16 20 0.0000 4 240 1650 -135 -2160 Breakwater\001
+4 0 0 120 -1 14 12 0.0000 4 120 720 990 -5355 master\001
+4 0 0 110 -1 14 12 0.0000 4 120 720 720 -4455 master\001
+4 0 0 20 -1 14 20 0.0000 4 210 390 1890 -5310 C3\001
+4 0 0 30 -1 14 20 0.0000 4 195 195 3195 -2610 C\001
+4 0 0 40 -1 14 20 0.0000 4 210 195 5490 -2610 d\001
+4 0 0 40 -1 16 20 0.0000 4 315 2895 1665 -810 Upstream git history\001