peco fits, bot j still ugly

diff --git a/layout/ours.m4 b/layout/ours.m4
index 76baac045c444459411823567f4757e2f74f6b98..88238ca90d3618a7a3e5f6d1057e8561588b5457 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -40,10 +40,12 @@ part top_0rm ^pt_main_r b
 extend midx_x_tl -top_0lm_b parallel demos!-right_main_down -315
 part top_0lm pt_main_r b
 rel top_0lm_c top_2lk 0 -37
+rel top_2lk top_3lk 0 -37
 
 layer 2
-rel top_2lk top_3lk 0 -37
-rel top_3lk top_45x_br 30 -37 -2
+#rel top_3lk top_45x_br 85 -37 -2.25
+rel top_3lk top_45x_br 67 -40 -2.55
+extend -top_45x_br -top_4le0 len 80 -900
 
 layer s
 rel top_3lk top_5_ref 0 -74
@@ -106,22 +108,40 @@ extend sq_br_i sq_bl_o2 upto sq_bl_o
 
 layer 0
 
-rel sq_br_i bot_3rj_c 315
+#rel sq_br_i bot_3rj_c 315
+rel sq_br_i bot_3rj_c 355
+
+rel bot_0rm_c bot_2rk 0 -37
+extend bot_2rk bot_2rx_br len 140
 
 part bot_3rj pt_main_r c
-extend bot_3rj_b bot_2rx_bl uptoang 170.5 -315
-part bot_2rx slip2_pecof bl
+#extend bot_3rj_b bot_2rx_bl uptoang 170 -750
+
+#part bot_2rx slip2_pecof bl
+part bot_2rx slip2_pecof br
+join bot_3rj_b bot_2rx_bl 450
+
+#extend bot_2rx_tr bot_0mx_bl ang 0.5 315
+#extend bot_2rx_tr bot_0mx_bl len 10
+#
+#extend bot_2rx_tr bot_0mx_bl ang 1 315
+#extend bot_2rx_tr bot_0mx_bl ang 0.5 -900
+#extend bot_2rx_tr bot_0mx_bl ang 0.5 -900
+#join bot_2rx_tr bot_0mx_bl 315
+extend bot_2rx_tr bot_0mx_bl len 12 315
+#extend bot_2rx_tr bot_0mx_bl len 24
+#900
 
-extend bot_2rx_tr bot_0mx_bl ang 0.5 315
 part bot_0mx cross_atlas_20m bl
-extend -bot_0mx_br -bot_0rj_b len 5 315
+extend -bot_0mx_br -bot_0rj_b len 12 -315
 part bot_0rj ^pt_main_r b
 join bot_0rm_a bot_0rj_c 315
 
-extend bot_0mx_tr -bot_0lj_b len 5 -315
+extend bot_0mx_tr -bot_0lj_b len 12 -315
 part bot_0lj pt_main_r b
 
-join bot_0rj_a -bot_0lj_a 315
+#join bot_0rj_a -bot_0lj_a 315
+join bot_0rj_a -bot_0lj_a 450
 join -bot_0lj_c -bot_0lm_a 450
 
 extend bot_0mx_tl -bot_02lj_b uptoang 194 -315
@@ -141,21 +161,21 @@ join bot_2lk -leb_2k 352
 
 join rim_0t bot_0rm_c 315 arcline
 
-rel bot_0rm_c bot_2rk 0 -37
 join rim_2t bot_2rk 352 arcline
-join bot_2rk bot_2rx_br 450
+#join bot_2rk bot_2rx_br 450
 
 join rim_3t bot_3rj_c 315 arcline
 
 #---------- station branch curve
 
 layer 5
-rel sq_tl_i -top_4le 352 37 180
-rel -top_4le -top_5le 0 37
+rel sq_tl_i -top_5le 352 0 180
 
 layer 8
-extend -top_4le leb_4e ang 90 -315
 extend -top_5le leb_5e ang 90 -352
+rel leb_5e leb_4e 0 -37
+#join -top_4le leb_4e 315
+join -leb_4e top_4le0 315
 
 layer 2
 join -leb_3k top_3lk 389 arcsline
@@ -174,8 +194,12 @@ join -leb_0k top_0lm_c 315 arcsline
 
 layer 2
 part top_45x scis_pecof br
-join top_5le top_45x_bl 450 twoarcs
-join top_4le top_45x_br 450 twoarcs
+#join top_5le top_45x_bl 450 twoarcs
+#join top_4le top_45x_br 450 twoarcs
+join top_5le top_45x_bl 600 twoarcs
+
+#join top_4le top_45x_br 600 twoarcs
+#twoarcs
 
 #---------- top main-line/station junction
 
@@ -189,7 +213,8 @@ extend top_2j_a -top_34jx_tr len 50
 part top_34jx cross_peco_l tr
 join top_3lk top_34jx_br 450
 
-join top_45x_tr top_34jx_bl 315
+#join top_45x_tr top_34jx_bl 315
+join top_45x_tr top_34jx_bl 600
 
 extend top_34jx_tl top_3j3 len 30 -700
 extend top_3j3 -top_3j_b len 30 800