From: ian <ian>
Date: Mon, 9 Feb 2004 00:56:49 +0000 (+0000)
Subject: more upper sta
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=e3c801bc0aa51110b53461ef6db3d4c4986149f0;p=trains.git

more upper sta
---

diff --git a/layout/ours.m4 b/layout/ours.m4
index 9716cf2..a004000 100644
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -153,18 +153,38 @@ 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
+rel sta_near_4 sta_near_5 130 30
+extend sta_near_5 sta_far_5 upto sta_far_4
 
-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
+extend -sta_near_5 -sta_pre1_5 len 60 -450
+extend -sta_pre1_5 -sta_pre2_5 len 50 450
 
-layer =
+extend l5_cl l5_clb upto l4_j3s_a
+join l5_clb sta_pre2_5 352
+
+
+layer 20
+rel sta_near_4 sta_far_h 500 76
+part sta_jbhfar pt_peco_sl a -sta_far_h
+
+rel sq_br_i hcbr_in 230 0 -180
+extend hcbr_in hcbr_out ang 90 -230
+join -sta_jbhfar_c hcbr_in 230
 
-join l5_cl sta_near_5 352
+extend -sta_far_h -sta_near_h len 600
+part sta_jbhnear pt_peco_sl b sta_near_h
+join sta_jbhnear_a -sta_jbhfar_b 230
+extend -sta_jbhnear_c h_cblt uptoang 90 230
+
+layer 10
+
+#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 =
 
 rel sta_near_4 sta_near_3s 15 -37 -10
 part l3s_jsc pt_peco_sr c -sta_near_3s
@@ -270,7 +290,4 @@ enddef
 
 part tt tt_corner cnr -sq_br_i
 
-rel sq_br_i tc_in 230 0 -180
-extend tc_in tc_out ang 90 -230
-
 eof