revert 1.90 - useless; but keep curved point

diff --git a/layout/ours.m4 b/layout/ours.m4
index 74bdb8ca46a3c5260b84e4783b39ed8ef6d0c166..504de23d671c67556aecef73242612cd78fc7e5c 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -260,8 +260,8 @@ join -top_4le1 -top_4le0 315
 #---------- top main-line/station junction
 
 layer 6
-extend -rim_2t top_2j_c len 420 -352
-#extend -rim_2t top_2j_c len 480 -352
+#extend -rim_2t top_2j_c len 420 -352
+extend -rim_2t top_2j_c len 440 -352
 #extend -rim_2t top_2j_c upto top_0rme1 -352
 
 layer 8
@@ -281,10 +281,9 @@ layer 8
 #rel top_45x_tr top_4j20_side_1 0 1 -90
 #rel top_45x_tr top_4j20_side_2 0 2 -90
 
-extend top_45x_tr top_4j22 len 140 1000
-extend top_4j22 top_4j21 len 40 700
-extend top_4j21 top_4j20 len 40 500
-
+extend top_45x_tr top_4j22 len 180 1000
+extend top_4j22 top_4j21 len 80
+#extend top_4j20 top_4j21 len 30 800
 #extend top_4j21 top_4j22 len 30 450
 
 #extend top_45x_tr top_4j20 len 20 600
@@ -300,7 +299,7 @@ extend top_4j21 top_4j20 len 40 500
 
 #extend  -top_4j22 len 0.010 -352
 
-join top_4j20 -top_2j_a 352
+join top_4j21 -top_2j_a 315 twoarcs
 #twoarcs
 
 rel -top_0rm_a top_5j3b 0 -148
@@ -309,10 +308,10 @@ rel -top_0rm_a top_5j3b 0 -148
 join top_45x_tl top_5j3b 1000 twoarcs
 
 layer 0
-rel top_3lk top_3u1 330 1
-join top_3lk top_3u1 500
-rel -top_0rm_a top_3u2 0.35 -113 -3
-join top_3u1 top_3u2 315 cross twoarcs !arcsline
+extend top_3lk top_3u1 len 330
+rel -top_0rm_a top_3u2 35 -111
+join top_3u1 top_3u2 600
+#cross twoarcs !arcsline
 
 layer 4
 extend -rim_3t -rim_3tt1 len 30.0