wider station platform; some line labels/heights fixed

diff --git a/layout/ours.m4 b/layout/ours.m4
index aa8441dbd904e9ed678177eb173910512eeea559..2ece66a9c34909d926855b147be8a7c1462a393f 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -93,7 +93,7 @@ extend -midx_x_br -demo_midx_x_br_x ang 7 316
 extend -demo_midx_x_br_x -demo_bot_0rm_b parallel demos!right_main_down -316
 part demo_bot_0rm pt_main_r b
 
-layer l
+layer s
 extend bot_0lm_a -bot_0rm_c upto demo_bot_0rm_c
 
 layer =
@@ -140,7 +140,7 @@ extend sq_br_i sq_bl_o2 upto sq_bl_o
 
 #---------- bottom junction between main loop, main-8
 
-layer l100
+layer p4
 
 rel sq_tr_o ctrlbox_bl -64 156
 extend ctrlbox_bl ctrlbox_br len 50
@@ -286,17 +286,23 @@ join top_5j3b -top_5j3c 315 arcline
 layer 10
 
 part leb_4y pt_peco_sl c leb_4e
-extend leb_4y_a sta_4neare uptoang 5 -315
+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
 
 rel sta_4neare sta_5nears 130 30
 extend sta_5nears sta_5far upto sta_4far
 
-extend -sta_5nears -sta_5neare1 len 60 -450
-extend -sta_5neare1 -sta_5neare2 len 50 450
+extend -sta_5nears -sta_5neare1 len 50 -1200
+extend -sta_5neare1 -sta_5neare2 len 50 -600
+
+extend leb_5e leb_5eb_c upto leb_4y_a
+part leb_5eb pt_peco_ml c
+extend leb_5eb_b sta_5neare3 ang 50 -315
+join sta_5neare3 sta_5neare2 352
 
-extend leb_5e leb_5eb upto leb_4y_a
-join leb_5eb sta_5neare2 352
+extend leb_5eb_a super_h0 ang 90 -315
 
 layer 20
 
@@ -328,14 +334,14 @@ join sta_6far_platnear -sta_6far_platfar 1
 layer p10
 
 rel sta_4far sta_4far_platnear 0 -14.5
-rel sta_4far_platnear sta_4far_platfar 0 -17
+rel sta_4far_platnear sta_4far_platfar 0 -45
 extend -sta_4far_platnear -sta_4neare_plat upto sta_4neare
 extend -sta_4far_platfar -sta_4nears_platfar upto sta_5nears
 join sta_4neare_plat sta_4nears_platfar 1
 join sta_4far_platnear -sta_4far_platfar 1 
 
 rel sta_5far sta_5far_platnear 0 14.5
-rel sta_5far_platnear sta_5far_platfar 0 17
+rel sta_5far_platnear sta_5far_platfar 0 30
 extend -sta_5far_platnear -sta_5neare_plat upto sta_5nears
 extend -sta_5far_platfar -sta_5neare_platfar upto sta_4neare
 join sta_5neare_platfar sta_5neare_plat 1
@@ -345,13 +351,13 @@ layer 10
 
 # turntable
 
-rel sta_4far_platnear sta_tt_mid -50 -120
+rel sta_4far_platnear sta_tt_mid -50 -148
 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
+rel sta_4neare sta_3neare 15 -76 -8
 part sta_3sc pt_peco_sr c -sta_3neare
 join leb_4y_b -sta_3sc_a 230
 
@@ -365,7 +371,7 @@ extend sta_3y0_b sta_0y1_c ang 1 -230
 part sta_0y1 pt_peco_sl c
 
 layer 10
-rel sta_4neare sta_3nears 280 -46
+rel sta_4neare sta_3nears 280 -74
 part sta_3y1 pt_peco_sl c sta_3y0_a
 join sta_3y1_a sta_3nears 450