new ours-m<layer>.ps files for layout editing; pass input file to m4 by name rather...

[trains.git] / layout / ours.m4

diff --git a/layout/ours.m4 b/layout/ours.m4
index b488f3feecb0f745fe09170a0adb6d2220b4ee60..bad343cc1919ccbe08c5dad6287291777957a73d 100644 (file)
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -27,24 +27,35 @@ defobj demos
   part dualjn_tr ^dualjn_peco_r ib -right
 enddef
 
+# positive segment direction is anticlockwise, since T rail is
+# on the inside (see informat.txt)
+
 #---------- main line figure-of-8
 
 layer 0
 
 abs midx_x_m 930 700 90
+
+segment midx_
+segmap  midx_F -X1  midx_B X2
 part midx_x cross_peco_s m
 
-segment X1 200 X3
+segment -X1 165 -X3
 extend midx_x_tr -top_0rm_b parallel demos!right_main_up 315
 
 segment X7
 part top_0rm ^pt_main_r b
 
+segment X2 155 X4
 extend midx_x_tl -top_0lm_b parallel demos!-right_main_down -315
+
+segment -X8
 part top_0lm pt_main_r b
 rel top_0lm_c top_2lk 0 -37
 rel top_2lk top_3lk 0 -37
 
+segment /
+
 layer 2
 #rel top_3lk top_45x_br 85 -37 -2.25
 rel top_3lk top_45x_br 67 -40 -2.55
@@ -55,13 +66,23 @@ rel top_3lk top_5_ref 0 -74
 layer =
 
 layer 0
+
+segment -A2/P0
 extend -midx_x_bl -midx_j_a len 10 315
+
+segment A2
 part midx_j pt_peco_sl a
 
+segment -A2 155 -A4
 extend -midx_j_c -bot_0lm_b parallel demos!right_main_up 315
+
+segment A6
 part bot_0lm ^pt_main_r b
 
+segment -X10
 extend -bot_0lm_c -leb_0k uptoang 90 315
+segment /
+
 rel -leb_0k -leb_2k 0 -37
 rel -leb_2k -leb_3k 0 -37
 
@@ -77,17 +98,25 @@ layer l
 extend bot_0lm_a -bot_0rm_c upto demo_bot_0rm_c
 
 layer =
+
+segment -A5
 part bot_0rm pt_main_r c
+
+segment -X7
 extend -top_0rm_c top_0rme upto bot_0rm_c
+
+segment -A3 180 -A1
 join bot_0rm_b midx_x_br 315
 
+segment -X7
 extend top_0rme top_0rme1 ang 9 315
-
 extend top_0rme1 rim_0t uptoang -90 315
+segment /
+
 rel rim_0t rim_2t 0 -37
 rel rim_2t rim_3t 0 -37
 
-segment X7 200 X9
+segment -X6 250 -X5
 join top_0lm_a -top_0rm_a 450
 
 segment /
@@ -129,14 +158,26 @@ extend bot_2rx_tr bot_0mx_bl len 19 1400
 
 part bot_0mx cross_pecof_s bl
 extend -bot_0mx_br -bot_0rj_b len 8
+
+segment -A5
+segmap A5/P J
 part bot_0rj ^pt_main_r b
 join bot_0rm_a bot_0rj_c 450
+segmap A5/P P
 
 rel bot_0mx_tr -bot_0lj_b
+
+segment A6
+segmap A6/P J
 part bot_0lj pt_main_r b
+segmap A6/P P
 
+segment -A5/J0 53 -A6/J0
 join bot_0rj_a -bot_0lj_a 450
+
+segment -A6
 join -bot_0lj_c -bot_0lm_a 450
+segment /
 
 extend bot_0mx_tl -bot_02lj_b uptoang 194 -315
 part bot_02lj ^pt_main_r b
@@ -153,7 +194,9 @@ join bot_3lk -leb_3k 315 arcline
 join bot_23lj_a bot_2lk 450
 join bot_2lk -leb_2k 352
 
+segment -X7 20 -X9
 join rim_0t bot_0rm_c 315 arcline
+segment /
 
 join rim_2t bot_2rk 352 arcline
 
@@ -174,7 +217,9 @@ join -leb_3k top_3lk 389 arcsline
 join -leb_2k top_2lk 352 arcsline
 
 layer 0
+segment -X10 160 -X8
 join -leb_0k top_0lm_c 315 arcsline
+segment /
 
 layer 2
 part top_45x scis_pecof br
@@ -185,18 +230,18 @@ join top_5le top_45x_bl 600 twoarcs
 layer 2
 
 rel top_0rme1 -top_2j_c 0 -37
-part top_2j pt_peco_ll c
+part top_2j pt_pecofguess_ll c
 join top_2lk -top_2j_b 600
 
 extend top_2j_a -top_34jx_tr len 50
-part top_34jx cross_peco_l tr
+part top_34jx cross_pecof_l tr
 join top_3lk top_34jx_br 450
 
 join top_45x_tr top_34jx_bl 600
 
 extend top_34jx_tl top_3j3 len 30 -700
 extend top_3j3 -top_3j_b len 30 800
-part top_3j pt_peco_ll b
+part top_3j pt_pecofguess_ll b
 
 extend -rim_3t -rim_3tt ang 45 -389
 
@@ -418,4 +463,5 @@ extend sta_tt_out135 sta_9house len 200  -230
 extend sta_tt_out150 sta_8house len 230  -400
 extend sta_tt_out165 sta_7house upto sta_8house -2000
 
+ident $Revision$
 eof