From: ian <ian>
Date: Wed, 11 Oct 2006 21:19:27 +0000 (+0000)
Subject: new upper layers
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=4771ef3ca98e9f3d5754b89bc0a0eadf21728dfc;p=trains.git

new upper layers
---

diff --git a/layout/ours.m4 b/layout/ours.m4
index 007678b..aa15216 100644
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -303,12 +303,12 @@ extend leb_5eb_b sta_5neare3 ang 50 -315
 join sta_5neare3 sta_5neare2 352
 
 layer 12
-extend leb_5eb_a super_h00 uptoang 0 -325
+extend leb_5eb_a super_h00 uptoang 5 -325
 layer 16
 extend super_h00 super_h01 len 300
-extend super_h01 super_h0 parallel sta_5nears -325
-extend super_h0 super_h10 len 400
-extend super_h10 super_h1 uptoang -1.5 800
+extend super_h01 super_h0 parallel sta_5nears -600
+extend super_h0 super_h1 len 400
+#extend super_h10 super_h1 uptoang -1.5 800
 
 layer s
 rel -sq_br_i place_super_h2 -350 0
@@ -332,34 +332,48 @@ extend super_jtrl_b super_mid uptoang 275 -315
 extend super_mid -super_jbl_b parallel super_jtrl_b 315
 part super_jbl pt_peco_ml b
 join super_jbl_a -super_jtrr_b 315 arcline
-join super_jtrl_a super_jbl_c 315 arcline
 
+layer p30
+rel super_jbl_a super_sta_l_platnear 100 -14.5
+extend super_sta_l_platnear super_sta_r_platnear len 500
+rel super_sta_l_platnear super_sta_l_platfar 0 -17
+extend super_sta_l_platfar super_sta_r_platfar upto super_sta_r_platnear
 
+join -super_sta_l_platnear super_sta_l_platfar 1.0
+join super_sta_r_platnear -super_sta_r_platfar 1.0
 
-layer 20
-
-# high-level lines and platforms
-
-rel sta_4neare sta_6far 500 76
-part sta_67r pt_peco_sl a -sta_6far
-
-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_6far -sta_6nears len 630
-part sta_67l pt_peco_sl b sta_6nears
-join sta_67l_a -sta_67r_b 230
-#extend -sta_67l_c high_6bl5 uptoang -30 230
-
-layer p20
+layer s
+extend super_jtrl_a -super_jtl_c upto super_jbl_c
 
-rel sta_6nears sta_6nears_platnear 0 -14.5
-rel sta_6nears_platnear sta_6nears_platfar 0 -17
-extend sta_6nears_platnear sta_6far_platnear upto sta_6far
-extend sta_6nears_platfar  sta_6far_platfar  upto sta_6far
-join sta_6nears_platnear -sta_6nears_platfar 1 
-join sta_6far_platnear -sta_6far_platfar 1 
+layer 30
+part super_jtl pt_peco_sr c
+join super_jtrl_a -super_jtl_a 315
+join -super_jtl_c super_jbl_c 315 arcline
+
+### layer 20
+### 
+### # high-level lines and platforms
+### 
+### rel sta_4neare sta_6far 500 76
+### part sta_67r pt_peco_sl a -sta_6far
+### 
+### 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_6far -sta_6nears len 630
+### part sta_67l pt_peco_sl b sta_6nears
+### join sta_67l_a -sta_67r_b 230
+### #extend -sta_67l_c high_6bl5 uptoang -30 230
+ 
+### layer p20
+### 
+### rel sta_6nears sta_6nears_platnear 0 -14.5
+### rel sta_6nears_platnear sta_6nears_platfar 0 -17
+### extend sta_6nears_platnear sta_6far_platnear upto sta_6far
+### extend sta_6nears_platfar  sta_6far_platfar  upto sta_6far
+### join sta_6nears_platnear -sta_6nears_platfar 1 
+### join sta_6far_platnear -sta_6far_platfar 1 
 
 # medium-level platforms
 
@@ -426,81 +440,84 @@ join sta_2y0_a sta_1far 230 arcline
 
 #---------- sort-of helix (regions sc and h)
 
-layer 0
-extend midx_j_b sc_9 len 80 -230
-
-layer 5
-rel top_0lm_c -sc_7 0 40
-
-layer 2
-extend -sc_7 -sc_8 ang 45 315
-join sc_9 sc_8 315
-
 layer 8
