layout/ours.m4: adjust provisional phase 2

diff --git a/layout/ours.m4 b/layout/ours.m4
index 88f0991936af16734e4515e364c490a2c59a34c9..78d7d2d710fcb9dac2436c0f70884519fa878ac8 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -156,7 +156,7 @@ layer 0
 rel sq_br_i bot_3rj_c 345
 
 rel bot_0rm_c bot_2rk 0 -37
-segment -PB11 10 -PB10
+segment -PB11 6 -PB10
 extend bot_2rk bot_2rx_br len 130
 
 segment -PC9
@@ -213,16 +213,16 @@ join bot_2rx_tl -bot_02lj_a 450
 segment PC6
 part bot_3lj ^pt_main_r c -bot_3lk
 
-segment -PC8 200 -PC7
-join bot_3rj_a -bot_3lj_a 450
+segment PC7 120 PC78 120 PC8
+join bot_3lj_a -bot_3rj_a 450
 
 segment -PB7/P1
 join bot_23lj_b -bot_3lj_b 315 twoarcs
 
-segment -PC6 120 -PC5 445 -PC4
+segment -PC6 120 -PC5 245 -PC4
 join bot_3lk -leb_3k 315 arcline
 
-segment -PB6 140 -PB5 200 -PB4
+segment -PB6 126 -PB5 330 -PB4
 join bot_23lj_a bot_2lk 450
 join bot_2lk -leb_2k 352
 
@@ -236,7 +236,7 @@ join rim_2t bot_2rk 352 arcline
 segment /
 
 layer 2
-segment -PC0 100 -PC10 320 -PC9
+segment -PC0 90 -PC10 368 -PC9
 join rim_3t bot_3rj_c 315 arcline
 segment /
 
@@ -256,10 +256,10 @@ extend -leb_4e top_4le0 ang 70 315
 #join -top_45x_br -top_4le0 550 twoarcs
 
 layer 2
-segment -PC4
+segment -PC4 637 -PC3
 join -leb_3k top_3lk 389 arcsline
 
-segment -PB4 227 -PB3
+segment -PB4 213 -PB3
 join -leb_2k top_2lk 352 arcsline
 
 layer 0
@@ -287,7 +287,7 @@ join -top_4le1 -top_4le0 315
 #---------- top main-line/station junction
 
 layer 6
-segment PB11 271 PB12
+segment PB11 221 PB12
 #extend -rim_2t top_2j_c len 420 -352
 extend -rim_2t top_2j_c len 445 -352
 #extend -rim_2t top_2j_c upto top_0rme1 -352
@@ -300,7 +300,7 @@ part top_2j pt_peco_cl c
 #part top_2j pt_pecofguess_ll c
 
 layer 4
-segment -PB3 7 -PB2 546 -PB1
+segment -PB3 7 -PB2 554 -PB1
 extend top_2lk top_2j21 len 300
 
 layer 8
@@ -342,7 +342,7 @@ join top_45x_tl top_5j3b 1000 twoarcs
 
 layer 0
 
-segment -PC4 100 -PC3
+segment -PC3
 extend top_3lk top_3u1 len 270
 
 rel -top_0rm_a top_3u2 35 -111
@@ -361,7 +361,7 @@ segment /
 layer 2
 segment PC1
 extend top_3j_b -top_3u3 len 40 -315
-segment -PC3 250 -PC1
+segment -PC3 238 -PC1
 join top_3u2 top_3u3 315 arcline
 segment /