a possible top

diff --git a/layout/ours.m4 b/layout/ours.m4
index e588fae6b0dca2da7a295ee1e6bbba9547f696db..12dcdd45429a9a321db4a982c74a96782a76f9b5 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -237,7 +237,7 @@ 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 90 230
+extend -sta_67l_c high_6bl5 uptoang -30 230
 
 layer p20
 
@@ -331,7 +331,52 @@ join sc_6 sc_5 230
 
 layer 12
 extend sta_0y1_b high_6s0 ang 65 -230
-extend high_6s0 high_6s1 uptoang 0 230
+extend high_6s0 high_6s1 uptoang 15 230
+
+layer 15
+extend high_6s1 high_6s2 len 100
+
+layer 20
+rel sq_tr_i high_6s4 0 320 90
+
+layer 18
+join high_6s2 high_6s4 230
+
+#---------- high-level goods
+
+layer 20
+
+extend high_6s4 highr_6jt_c ang 45 230
+part highr_6jt pt_peco_sr c
+
+rel sta_1far -high_sta6far 0 -37
+extend high_sta6far high_sta6near upto sta_2y0_a
+
+extend highr_6jt_b highr_x_br uptoang -120 230
+
+part highr_x cross_atlas_90m br
+extend highr_x_tl highr_6out ang 15 230
+join highr_6out high_sta6far 230
+#extend -high_sta6far -highr_6out ang 30 -230
+
+layer s
+extend -highr_x_bl -demo_highr_6jb_c uptoang -90 230
+extend -sq_br_o place_highr_6jb_c upto demo_highr_6jb_c
+
+layer 20
+rel place_highr_6jb_c highr_6jb_c -5 0
+part highr_6jb pt_peco_sl 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_7out uptoang 225 -230
+rel high_sta6near high_sta7near 0 37
+join highr_7out high_sta7near 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