From: ian <ian>
Date: Thu, 21 Oct 2004 23:14:27 +0000 (+0000)
Subject: not infinite loop
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=01f55aa666185463dee38b387c09857888953e97;p=trains.git

not infinite loop
---

diff --git a/layout/layout b/layout/layout
index 20f4ede..cead9ce 100755
--- a/layout/layout
+++ b/layout/layout
@@ -629,8 +629,8 @@ print DEBUG "ps $p0 $p1 $lenperp ($ppu)\n";
 	$pt= &$calcfn;
 	for (;;) {
 	    if ($subsegcmapreq) {
-		next if $subsegcmap{$segments[0]}++;
-		print "$segments[0]\n" or die $!;
+		print "$segments[0]\n" or die $!
+		    unless $subsegcmap{$segments[0]}++;
 	    } elsif (exists $subsegcmap{$segments[0]}) {
 		$red= $pt->{A} / (2*$pi);
 		$red *= 64;
diff --git a/layout/ours.m4 b/layout/ours.m4
index d8ed346..b488f3f 100644
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -34,7 +34,10 @@ layer 0
 abs midx_x_m 930 700 90
 part midx_x cross_peco_s m
 
+segment X1 200 X3
 extend midx_x_tr -top_0rm_b parallel demos!right_main_up 315
+
+segment X7
 part top_0rm ^pt_main_r b
 
 extend midx_x_tl -top_0lm_b parallel demos!-right_main_down -315
@@ -84,8 +87,11 @@ extend top_0rme1 rim_0t uptoang -90 315
 rel rim_0t rim_2t 0 -37
 rel rim_2t rim_3t 0 -37
 
+segment X7 200 X9
 join top_0lm_a -top_0rm_a 450
 
+segment /
+
 #---------- box
 
 layer l*