layer 0 finished

diff --git a/layout/ours.m4 b/layout/ours.m4
index f714fa6dda4e00c57d92df44f179d05a6dcba2ce..b5bb26afd0afb238b57f61e8307343b4d1d8cabc 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -53,28 +53,28 @@ layer 0
 extend -midx_x_bl -midx_sc_a len 10 315
 part midx_sc pt_peco_sl a
 
-extend -midx_sc_c -bot_0lk_b parallel demos!right_main_up 315
-part bot_0lk ^pt_main_r b
+extend -midx_sc_c -bot_0lm_b parallel demos!right_main_up 315
+part bot_0lm ^pt_main_r b
 
-extend -bot_0lk_c -leb_0k uptoang 90 315
+extend -bot_0lm_c -leb_0k uptoang 90 315
 rel -leb_0k -leb_2k 0 -37
 rel -leb_2k -leb_3k 0 -37
 
-rel -bot_0lk_c bot_2lk 0 -37
-rel bot_2lk bot_3lk 0 -37
+rel -bot_0lm_c bot_2lk 0 -37
+rel bot_2lk bot_3lk 74 -37
 
 layer s
 extend -midx_x_br -demo_midx_x_br_x ang 7 316
-extend -demo_midx_x_br_x -demo_bot_0rk_b parallel demos!right_main_down -316
-part demo_bot_0rk pt_main_r b
+extend -demo_midx_x_br_x -demo_bot_0rm_b parallel demos!right_main_down -316
+part demo_bot_0rm pt_main_r b
 
 layer l
-extend bot_0lk_a -bot_0rk_c upto demo_bot_0rk_c
+extend bot_0lm_a -bot_0rm_c upto demo_bot_0rm_c
 
 layer =
-part bot_0rk pt_main_r c
-extend -top_0rm_c top_0rme upto bot_0rk_c
-join bot_0rk_b midx_x_br 315
+part bot_0rm pt_main_r c
+extend -top_0rm_c top_0rme upto bot_0rm_c
+join bot_0rm_b midx_x_br 315
 
 extend top_0rme top_0rme1 ang 9 315
 
@@ -82,6 +82,8 @@ extend top_0rme1 rim_0t uptoang -90 315
 rel rim_0t rim_2t 0 -37
 rel rim_2t rim_3t 0 -37
 
+join top_0lm_a -top_0rm_a 450
+
 #---------- box
 
 layer l*
@@ -104,25 +106,46 @@ extend sq_br_i sq_bl_o2 upto sq_bl_o
 
 layer 0
 
-rel sq_br_i bot_2rk_c 315
+rel sq_br_i bot_3rj_c 315
 
-part bot_2rk pt_main_r c
-#part bot_2rkx pt_shino_6r c bot_2rk_c
-extend bot_2rk_b bot_1rk_bl uptoang 170.5 -315
-part bot_1rk slip2_shino bl
+part bot_3rj pt_main_r c
+extend bot_3rj_b bot_2rx_bl uptoang 170.5 -315
+part bot_2rx slip2_shino bl
 
-extend bot_1rk_tr bot_0mx_bl ang 0.5 315
+extend bot_2rx_tr bot_0mx_bl ang 0.5 315
 part bot_0mx cross_atlas_20m bl
-#bot_1rk_tr
 extend -bot_0mx_br -bot_0rj_b len 5 315
 part bot_0rj ^pt_main_r b
-#bot_0mx_br
-join bot_0rk_a bot_0rj_c 315
+join bot_0rm_a bot_0rj_c 315
+
+extend bot_0mx_tr -bot_0lj_b len 5 -315
+part bot_0lj pt_main_r b
+
+join bot_0rj_a -bot_0lj_a 315
+join -bot_0lj_c -bot_0lm_a 450
+
+extend bot_0mx_tl -bot_02lj_b uptoang 194 -315
+part bot_02lj ^pt_main_r b
+part bot_23lj ^pt_main_r c -bot_02lj_c
+
+join bot_2rx_tl -bot_02lj_a 450
+
+part bot_3lj ^pt_main_r c -bot_3lk
+join bot_3rj_a -bot_3lj_a 450
 
-extend bot_0mx_tr -bot_1lj_b len 5 -315
-part bot_1lj pt_main_r b
+join bot_23lj_b -bot_3lj_b 315
+join bot_3lk -leb_3k 315 arcline
 
-join bot_0rj_a -bot_1lj_a 315
+join bot_23lj_a bot_2lk 450
+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 rim_3t bot_3rj_c 315 arcline
 
 #---------- station branch curve
 
@@ -181,16 +204,6 @@ extend top_45x_tl top_5x1 len 40
 extend top_5x1 top_5x2 len 40 2000
 join top_5x2 -top_3j_a 450
 
-#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'