working on top main j

diff --git a/layout/ours.m4 b/layout/ours.m4
index 2acb5912426f885a77f2f5734b9484dab329c200..850512d67b1f9a473367bbaa17e3556fe6e62443 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -1,3 +1,5 @@
+# -*- fundamental -*-
+
 include(`parts.i4')
 
 layer 10
@@ -39,7 +41,11 @@ 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
-rel top_3lk top_45x_bl 30 -74
+rel top_3lk top_45x_br 30 -37 -2
+
+layer s
+rel top_3lk top_5_ref 0 -74
+layer =
 
 extend -midx_x_bl -midx_sc_a len 10 315
 part midx_sc pt_peco_sl a
@@ -64,20 +70,15 @@ extend bot_0lk_a -bot_0rk_c upto demo_bot_0rk_c
 
 layer =
 part bot_0rk pt_main_r c
-extend -top_0rm_c -top_0rme upto bot_0rk_c
+extend -top_0rm_c top_0rme upto bot_0rk_c
 join bot_0rk_b midx_x_br 315
 
-extend -top_0rme rim_0t uptoang -90 315
+extend top_0rme top_0rme1 ang 8 315
+
+extend top_0rme1 rim_0t uptoang -90 315
 rel rim_0t rim_2t 0 -37
 rel rim_2t rim_3t 0 -37
 
-extend -bot_0rk_c -rim_0b uptoang 90 -315
-
-extend -top_0rme l0p_dj parallel demos!dualjn_tr_ic 315
-rel l0p_dj -l23_dj_ic 0 -37
-part l23_dj ^dualjn_peco_r ic
-extend l23_dj_oa l3_sh uptoang 180 -315
-
 #---------- box
 
 layer l5
@@ -85,7 +86,7 @@ layer l5
 extend bot_3lk sq_bl_o upto leb_3k
 rel sq_bl_o sq_bl_i 0 0 -90
 
-extend sq_bl_i sq_tl_o upto top_45x_bl
+extend sq_bl_i sq_tl_o upto top_5_ref
 rel sq_tl_o sq_tl_i 0 0 -90
 
 extend sq_tl_i sq_tr_o upto rim_3t
@@ -141,10 +142,32 @@ join -leb_0k top_0lm_c 315 arcsline
 #extend -top_2lk -leb_2a ang 60 -352
 #extend -top_0lm_c -leb_0a ang 60 -315
 
-part top_45x scis_shino bl
+part top_45x scis_shino br
 join top_5le top_45x_bl 450 twoarcs
 join top_4le top_45x_br 450 twoarcs
 
+#---------- top main-line/station junction
+
+rel top_0rme1 -top_2j_c 0 -37
+part top_2j pt_peco_ll c
+join top_2lk -top_2j_b 600
+
+extend top_2j_a -top_34jx_tr len 20 650
+part top_34jx cross_peco_l tr
+join top_3lk top_34jx_br 450
+
+join top_45x_tr top_34jx_bl 315
+
+#extend top_45x_tr top_4m0 ang 6 315
+#extend top_4m0 top_4m1 len 50
+
+#extend -bot_0rk_c -rim_0b uptoang 90 -315
+
+#extend top_0rme l0p_dj parallel demos!dualjn_tr_ic 315
+#rel l0p_dj -l23_dj_ic 0 -37
+#part l23_dj ^dualjn_peco_r ic
+#extend l23_dj_oa l3_sh uptoang 180 -315
+
 #---------- station
 
 # left bridge, `leb'