sta and house looking good

diff --git a/layout/ours.m4 b/layout/ours.m4
index 0ad47229edaa204339142ff157910a5d286888ca..300097693e7034472cf1b66bc9f58afdd2fde0dd 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -201,6 +201,8 @@ rel sta_4far_platnear sta_tt_mid -50 -120
 part sta_tt tt_atlas mid
 part sta_ttmotor tt_atlas_motor cout sta_tt_out90
 
+# station line 3
+
 rel sta_4neare sta_3neare 15 -48 -8
 part sta_3sc pt_peco_sr c -sta_3neare
 join leb_4y_b -sta_3sc_a 230
@@ -210,6 +212,8 @@ part sta_3y0 pt_peco_sl c
 
 extend sta_3sc_b -leb_0sc uptoang 90 300
 
+# junctions
+
 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
@@ -222,35 +226,47 @@ extend sta_3nears sta_3far len 500
 extend sta_3far sta_3far1 len 30 -650
 join sta_3far1 -sta_tt_out210 230
 
-extend sta_3y1_b sta_2nears parallel sta_3nears 230
+# station line 2
+
+part sta_2y0 pt_peco_sr c sta_3y1_b
+extend sta_2y0_b sta_2nears parallel sta_3nears 230
 extend sta_2nears sta_2far upto sta_3far1
 join sta_2far -sta_tt_out195 230
 
-#---------- train houses
+# station line 1
+
+rel sta_2far sta_1far 0 -37
+join sta_1far sta_tt_in 230
+join sta_2y0_a sta_1far 230 arcline
 
 #---------- shunting yard
 
 layer 10
 
 defobj yard
- abs f09 200 200 180
- extend -f09 -yp09_b len 400
- part yp09 pt_peco_sr b
-
  define(`extendyard',`
-  part yp$1 pt_peco_sr a yp$2_c
-  extend yp$1_b c$1 ang 15 230
-  extend c$1 f$1 upto f$2
+  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
  ')
-
- extendyard(`10',`09')
- extendyard(`11',`10')
- extendyard(`12',`11')
+ abs e 200 200 0
+ extendyard(`0',`e',`len 500',`len 500')
+ extendyard(`1',`j0_a',`len 500',`len 500')
+ extend j1_a e2a ang 2 -230
+ extend e2a near2a parallel near0a 230
+ extend near2a far2a len 400
 enddef
 
-extend sta_0y1_a yard_0e ang 15 -230
-extend yard_0e yard_0e1 ang 5 230
+extend sta_0y1_a yard_0e ang 30 -230
+part yard yard e yard_0e
+
+#---------- train houses
 
-part yard yard yp12_c yard_0e1
+extend sta_tt_out135 sta_9house parallel yard_far0a -230
+extend sta_tt_out150 sta_8house parallel yard_far0a -300
+extend sta_tt_out165 sta_7house parallel yard_far0a -430
 
 eof