layout/ours.m4: provisional phase 2 - adjust for fouling overlaps at converging junctions

diff --git a/layout/ours.m4 b/layout/ours.m4
index cbd68cd80829304f3c2e1445c8df5b6078c07d91..2352839f29e1e1d97a7d209c1df91a4f6aff1d88 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -173,7 +173,7 @@ layer 0
 rel sq_br_i bot_3rj_c 345
 
 rel bot_0rm_c bot_2rk 0 -37
-segment -PB11 10 -PB10
+segment -PB10
 extend bot_2rk bot_2rx_br len 130
 
 segment -PC9
@@ -230,7 +230,7 @@ join bot_2rx_tl -bot_02lj_a 450
 segment PC5
 part bot_3lj ^pt_main_r c -bot_3lk
 
-segment PC6 120 PC7 120 PC8
+segment PC6 211 PC7 181 PC8
 join bot_3lj_a -bot_3rj_a 450
 
 segment -PB7/P1
@@ -239,7 +239,7 @@ join bot_23lj_b -bot_3lj_b 315 twoarcs
 segment -PC5 120 -PC4 245 -PC3
 join bot_3lk -leb_3k 315 arcline
 
-segment -PB6 120 -PB5 336 -PB4
+segment -PB6 234 -PB5 222 -PB4
 join bot_23lj_a bot_2lk 450
 join bot_2lk -leb_2k 352
 
@@ -248,8 +248,8 @@ join rim_0t bot_0rm_c 315 arcline
 segment /
 
 layer 2
-segment -PB11
-join rim_2t bot_2rk 352 arcline
+segment PB10 146 PB11
+join -bot_2rk -rim_2t 352 arcline
 segment /
 
 layer 2
@@ -317,7 +317,7 @@ part top_2j pt_peco_cl c
 #part top_2j pt_pecofguess_ll c
 
 layer 4
-segment -PB3 8 -PB2 567 -PB1
+segment -PB3 8 -PB2 493 -PB1
 extend top_2lk top_2j21 len 300
 
 layer 8