turntable placed; hmm

diff --git a/layout/ours.m4 b/layout/ours.m4
index 9334c3741e791932666fb86b0c237b64e4dca56d..f458cb0af49ca77902dfd8a27a19e80e3045487f 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -129,22 +129,27 @@ join h_ub h_8b 230
 
 #---------- hill stations turntable
 
-layer s5
-rel sq_br_i sq_br_diag 0 0 -45
-
-layer 20
-rel sq_br_diag htt_mid 127 0 90
-extend htt_mid htt_1 len 80
-extend -htt_mid -htt_0 len 80
+defobj tt_corner
+ layer 20
+ abs mid 200 200 0
+ extend mid out len 80
+ extend -mid -in len 80
+ extend out sout ang 45 -230
+ extend -in -sin ang 45 230
+
+ layer l20
+ rel in forcirc0 80 80 0
+ rel forcirc0 forcirc1 0 -160 180
+ join forcirc0 forcirc1 0
+ join forcirc1 forcirc0 0
+
+ layer s20
+ extend sin cnr upto sout
+enddef
 
-layer l20
-rel htt_0 htt_forcirc0 80 80 0
-rel htt_forcirc0 htt_forcirc1 0 -160 180
-join htt_forcirc0 htt_forcirc1 0
-join htt_forcirc1 htt_forcirc0 0
+part tt tt_corner cnr -sq_br_i
 
-layer 20
-extend -htt_0 -htt_s0 uptoang 180  230
-extend  htt_1  htt_s1 uptoang  90 -230
+rel sq_br_i tc_in 230 0 -180
+extend tc_in tc_out ang 90 -230
 
 eof