From: ian <ian>
Date: Fri, 22 Oct 2004 23:45:27 +0000 (+0000)
Subject: many more segments labelled
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=7925686e875f240645aa3fab3cfc26c4650bd3f1;p=trains.git

many more segments labelled
---

diff --git a/layout/ours.m4 b/layout/ours.m4
index 3cbdf55..c097b63 100644
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -43,13 +43,16 @@ extend midx_x_tr -top_0rm_b parallel demos!right_main_up 315
 segment X7
 part top_0rm ^pt_main_r b
 
-segment /
-
+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
@@ -60,13 +63,23 @@ rel top_3lk top_5_ref 0 -74
 layer =
 
 layer 0
+
+segment -A2
 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
 
@@ -82,13 +95,14 @@ 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 /
-
+segment -A3 180 -A1
 join bot_0rm_b midx_x_br 315
 
 segment -X7
@@ -99,8 +113,11 @@ segment /
 rel rim_0t rim_2t 0 -37
 rel rim_2t rim_3t 0 -37
 
+segment -X6 250 -X5
 join top_0lm_a -top_0rm_a 450
 
+segment /
+
 #---------- box
 
 layer l*
@@ -138,14 +155,22 @@ 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
 part bot_0rj ^pt_main_r b
 join bot_0rm_a bot_0rj_c 450
 
 rel bot_0mx_tr -bot_0lj_b
+
+segment A6
 part bot_0lj pt_main_r b
 
+segment -A5 53 -A6
 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
@@ -185,7 +210,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