-extend sc_7 sc_6 ang 60 -275
-extend sta_3sc_b -sc_3 len 20 -450
-extend -sc_3 -sc_5 len 50 230
-join sc_6 sc_5 230
-
-layer 13
-extend sta_0y1_b high_6s0 ang 65 -230
-
-layer 16
-extend high_6s0 high_6s1 uptoang 15 230
-
-layer 18
-extend high_6s1 high_6s2 len 100
-
-layer 20
-#rel sq_tr_i high_6s4 0 320 90
-rel sq_tl_i -high_6s4 320 0
-
-layer 18
-join high_6s2 high_6s4 230
+extend sta_3sc_b sc_31 ang 90 260
 
-#---------- high-level goods
-
-layer 20
-
-extend high_6s4 highr_6jt_c ang 45 -230
-part highr_6jt pt_peco_sl c
+layer 6
+extend sc_31 sc_4 ang 110 230
 
-rel sta_1far -high_sta6far -10 0
-extend high_sta6far high_sta6near upto sta_2y0_a
+layer 4
+extend sc_4 sc_5 ang 140 230
 
-extend highr_6jt_b highr_x_br uptoang -60 -230
+layer 2
+extend sc_5 sc_6 ang 150 230
 
-part highr_x cross_atlas_90m br
+layer 0
+extend sc_6 sc_7 ang 30 285
 
-extend highr_x_tl highr_6sc_c ang 20 -230
-part highr_6sc pt_peco_sl c
-extend highr_6sc_a highr_6out ang 15 230
-##join highr_6out high_sta6far 230
+extend midx_j_b -sc_9 len 0.4 -230
+join sc_7 sc_9 230 arcline
 
-layer s
-extend highr_x_bl -demo_highr_6jb_c uptoang 90 -230
-extend sq_bl_i place_highr_6jb_c upto demo_highr_6jb_c
+layer 12
+rel -sc_4 high_6s0 0 37
+extend -high_6s0 -high_6s01 ang 45 267
+join sta_0y1_b high_6s01 230 arcline
 
-layer 20
-rel place_highr_6jb_c highr_6jb_c -10 0
-part highr_6jb pt_peco_sr c
-join highr_6jb_b -highr_x_bl 230
-join highr_6jt_a -highr_6jb_a 230 arcline
-##join high_6br1 highr_6jb_c 230
+layer 14
+extend high_6s0 high_6s11 ang 90 -230
+extend high_6s11 high_6s2 len 37
 
-extend -highr_x_tr highr_7kink uptoang -45 230
-extend highr_7kink -highr_7sc_a ang 30 -230
-rel high_sta6near high_sta7near 0 37
+layer 16
+extend high_6s2 high_6s3 ang 90 -230
 
-part highr_7sc pt_peco_sl a
-##join -highr_7sc_c high_sta7near 230
+layer 18
+extend high_6s3 high_6s4 parallel sta_0y1_b -230
 
-##join highr_7sc_b -highr_6sc_b 230
+layer 22
+extend high_6s4 high_6s5 ang 180 -230
 
-#part high_67j pt_peco_sr c high_6bl5
-##join high_67j_b -high_sta6near 267
-##join high_67j_a -high_sta7near 230
+layer 26
+extend high_6s5 high_6s6 ang 150 -230
 
+layer 28
+join high_6s6 -super_jtl_b 230
+
+### #---------- high-level goods
+### 
+### layer 20
+### 
+### rel sta_1far -high_sta6far -10 0
+### extend high_sta6far high_sta6near upto sta_2y0_a
+### 
+### extend highr_x_tl highr_6sc_c ang 20 -230
+### part highr_6sc pt_peco_sl c
+### extend highr_6sc_a highr_6out ang 15 230
+### ##join highr_6out high_sta6far 230
+### 
+### layer s
+### extend highr_x_bl -demo_highr_6jb_c uptoang 90 -230
+### extend sq_bl_i place_highr_6jb_c upto demo_highr_6jb_c
+### 
+### layer 20
+### rel place_highr_6jb_c highr_6jb_c -10 0
+### part highr_6jb pt_peco_sr c
+### join highr_6jb_b -highr_x_bl 230
+### join highr_6jt_a -highr_6jb_a 230 arcline
+### ##join high_6br1 highr_6jb_c 230
+### 
+### extend -highr_x_tr highr_7kink uptoang -45 230
+### extend highr_7kink -highr_7sc_a ang 30 -230
+### rel high_sta6near high_sta7near 0 37
+### 
+### part highr_7sc pt_peco_sl a
+### ##join -highr_7sc_c high_sta7near 230
+### 
+### ##join highr_7sc_b -highr_6sc_b 230
+### 
+### #part high_67j pt_peco_sr c high_6bl5
+### ##join high_67j_b -high_sta6near 267
+### ##join high_67j_a -high_sta7near 230
+### 
 #---------- shunting yard
 
 layer 10