big circle templates as well as little ones

[trains.git] / layout / dualjn.m4

diff --git a/layout/dualjn.m4 b/layout/dualjn.m4
index 87d5547b5ba98dca1470d7c0babad296b1f29adf..05807021c92c2de26805faea616cdc5516331fc4 100644 (file)
--- a/layout/dualjn.m4
+++ b/layout/dualjn.m4
@@ -1,4 +1,8 @@
+define(pt_circ, pt_peco_sr)
+define(radius_circ, 230)
+
 include(parts.i4)
+include(circles.i4)
 
 abs pt_i_c 400 800 130
 part pt_i pt_peco_cl c
@@ -24,15 +28,10 @@ extend -pt_o_c -o_begin uptoang 180 315
 #extend pt_o_a so_end uptoang 180 -315
 rel si_end so_end 0 37
 
-define(`circle',`
-abs c230l$1x$2 $1 $2 90
-extend c230l$1x$2 c230ll$1x$2 ang 359 230
-')
-
-circle(1500,400)
-circle(1040,400)
+abs tcp0_p_c 1500 1100 90
+part tcp0 tricirpair p_c
 
-circle(1500,1200)
-circle(1040,1200)
+abs tcp1_p_c 1500 400 90
+part tcp1 ^tricirpair p_c
 
 circle(600,800)