adjustments to fast junction

diff --git a/layout/ours.m4 b/layout/ours.m4
index c116d7659d29a4e67fe515a26d2cb97de73dd1a4..93971d504b51af6f00d93683d817a49d27291311 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -57,8 +57,9 @@ rel top_2lk top_3lk 0 -37
 segment /
 
 layer 8
-rel top_3lk top_45x_br 67 -39 -2.25
-extend -top_45x_br -top_4le0 len 120 -1200
+#rel top_3lk top_45x_br 67 -39 -2.25
+rel top_3lk top_45x_br 22 -47 0
+#extend -top_45x_br -top_4le1 len 45 -600
 
 layer s
 rel top_3lk top_5_ref 0 -74
@@ -113,7 +114,7 @@ extend top_0rme1 rim_0t uptoang -90 315
 segment /
 
 rel rim_0t rim_2t 0 -37
-rel rim_2t rim_3t 0 -37
+rel rim_2t rim_3t 30 -37
 
 segment -X6 250 -X5
 join top_0lm_a -top_0rm_a 450
@@ -221,7 +222,14 @@ rel sq_tl_i -top_5le 352 0 180
 layer 8
 extend -top_5le leb_5e ang 90 -352
 rel leb_5e leb_4e 0 -37
-join -leb_4e top_4le0 315
+extend -leb_4e top_4le0 ang 70 315
+#join -leb_4e top_4le0 315
+#352
+extend -top_45x_br -top_4le3 len 30 -1000
+extend -top_4le3 -top_4le2 len 30 -750
+extend -top_4le2 -top_4le1 len 30 -450
+join -top_4le1 -top_4le0 315 twoarcs
+#join -top_45x_br -top_4le0 550 twoarcs
 
 layer 2
 join -leb_3k top_3lk 389 arcsline
@@ -233,18 +241,24 @@ join -leb_0k top_0lm_c 315 arcsline
 segment /
 
 layer 8
-extend top_5le top_5re0 len 30.0 315
-extend top_5re0 top_45x_bl len 95 -1200
-part top_45x scis_pecof bl
+#extend top_5le top_5re0 len 30.0 315
+#extend top_5re0 top_45x_bl len 95 -750
+
+part top_45x scis_pecof br
+#join -top_45x_br -nr_top_45x_br 315
+#join top_5re0 top_45x_bl 1200
+join top_5le top_45x_bl 500
 
 #---------- top main-line/station junction
 
 layer 6
-extend -rim_2t top_2j_c len 450 -352
+extend -rim_2t top_2j_c len 510 -352
 #extend -rim_2t top_2j_c upto top_0rme1 -352
 
 layer 8
-part top_2j pt_peco_cl c
+part top_2j pt_peco_y c
+rel top_2j_r top_2j_a
+rel top_2j_l top_2j_b
 #part top_2j pt_pecofguess_ll c
 
 layer 4
@@ -256,11 +270,12 @@ join top_2j21 -top_2j_b 600
 layer 8
 extend top_45x_tr top_4j21 len 95 1200
 extend top_2j_a -top_4j22 len 0.010 -352
-join top_4j21 top_4j22 352 twoarcs
+join top_4j21 top_4j22 352
+#twoarcs
 
 rel -top_0rm_a top_5j3b 0 -148
-extend top_45x_tl top_5j3a len 95 -1200
-join top_5j3a top_5j3b 315 twoarcs
+#extend top_45x_tl top_5j3a len 95 -1200
+join top_45x_tl top_5j3b 315 twoarcs
 
 layer 0
 extend top_3lk top_3u1 len 330
@@ -269,8 +284,8 @@ join top_3u1 top_3u2 600
 #cross twoarcs !arcsline
 
 layer 4
-extend -rim_3t -rim_3tt1 len 14.0
-extend -rim_3tt1 -rim_3tt ang 16.0 -315
+extend -rim_3t -rim_3tt1 len 0.0
+extend -rim_3tt1 -rim_3tt ang 0.0 -315
 part top_3j pt_peco_cl c -rim_3tt
 
 layer 2