From: Ian Jackson Date: Sun, 28 Nov 2010 22:47:49 +0000 (+0000) Subject: layout/ours.m4: wip segment annotations for phase 2. These are PB and PC and... X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=9f6d21589be298e49bc08dc6c0f592268d6e9849;p=trains.git layout/ours.m4: wip segment annotations for phase 2. These are PB and PC and small extensions to A5 and A6. P means "provisional" and indicates that we still need to check that the various distances are as intended, and perhaps renumber, and all of this is entirely theoretical as none of it has been laid yet. --- diff --git a/layout/ours.m4 b/layout/ours.m4 index 7369d50..4b5d220 100644 --- a/layout/ours.m4 +++ b/layout/ours.m4 @@ -156,13 +156,18 @@ layer 0 rel sq_br_i bot_3rj_c 345 rel bot_0rm_c bot_2rk 0 -37 +segment -PB11 10 -PB10 extend bot_2rk bot_2rx_br len 130 +segment / part bot_3rj pt_main_r c +segment PB9 part bot_2rx slip2_pecof br +segment / join bot_3rj_b bot_2rx_bl 450 +segment -A6 extend bot_2rx_tr bot_0mx_bl len 19 1400 segmap bot_0mx_B -A5 bot_0mx_F -A6 @@ -189,20 +194,33 @@ join bot_0rj_a -bot_0lj_a 450 segment -A6 join -bot_0lj_c -bot_0lm_a 450 -segment / +segment -A5 extend bot_0mx_tl -bot_02lj_b uptoang 194 -315 +segment / + +segment PB7 +segmap PB7/P J part bot_02lj ^pt_main_r b +segmap PB7/P P +segment -PB7 part bot_23lj ^pt_main_r c -bot_02lj_c +segment -PB8 join bot_2rx_tl -bot_02lj_a 450 +segment PC6 part bot_3lj ^pt_main_r c -bot_3lk +segment / join bot_3rj_a -bot_3lj_a 450 +segment -PB7/P1 join bot_23lj_b -bot_3lj_b 315 twoarcs + +segment -PC6 120 -PC5 join bot_3lk -leb_3k 315 arcline +segment -PB6 140 -PB5 200 -PB4 join bot_23lj_a bot_2lk 450 join bot_2lk -leb_2k 352 @@ -211,7 +229,9 @@ join rim_0t bot_0rm_c 315 arcline segment / layer 2 +segment -PB11 join rim_2t bot_2rk 352 arcline +segment / layer 2 join rim_3t bot_3rj_c 315 arcline @@ -233,6 +253,8 @@ extend -leb_4e top_4le0 ang 70 315 layer 2 join -leb_3k top_3lk 389 arcsline + +segment -PB4 227 -PB3 join -leb_2k top_2lk 352 arcsline layer 0 @@ -260,22 +282,27 @@ join -top_4le1 -top_4le0 315 #---------- top main-line/station junction layer 6 +segment PB11 271 PB12 #extend -rim_2t top_2j_c len 420 -352 extend -rim_2t top_2j_c len 445 -352 #extend -rim_2t top_2j_c upto top_0rme1 -352 layer 8 +segment PB0 part top_2j pt_peco_cl c #rel top_2j_r top_2j_a #rel top_2j_l top_2j_b #part top_2j pt_pecofguess_ll c layer 4 +segment -PB3 7 -PB2 546 -PB1 extend top_2lk top_2j21 len 300 layer 8 join top_2j21 -top_2j_b 600 +segment / + layer 8 #rel top_45x_tr top_4j20_side_1 0 1 -90