working on sta tt

diff --git a/layout/ours.m4 b/layout/ours.m4
index 62381f210f832fc9114196ea667eb0e795e03f44..42876fdb0bfe5ef212e31b4f56a937f700bd7fc1 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -195,6 +195,9 @@ join staplat_far_5 -staplatb_far_5 1
 
 layer 10
 
+rel staplat_far_4 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
@@ -244,21 +247,27 @@ extend l3s_jh_b h_8b ang 90 -230
 
 #---------- shunting yard
 
-layer 0
+layer 10
 
-rel sq_br_i shunt_f09 140 550 180
-extend -shunt_f09 -shunt_yp09_b len 400
-part shunt_yp09 pt_peco_sr b
+defobj yard
+ abs f09 200 200 180
+ extend -f09 -yp09_b len 400
+ part yp09 pt_peco_sr b
 
-define(`extendyard',`
- part $1_yp$2 pt_peco_sr a $1_yp$3_c
- extend $1_yp$2_b $1_f$2 upto $1_f$3
-')
+ define(`extendyard',`
+  part yp$1 pt_peco_sr a yp$2_c
+  extend yp$1_b f$1 upto f$2
+ ')
+
+ extendyard(`10',`09')
+ extendyard(`11',`10')
+ extendyard(`12',`11')
+enddef
 
-extendyard(`shunt',`10',`09')
-extendyard(`shunt',`11',`10')
-extendyard(`shunt',`12',`11')
+#rel sq_br_i yard_f09 140 550 180
+#part yard yard f09
 
+part yard yard yp12_c l3s_jh_a
 
 #---------- hill branch (figure of 8)