bogus th

diff --git a/layout/ours.m4 b/layout/ours.m4
index 3449518d1651f2ec0a75921e6f3ee994cf2ef8db..61c9b8c9829d398e9a11888a8ab7a2a4f5078faa 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -42,10 +42,10 @@ rel l2_ptl l3_ptl 0 -37
 rel l3_ptl l4_ptl 0 -37
 rel l4_ptl l5_ptl 0 -37
 
-extend -midx_bl hj_c len 10 315
-part hj pt_peco_sr c
+extend -midx_bl -scj_a len 10 315
+part scj pt_peco_sr a
 
-extend hj_a -l0_jbl_b parallel demos!right_main_up 315
+extend -scj_c -l0_jbl_b parallel demos!right_main_up 315
 part l0_jbl ^pt_main_r b
 
 extend -l0_jbl_c l0_lst uptoang 90 315
@@ -145,22 +145,52 @@ extend -l0_jtl_c -l0_tcl7 ang 60 -315
 
 part l45_lx scis_shino tl l4_ct
 
-part l4_shbr pt_peco_sl c l4_cl
-
 #---------- station
 
 layer 0
 
-rel sq_br_i sta_far_4 30 300 -175
-extend -sta_far_4 -sta_plat_4 len 1118
+part l4_j3s pt_peco_sl c l4_cl
+extend l4_j3s_a sta_near_4 uptoang 5 -315
+extend sta_near_4 sta_far_4 len 1118
+
+rel sta_near_4 sta_near_5 0 46
+extend sta_near_5 sta_far_5 len 1118
+
+layer l
+rel sta_near_4 staplat_near_4 0 14.5
+rel sta_near_5 staplat_near_5 0 -14.5
+extend staplat_near_4 staplat_far_4 upto sta_far_4
+extend staplat_near_5 staplat_far_5 upto sta_far_5
+
+layer =
+join l5_cl sta_near_5 352
+
+extend l4_j3s_b -l3s_jth_a len 20
+part l3s_jth pt_peco_sr a
+
+rel sta_near_4 sta_near_3s 0 -37
+join -l3s_jth_c sta_near_3s 230 arcline
+
+part l3s_jplat pt_peco_sl c sta_near_3s
+
+#---------- train houses
+
+
+extend l3s_jth_b l3th_m ang 135 230
+
+
+
+
+#rel sq_br_i sta_far_4 30 300 -175
+#extend -sta_far_4 -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_far_4 sta_far_5 0 30
+#extend -sta_far_5 -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
+#part l4_stbr pt_peco_sl a sta_plat_4
+#part l4_stbrx pt_peco_sr c -sta_plat_4
 
-extend l4_shbr_a l4_stbr_q ang 100 -315
+#extend l4_shbr_a l4_stbr_q ang 100 -315
 #join l4_shbr_a l4_stbr_c 315
 
 #---------- shunting yard
@@ -185,25 +215,25 @@ extendyard(`shunt',`12',`11')
 
 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_bre -h_brj1 len 20 230
-extend -h_brj1 -h_brjm len 30
-extend -h_brjm -h_brj0 len 30
-extend -h_brj0 -h_brh  len 80 230
-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
-join h_pbl_b h_pbl_c 230
-extend -h_pbl_b -hj_p ang 40 -270
-join hj_b hj_p 230
-
-extend h_pbl_c h_ub upto h_brh 270
-join h_ub h_8b 230
+#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_bre -h_brj1 len 20 230
+#extend -h_brj1 -h_brjm len 30
+#extend -h_brjm -h_brj0 len 30
+#extend -h_brj0 -h_brh  len 80 230
+#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
+#join h_pbl_b h_pbl_c 230
+#extend -h_pbl_b -scj_p ang 40 -270
+#join scj_b scj_p 230
+
+#extend h_pbl_c h_ub upto h_brh 270
+#join h_ub h_8b 230
 
 #---------- hill stations turntable