renaming done

diff --git a/layout/ours.m4 b/layout/ours.m4
index bd9cf2683bd5bed6ba496a41a7599a1dbbb38bb4..a2165fad893ae578781a51dff5b4cedfa214f72e 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -142,85 +142,83 @@ part top_45x scis_shino tl top_4le
 
 #---------- station
 
-# up to here
-
 layer 0
 
-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
+part leb_4y pt_peco_sl c leb_4e
+extend leb_4y_a sta_4neare uptoang 5 -315
+extend sta_4neare sta_4far len 1118
 
-rel sta_near_4 sta_near_5 130 30
-extend sta_near_5 sta_far_5 upto sta_far_4
+rel sta_4neare sta_5nears 130 30
+extend sta_5nears sta_5far upto sta_4far
 
-extend -sta_near_5 -sta_pre1_5 len 60 -450
-extend -sta_pre1_5 -sta_pre2_5 len 50 450
+extend -sta_5nears -sta_5neare1 len 60 -450
+extend -sta_5neare1 -sta_5neare2 len 50 450
 
-extend leb_5e leb_5eb upto l4_j3s_a
-join leb_5eb sta_pre2_5 352
+extend leb_5e leb_5eb upto leb_4y_a
+join leb_5eb sta_5neare2 352
 
 
 layer 20
 
-rel sta_near_4 sta_far_h 500 76
-part sta_jbhfar pt_peco_sl a -sta_far_h
+rel sta_4neare sta_6far 500 76
+part sta_67r pt_peco_sl a -sta_6far
 
-rel sq_br_i hcbr_in 230 0 -180
-extend hcbr_in hcbr_out ang 90 -230
-join -sta_jbhfar_c hcbr_in 230
+rel sq_br_i high_6br0 230 0 -180
+extend high_6br0 high_6br1 ang 90 -230
+join -sta_67r_c high_6br0 230
 
-extend -sta_far_h -sta_near_h len 600
-part sta_jbhnear pt_peco_sl b sta_near_h
-join sta_jbhnear_a -sta_jbhfar_b 230
-extend -sta_jbhnear_c h_cblt uptoang 90 230
+extend -sta_6far -sta_6nears len 600
+part sta_67l pt_peco_sl b sta_6nears
+join sta_67l_a -sta_67r_b 230
+extend -sta_67l_c high_6bl5 uptoang 90 230
 
 layer p10
 
-rel sta_far_4 staplat_far_4 0 -14.5
-rel staplat_far_4 staplatb_far_4 0 -17
-extend -staplat_far_4 -staplat_near_4 upto sta_near_4
-extend -staplatb_far_4 -staplatb_nearx_4 upto sta_near_5
-join staplat_near_4 staplatb_nearx_4 1
-join staplat_far_4 -staplatb_far_4 1 
+rel sta_4far sta_4far_platnear 0 -14.5
+rel sta_4far_platnear sta_4far_platfar 0 -17
+extend -sta_4far_platnear -sta_4neare_plat upto sta_4neare
+extend -sta_4far_platfar -sta_4nears_platfar upto sta_5nears
+join sta_4neare_plat sta_4nears_platfar 1
+join sta_4far_platnear -sta_4far_platfar 1 
 
-rel sta_far_5 staplat_far_5 0 14.5
-rel staplat_far_5 staplatb_far_5 0 17
-extend -staplat_far_5 -staplat_near_5 upto sta_near_5
-extend -staplatb_far_5 -staplatb_near_5 upto sta_near_4
-join staplatb_near_5 staplat_near_5 1
-join staplat_far_5 -staplatb_far_5 1
+rel sta_5far sta_5far_platnear 0 14.5
+rel sta_5far_platnear sta_5far_platfar 0 17
+extend -sta_5far_platnear -sta_5neare_plat upto sta_5nears
+extend -sta_5far_platfar -sta_5neare_platfar upto sta_4neare
+join sta_5neare_platfar sta_5neare_plat 1
+join sta_5far_platnear -sta_5far_platfar 1
 
 layer 10
 
-rel staplat_far_4 sta_tt_mid -50 -115
+rel sta_4far_platnear sta_tt_mid -50 -115
 part sta_tt tt_atlas mid
 
-rel staplat_far_4 sta_far_2s -350 -58.5
-rel sta_far_2s sta_far_3s 100 27
-extend sta_far_3s -sta_far_j23_a ang 15 -450
-part sta_far_j23 pt_peco_sr a
-join sta_far_2s -sta_far_j23_b 230
-extend -sta_far_j23_c sta_far_23m len 160 -450
+#rel sta_4far_platnear sta_2fars -350 -58.5
+#rel sta_2fars sta_3fars 100 27
+#extend sta_3fars -sta_jfar23_a ang 15 -450
+#part sta_jfar23 pt_peco_sr a
+#join sta_2fars -sta_jfar23_b 230
+#extend -sta_jfar23_c sta_2far3m len 160 -450
 
-rel sta_near_4 sta_near_3s 15 -48 -8
-part l3s_jsc pt_peco_sr c -sta_near_3s
-join l4_j3s_b -l3s_jsc_a 230
+rel sta_4neare sta_3nears 15 -48 -8
+part sta_3sc pt_peco_sr c -sta_3nears
+join leb_4y_b -sta_3sc_a 230
 
-extend sta_near_3s l3s_jyard_c uptoang 3.5 -230
-part l3s_jyard pt_peco_sl c
+extend sta_3nears sta_3y0_c uptoang 3.5 -230
+part sta_3y0 pt_peco_sl c
 
-extend l3s_jsc_b -sc_m uptoang 90 300
+extend sta_3sc_b -leb_0sc uptoang 90 300
 
-extend l3s_jyard_b l3s_jh_c ang 1 -230
-part l3s_jh pt_peco_sl c
-extend l3s_jh_b h_8b ang 90 -230
+extend sta_3y0_b sta_0y1_c ang 1 -230
+part sta_0y1 pt_peco_sl c
+extend sta_0y1_b h_8b ang 90 -230
 
-#extend l4_j3s_b -l3s_jth_a len 20
+#extend leb_4y_b -l3s_jth_a len 20
 #part l3s_jth pt_peco_sr a
 
-#join -l3s_jth_c sta_near_3s 230 arcline
+#join -l3s_jth_c sta_3nears 230 arcline
 
-#part l3s_jsc pt_peco_sl c sta_near_3s
+#part sta_3sc pt_peco_sl c sta_3nears
 
 #---------- train houses
 
@@ -230,11 +228,11 @@ extend l3s_jh_b h_8b ang 90 -230
 
 
 
-#rel sq_br_i sta_far_4 30 300 -175
-#extend -sta_far_4 -sta_plat_4 len 1118
+#rel sq_br_i sta_4far 30 300 -175
+#extend -sta_4far -sta_plat_4 len 1118
 
-#rel sta_far_4 sta_far_5 0 30
-#extend -sta_far_5 -sta_plat_5 upto sta_plat_4
+#rel sta_4far sta_5far 0 30
+#extend -sta_5far -sta_plat_5 upto sta_plat_4
 
 #part l4_stbr pt_peco_sl a sta_plat_4
 #part l4_stbrx pt_peco_sr c -sta_plat_4
@@ -264,7 +262,7 @@ enddef
 #rel sq_br_i yard_f09 140 550 180
 #part yard yard f09
 
-part yard yard yp12_c l3s_jh_a
+part yard yard yp12_c sta_0y1_a
 
 #---------- hill branch (figure of 8)