new yard; slightly longer main station

diff --git a/layout/ours.m4 b/layout/ours.m4
index 2ece66a9c34909d926855b147be8a7c1462a393f..f3327e3f0277f90f0608efd0baf0357b3770a105 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -289,7 +289,7 @@ part leb_4y pt_peco_sl c leb_4e
 extend leb_4y_a sta_4nears9 len 35 -600
 extend sta_4nears9 sta_4nears2 uptoang 0 -315
 extend sta_4nears2 sta_4neare uptoang 5 -450
-extend sta_4neare sta_4far len 1118
+extend sta_4neare sta_4far len 1148
 
 rel sta_4neare sta_5nears 130 30
 extend sta_5nears sta_5far upto sta_4far
@@ -351,7 +351,7 @@ layer 10
 
 # turntable
 
-rel sta_4far_platnear sta_tt_mid -50 -148
+rel sta_4far_platnear sta_tt_mid -80 -148
 part sta_tt tt_atlas mid
 part sta_ttmotor tt_atlas_motor cout sta_tt_out90
 
@@ -472,31 +472,66 @@ join high_67j_a -high_sta7near 230
 
 layer 10
 
-defobj yard
- define(`extendyard',`
-  part j$1 pt_peco_sr c $2
-  part k$1 pt_peco_sr c j$1_b
-  extend k$1_b near$1a ang 0.001 -230
-  extend k$1_a near$1b ang 22.501 230
-  extend near$1a far$1a $3
-  extend near$1b far$1b $4
- ')
- abs e 200 200 0
- extendyard(`0',`e',   `len 600',`len 500')
- extendyard(`1',`j0_a',`len 500',`len 400')
- extend j1_a e2a ang 2 -230
- extend e2a near2a parallel near0a 230
- extend near2a far2a len 370
-enddef
-
-extend sta_0y1_a yard_0e ang 31 -230
-part yard yard e yard_0e
+#defobj yard
+# define(`extendyard',`
+#  part j$1 pt_peco_sr c $2
+#  part k$1 pt_peco_sr c j$1_b
+#  extend k$1_a near$1a ang 0.001 -230
+##  extend k$1_a near$1b len 90
+#  extend k$1_b near$1b2 ang 22.501 -230
+#  extend near$1b2 far$1b $4
+#  extend near$1a far$1a $3
+# ')
+# abs e 200 200 0
+# extendyard(`0',`e',   `len 600',`len 500')
+# extendyard(`1',`j0_a',`len 500',`len 400')
+# extend j1_a e2a ang 2 -230
+# extend e2a near2a parallel near0a 230
+# extend near2a far2a len 370
+#enddef
+
+#extend sta_0y1_a yard_0e ang 31 -230
+#part yard yard e yard_0e
+extend sta_0y1_a yard_0e ang 0.01 -230
+
+part yard_p   pt_peco_sl c yard_0e
+part yard_pr  pt_peco_sr c yard_p_a
+part yard_pl  pt_peco_sr c yard_p_b
+part yard_pll pt_peco_sr c yard_pl_a
+
+extend yard_pr_b yard_err_s len 180
+extend yard_pr_a yard_erl_s len 120
+extend yard_pl_b yard_elr_s len 180
+extend yard_pll_b yard_ellr_s len 180
+extend yard_pll_a yard_elll_s len 120
+
+extend yard_err_s yard_err_t len 275 4500
+
+extend yard_erl_s yard_erl_t len 180 2400
+extend yard_erl_t yard_erl_u len 150 800
+extend yard_erl_u yard_erl_v len 200 300
+
+extend yard_elr_s yard_elr_t upto yard_erl_t 2400
+extend yard_elr_t yard_elr_u upto yard_erl_u 800
+extend yard_elr_u yard_elr_v len 240 315
+
+extend yard_ellr_s yard_ellr_t upto yard_erl_t 2400
+extend yard_ellr_t yard_ellr_u upto yard_erl_u 800
+extend yard_ellr_u yard_ellr_v len 260 330
+
+extend yard_elll_s yard_elll_t parallel yard_ellr_s 230
+extend yard_elll_t yard_elll_u upto yard_ellr_u 600
+extend yard_elll_u yard_elll_v len 200 365
 
 #---------- train houses
 
 extend sta_tt_out135 sta_9house len 200  -230
 extend sta_tt_out150 sta_8house len 230  -400
-extend sta_tt_out165 sta_7house upto sta_8house -2000
+extend sta_tt_out165 sta_7house len 115
+
+extend sta_8house sta_8house_b len 120
+rel sta_8house_b sta_7house_b 0 -37
+join sta_7house sta_7house_b 300
 
 ident $Revision$
 eof