From: ian <ian>
Date: Fri, 6 Feb 2004 23:49:10 +0000 (+0000)
Subject: make globre be right
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=bd11c9318ac8a402c4c156adc7543866c6746354;p=trains.git

make globre be right
---

diff --git a/layout/layout b/layout/layout
index 4c0712f..35bbcac 100755
--- a/layout/layout
+++ b/layout/layout
@@ -945,14 +945,19 @@ sub layer_draw ($$) {
 	$r= 'ARSCLMNO';
     }
     foreach $eo (@eopts) {
+print STDERR "layer_draw E ($k,$l) /^$eo->{GlobRe}/\n";
 	next unless $k =~ m/^$eo->{GlobRe}$/;
+print STDERR "layer_draw E ($k,$l) lc\n";
 	next unless &{ $eo->{LayerCheck} }($l);
+print STDERR "layer_draw E ($k,$l) amend $eo->{DrawMods}\n";
 	foreach $cc (split //, $eo->{DrawMods}) {
 	    $r =~ s/$cc//ig;
 	    $r .= $cc if $cc =~ m/[A-Z]/;
 	}
     }
+print STDERR "layer_draw A ($k,$l) = $r\n";
     $r= &{ $ctx->{DrawMap} }($r);
+print STDERR "layer_draw B ($k,$l) = $r\n";
     return $r;
 }
 
@@ -1220,7 +1225,7 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
 	       ([a-z]+)//ix) {
 	    my ($ee,$g,$n,$d,$c,$v,$cc) = ($1,$2,$3,$4,$5,$6,$7);
 	    my ($eo, $invert, $lfn, $ccc, $sense,$limit);
-	    $g =~ s/[?*]/\\$&/g;
+	    $g =~ s/\?/\./g; $g =~ s/\*/\.\*/g;
 	    $d= $output_layer if !length $d;
 	    $d= 5 if $d eq '*';
 	    $invert= length $n;
diff --git a/layout/ours.m4 b/layout/ours.m4
index d47fd9c..d115f75 100644
--- a/layout/ours.m4
+++ b/layout/ours.m4
@@ -109,9 +109,36 @@ layer 10
 
 rel sq_br_i l2_jbr_c 315
 part l2_jbr pt_main_r c
-extend l2_jbr_b -l1_jbr_b len 43.7
-part l1_jbr pt_main_r b
-part l0_jbm scis_shino bl -l1_jbr_c
+#part l2_jbrx pt_shino_6r c l2_jbr_c
+extend l2_jbr_b l1_jbr_bl uptoang 170.5 -315
+part l1_jbr slip2_shino bl
+
+extend l1_jbr_tr l01_jbmx_bl ang 0.5 315
+part l01_jbmx cross_atlas_20m bl
+#l1_jbr_tr
+extend -l01_jbmx_br -l0_jbmr_b len 5 315
+part l0_jbmr ^pt_main_r b
+#l01_jbmx_br
+join l0_jbr_a l0_jbmr_c 315
+
+extend l01_jbmx_tr -l0_jbml_b len 5 -315
+part l0_jbml pt_main_r b
+
+join l0_jbmr_a -l0_jbml_a 315
+
+#extend l0_jbr_a l0_jbmr_c len 30 315
+#part l0_jbmr ^pt_main_r c
+
+#part l0_jbmr pt_peco_y l l01_jbmx_br
+
+##l2_jbrx_b
+#extend l1_jbr_tr -l0_jbm_b uptoang 166 315
+#part l0_jbm pt_main_r b
+##part l0_jbm pt_shino_6r b -l1_jbr_tr
+
+#part l0_jblt ^pt_main_r c -l0_jbm_c
+##part l0_
+##part l0_jbltx cross_mythical br l0_jblt_b
 
 #---------- station branch curve
 
diff --git a/pcb/Makefile b/pcb/Makefile
index 5bc894a..78309a6 100644
--- a/pcb/Makefile
+++ b/pcb/Makefile
@@ -17,7 +17,7 @@ o=>$@.new && mv -f $@.new $@
 		m4 -s <$< $o
 
 %-a.ps:		%.d4 layout
-		./layout <$< $(LAYOUTOPTS) $o
+		./layout <$< $(LAYOUTOPTS) '-E*l' $o
 
 ours-l%.ps:	ours.d4 layout
 		./layout <$< $(LAYOUTOPTS) $o
diff --git a/pic.make b/pic.make
index 5bc894a..78309a6 100644
--- a/pic.make
+++ b/pic.make
@@ -17,7 +17,7 @@ o=>$@.new && mv -f $@.new $@
 		m4 -s <$< $o
 
 %-a.ps:		%.d4 layout
-		./layout <$< $(LAYOUTOPTS) $o
+		./layout <$< $(LAYOUTOPTS) '-E*l' $o
 
 ours-l%.ps:	ours.d4 layout
 		./layout <$< $(LAYOUTOPTS) $o
diff --git a/spice/Makefile b/spice/Makefile
index 5bc894a..78309a6 100644
--- a/spice/Makefile
+++ b/spice/Makefile
@@ -17,7 +17,7 @@ o=>$@.new && mv -f $@.new $@
 		m4 -s <$< $o
 
 %-a.ps:		%.d4 layout
-		./layout <$< $(LAYOUTOPTS) $o
+		./layout <$< $(LAYOUTOPTS) '-E*l' $o
 
 ours-l%.ps:	ours.d4 layout
 		./layout <$< $(LAYOUTOPTS) $o