renaming ongoing

diff --git a/layout/ours.m4 b/layout/ours.m4
index 42876fdb0bfe5ef212e31b4f56a937f700bd7fc1..a0b77c898ec62578280bf6fc3c5906e87af41cbe 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -29,58 +29,60 @@ enddef
 
 #---------- main line figure-of-8
 
-abs midx_m 930 700 90
-part midx cross_peco_s m
+abs midx_x_m 930 700 90
+part midx_x cross_peco_s m
 
-extend midx_tr -l0_jtr_b parallel demos!right_main_up 315
-part l0_jtr ^pt_main_r b
+extend midx_x_tr -top_0rm_b parallel demos!right_main_up 315
+part top_0rm ^pt_main_r b
 
-extend midx_tl -l0_jtl_b parallel demos!-right_main_down -315
-part l0_jtl pt_main_r b
-rel l0_jtl_c l2_ptl 0 -37
-rel l2_ptl l3_ptl 0 -37
-rel l3_ptl l4_ptl 0 -37
-rel l4_ptl l5_ptl 0 -37
+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
+rel top_2lk top_3lk 0 -37
+rel top_3lk top_4lk 0 -37
+rel top_4lk top_5lk 0 -37
 
-extend -midx_bl -j8sc_a len 10 315
-part j8sc pt_peco_sl a
+extend -midx_x_bl -midx_sc_a len 10 315
+part midx_sc pt_peco_sl a
 
-extend -j8sc_c -l0_jbl_b parallel demos!right_main_up 315
-part l0_jbl ^pt_main_r b
+extend -midx_sc_c -bot_0lk_b parallel demos!right_main_up 315
+part bot_0lk ^pt_main_r b
 
-extend -l0_jbl_c l0_lst uptoang 90 315
-rel l0_lst l2_lst 0 -37
-rel l2_lst l3_lst 0 -37
+extend -bot_0lk_c leb_0k uptoang 90 315
+rel leb_0k leb_2k 0 -37
+rel leb_2k leb_3k 0 -37
 
-rel -l0_jbl_c l2_pbl 0 -37
+rel -bot_0lk_c l2_pbl 0 -37
 rel l2_pbl l3_pbl 0 -37
 
 layer s
-extend -midx_br -demo_midx_br_x ang 7 316
-extend -demo_midx_br_x -demo_l0_jbr_b parallel demos!right_main_down -316
+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
 
-#extend l0_rst l0_rsb upto l0_lst
+# 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_br 315 arcline
+#join l0_jbr_b midx_x_br 315 arcline
 #extend l0_jbr_b l0_test ang 135 315
 
 layer l
-extend l0_jbl_a -l0_jbr_c upto demo_l0_jbr_c
+extend bot_0lk_a -l0_jbr_c upto demo_l0_jbr_c
 
 layer =
 part l0_jbr pt_main_r c
-extend -l0_jtr_c -l0_jtre upto l0_jbr_c
-join l0_jbr_b midx_br 315
+extend -top_0rm_c -top_0rme upto l0_jbr_c
+join l0_jbr_b midx_x_br 315
 
-extend -l0_jtre l0_rst uptoang -90 315
+extend -top_0rme l0_rst uptoang -90 315
 rel l0_rst l2_rst 0 -37
 rel l2_rst l3_rst 0 -37
 
 extend -l0_jbr_c -l0_rsb uptoang 90 -315
 
-extend -l0_jtre l0p_dj parallel demos!dualjn_tr_ic 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
 
@@ -89,10 +91,10 @@ extend l23_dj_oa l3_sh uptoang 180 -315
 #---------- box
 
 layer l5
-extend l3_pbl sq_bl_o upto l3_lst
+extend l3_pbl sq_bl_o upto leb_3k
 rel sq_bl_o sq_bl_i 0 0 -90
 
-extend sq_bl_i sq_tl_o upto l5_ptl
+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
@@ -135,13 +137,13 @@ rel l4_ct l5_ct 0 37
 extend l4_ct l4_cl ang 90 -315
 extend l5_ct l5_cl ang 90 -352
 
-extend l3_lst l3_tlc5 ang 30 389
-extend l2_lst l2_tlc5 ang 30 352
-extend l0_lst l0_tlc5 ang 30 315
+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 -l3_ptl -l3_tlc7 ang 60 -389
-extend -l2_ptl -l2_tcl7 ang 60 -352
-extend -l0_jtl_c -l0_tcl7 ang 60 -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
 
 part l45_lx scis_shino tl l4_ct
 
@@ -276,7 +278,7 @@ layer 20
 #rel sq_bl_i h_bl_l 230 0 180
 #extend h_bl_l h_bl_b ang 90 -230
 
-#extend -h_bl_l -h_bre upto l0_lst 230
+#extend -h_bl_l -h_bre upto leb_0k 230
 #extend -h_bre -h_brj1 len 20 230
 #extend -h_brj1 -h_brjm len 30
 #extend -h_brjm -h_brj0 len 30
@@ -284,11 +286,11 @@ layer 20
 #extend -h_brh -h_8m uptoang -35 230
 #extend -h_8m -h_8b uptoang 245 -230
 
-#rel l0_jbl_c -h_pbl_c 0 -45
-#rel l0_jbl_b -h_pbl_b 0 -45
+#rel bot_0lk_c -h_pbl_c 0 -45
+#rel bot_0lk_b -h_pbl_b 0 -45
 #join h_pbl_b h_pbl_c 230
-#extend -h_pbl_b -j8sc_p ang 40 -270
-#join j8sc_b j8sc_p 230
+#extend -h_pbl_b -midx_sc_p ang 40 -270
+#join midx_sc_b midx_sc_p 230
 
 #extend h_pbl_c h_ub upto h_brh 270
 #join h_ub h_8b 230