renaming ongoing

diff --git a/layout/ours.m4 b/layout/ours.m4
index a0b77c898ec62578280bf6fc3c5906e87af41cbe..bd9cf2683bd5bed6ba496a41a7599a1dbbb38bb4 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -35,9 +35,9 @@ part midx_x cross_peco_s m
 extend midx_x_tr -top_0rm_b parallel demos!right_main_up 315
 part top_0rm ^pt_main_r b
 
-extend midx_x_tl -top_lm_b parallel demos!-right_main_down -315
-part top_lm pt_main_r b
-rel top_lm_c top_2lk 0 -37
+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_4lk 0 -37
 rel top_4lk top_5lk 0 -37
@@ -52,52 +52,44 @@ extend -bot_0lk_c leb_0k uptoang 90 315
 rel leb_0k leb_2k 0 -37
 rel leb_2k leb_3k 0 -37
 
-rel -bot_0lk_c l2_pbl 0 -37
-rel l2_pbl l3_pbl 0 -37
+rel -bot_0lk_c bot_2lk 0 -37
+rel bot_2lk bot_3lk 0 -37
 
 layer s
 extend -midx_x_br -demo_midx_x_br_x ang 7 316
-extend -demo_midx_x_br_x -demo_l0_jbr_b parallel demos!right_main_down -316
-part demo_l0_jbr pt_main_r b
-
-# to here
-
-#extend l0_rst l0_rsb upto leb_0k
-#extend l0_rsb l0_jbr_c uptoang 180 315
-#part l0_jbr pt_main_r c
-#join l0_jbr_b midx_x_br 315 arcline
-#extend l0_jbr_b l0_test ang 135 315
+extend -demo_midx_x_br_x -demo_bot_0rk_b parallel demos!right_main_down -316
+part demo_bot_0rk pt_main_r b
 
 layer l
-extend bot_0lk_a -l0_jbr_c upto demo_l0_jbr_c
+extend bot_0lk_a -bot_0rk_c upto demo_bot_0rk_c
 
 layer =
-part l0_jbr pt_main_r c
-extend -top_0rm_c -top_0rme upto l0_jbr_c
-join l0_jbr_b midx_x_br 315
+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
 
-extend -top_0rme l0_rst uptoang -90 315
-rel l0_rst l2_rst 0 -37
-rel l2_rst l3_rst 0 -37
+extend -top_0rme rim_0t uptoang -90 315
+rel rim_0t rim_2t 0 -37
+rel rim_2t rim_3t 0 -37
 
-extend -l0_jbr_c -l0_rsb uptoang 90 -315
+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
+#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
-extend l3_pbl sq_bl_o upto leb_3k
+
+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_5lk
 rel sq_tl_o sq_tl_i 0 0 -90
 
-extend sq_tl_i sq_tr_o upto l3_rst
+extend sq_tl_i sq_tr_o upto rim_3t
 rel sq_tr_o sq_tr_i 0 0 -90
 
 extend sq_tr_i sq_br_o upto sq_bl_i
@@ -109,49 +101,52 @@ extend sq_br_i sq_bl_o2 upto sq_bl_o
 
 layer 10
 
-rel sq_br_i l2_jbr_c 315
-part l2_jbr pt_main_r c
-#part l2_jbrx pt_shino_6r c l2_jbr_c
-extend l2_jbr_b l1_jbr_bl uptoang 170.5 -315
-part l1_jbr slip2_shino bl
+rel sq_br_i bot_2rk_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
 
-extend l1_jbr_tr l01_jbmx_bl ang 0.5 315
-part l01_jbmx cross_atlas_20m bl
-#l1_jbr_tr
-extend -l01_jbmx_br -l0_jbmr_b len 5 315
-part l0_jbmr ^pt_main_r b
-#l01_jbmx_br
-join l0_jbr_a l0_jbmr_c 315
+extend bot_1rk_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
 
-extend l01_jbmx_tr -l0_jbml_b len 5 -315
-part l0_jbml pt_main_r b
+extend bot_0mx_tr -bot_1lj_b len 5 -315
+part bot_1lj pt_main_r b
 
-join l0_jbmr_a -l0_jbml_a 315
+join bot_0rj_a -bot_1lj_a 315
 
 #---------- station branch curve
 
 layer 10
 
-rel sq_tl_i l4_ct 352 37 180
-rel l4_ct l5_ct 0 37
-extend l4_ct l4_cl ang 90 -315
-extend l5_ct l5_cl ang 90 -352
+rel sq_tl_i top_4le 352 37 180
+rel top_4le top_5le 0 37
+extend top_4le leb_4e ang 90 -315
+extend top_5le leb_5e ang 90 -352
 
-extend leb_3k l3_tlc5 ang 30 389
-extend leb_2k l2_tlc5 ang 30 352
-extend leb_0k l0_tlc5 ang 30 315
+extend leb_3k leb_3b ang 30 389
+extend leb_2k leb_2b ang 30 352
+extend leb_0k leb_0b ang 30 315
 
-extend -top_3lk -l3_tlc7 ang 60 -389
-extend -top_2lk -l2_tcl7 ang 60 -352
-extend -top_lm_c -l0_tcl7 ang 60 -315
+extend -top_3lk -leb_3a ang 60 -389
+extend -top_2lk -leb_2a ang 60 -352
+extend -top_0lm_c -leb_0a ang 60 -315
 
-part l45_lx scis_shino tl l4_ct
+part top_45x scis_shino tl top_4le
 
 #---------- station
 
+# up to here
+
 layer 0
 
-part l4_j3s pt_peco_sl c l4_cl
+part l4_j3s pt_peco_sl c leb_4e
 extend l4_j3s_a sta_near_4 uptoang 5 -315
 extend sta_near_4 sta_far_4 len 1118
 
@@ -161,8 +156,8 @@ extend sta_near_5 sta_far_5 upto sta_far_4
 extend -sta_near_5 -sta_pre1_5 len 60 -450
 extend -sta_pre1_5 -sta_pre2_5 len 50 450
 
-extend l5_cl l5_clb upto l4_j3s_a
-join l5_clb sta_pre2_5 352
+extend leb_5e leb_5eb upto l4_j3s_a
+join leb_5eb sta_pre2_5 352
 
 
 layer 20