min radii on things; pt_shino_c is broken, comment out

diff --git a/layout/parts.i4 b/layout/parts.i4
index c5aec8fe4ea5707e0228fd168ebcd5035a50abd9..9bdee00bc5b79846e131527aec3198e7ee677ccd 100644 (file)
--- a/layout/parts.i4
+++ b/layout/parts.i4
@@ -7,36 +7,36 @@ dnl OBJNAME-EXCLUDING-L
 ')
 
 define(`def_point_ord',`
-dnl OBJNAME-EXCLUDING-PT-L ANGLE STRAIGHT-L CURVE-LONGER CURVE-DIVERGE-Y
+dnl OBJNAME-EXCLUDING-PT-L ANGLE STRAIGHT-L CURVE-LONGER CURVE-DIVERGE-Y MIN-R
  defpart pt_$1l
   abs c 200 200 0
   extend c a len $3
   rel a b $4 -$5 $2
-  join c b 0
+  join c b $6
  enddef
  def_thing_l_r(`pt_$1')
 ')
 
 define(`def_point_curve',`
-dnl OBJNAME-EXCLUDING-PT-L TIGHT-ANG TIGHT-RECT TIGHT-DIVERGE-Y SHALLOW...
+dnl OBJNAME-EXCLUDING-PT-L TIGHT-ANG TIGHT-RECT TIGHT-DIVERGE-Y SHALLOW.. MIN-R
  defpart pt_$1l
   abs c 200 200 0
   rel c a $6 -$7 $5
   rel c b $3 -$4 $2
-  join c a 0
-  join c b 0
+  join c a $8
+  join c b $8
  enddef
  def_thing_l_r(`pt_$1')
 ')
 
 define(`def_point_y',`
-dnl OBJNAME-EXCLUDING-PT HALF-ANG RECT HALF-DIVERGE-Y
+dnl OBJNAME-EXCLUDING-PT HALF-ANG RECT HALF-DIVERGE-Y MIN-R
  defpart pt_$1
   abs c 200 200 0
   rel c l $3 -$4  $2
   rel c r $3  $4 -$2
-  join c l 0
-  join c r 0
+  join c l $5
+  join c r $5
  enddef
 ')
 
@@ -53,18 +53,18 @@ dnl OBJNAME-EXCLUDING-CROSS HALF-ANG HALF-LENGTH
  enddef
 ')
 
-def_point_ord(`peco_s', 22.5, 87,  -0.5, 17)
-def_point_ord(`peco_m', 14,  126.5,-1.55,13.21)
-def_point_ord(`peco_l',  8,  160,  -0.4, 13.21)
+def_point_ord(`peco_s', 22.5, 87,  -0.5, 17,    200) # not minr 230 ?
+def_point_ord(`peco_m', 14,  126.5,-1.55,13.21, 315) # not minr 457 ?
+def_point_ord(`peco_l',  8,  160,  -0.4, 13.21, 914)
  # catalogue says 123.7 for STRAIGHT-L ?!
 
-def_point_curve(`peco_c',  10, 154.4, 13.8,  3, 156.0, 0.8)
+def_point_curve(`peco_c',  10, 154.4, 13.8,  3, 156.0, 0.8, 457)
  dnl 163.2-  } dist to markings on paper cribsheet from c
  dnl 32.8-   }
 
-def_point_y(`peco_y', 4, 127, 8.4)
+def_point_y(`peco_y', 4, 127, 8.4, 800) # not minr 762 ?
 
-def_crossing(`mythical',7,   80)
+#def_crossing(`mythical',7,   80)
 def_crossing(`peco_l',  4,   93.75)
 def_crossing(`peco_s', 12.5, 46)
 
@@ -100,7 +100,7 @@ dnl not R($5)
 
 def_point_shino(`shino_4', 136, 45, 14.25)
 def_point_shino(`shino_6', 177, 49,  9.50)
-def_point_y(`shino_y', 7.125, 140, 10.9)
+def_point_y(`shino_y', 7.125, 140, 10.9, 750) # not minr 500 ?
 
 defpart pt_shino_x3
   abs c 200 200 0
@@ -111,21 +111,22 @@ defpart pt_shino_x3
   rel strintersectc l 141
   rel strintersectb r 112
   extend c m len 215
-  join c l 1 arcline
-  join c r 1 arcline
+  join c l 315 arcline
+  join c r 315 arcline
 enddef
 
-defpart pt_shino_cl
-  abs c 200 200 -20
-  extend c a len 268 -315
-  rel a b -4 -18 10
-  join c b 1 twoarcs
-#  extend c b upto a -285
-enddef
-defpart pt_shino_cr
-  abs c 200 200 20
-  objflip pt_shino_cl c c =
-enddef
+# this one is broken, because we don't have full details
+#defpart pt_shino_cl
+#  abs c 200 200 -20
+#  extend c a len 268 -315
+#  rel a b -4 -18 10
+#  join c b 275 twoarcs
+##  extend c b upto a -285
+#enddef
+#defpart pt_shino_cr
+#  abs c 200 200 20
+#  objflip pt_shino_cl c c =
+#enddef
 
 defpart slip2_shino
  abs m 200 200 0