nice layers

diff --git a/layout/layout b/layout/layout
index 14fea84cb7383a432523fce08d5a73829899dbb5..b6c43e92648cd7638a2d5c415bcda61a7bb5b59c 100755 (executable)
--- a/layout/layout
+++ b/layout/layout
@@ -1249,9 +1249,14 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
            } else {
                $limit= length($c) - 1;
                $lfn= sub {
+#my ($lfn_result)=(
                    ($output_layer eq '*' ? 1
                     : abs($_[0] - $d) <= $limit)
-                       xor $invert;
+                       xor $invert
+#)
+                           ;
+#print STDERR "output layer $output_layer; asking re $_[0] rel $d lim $limit invert $invert result $lfn_result\n";
+#$lfn_result;
                };
            }
            $ccc= '';
@@ -1267,7 +1272,7 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
            $eo->{GlobRe}= $g;
            $eo->{LayerCheck}= $lfn;
            $eo->{DrawMods}= $ccc;
-#print STDERR "created eo $eo re $eo->{GlobRe} n=$n d=$d v=$v c=$c limit=$limit\n";
+#print STDERR "created eo $eo re $eo->{GlobRe} n=$n d=$d v=$v c=$c limit=$limit cc=$cc\n";
            push @eopts, $eo;
        } else {
            die "unknown option -$_";

diff --git a/pcb/Makefile b/pcb/Makefile
index b9c6aa921d99c611b7d7a689f4b45c6f1cecd8bf..5779de4f5b7efae8c2024641108b9146d74dc88a 100644 (file)
--- a/pcb/Makefile
+++ b/pcb/Makefile
@@ -22,7 +22,8 @@ o=>$@.new && mv -f $@.new $@
                ./layout <$< $(LAYOUTOPTS) '-e*C' '-ep=rm' $o
 
 ours-l%.ps:    ours.d4 layout
-               ./layout <$< -l$* $(LAYOUTOPTS) -e'*~=5cm' -e'*~=9rm' $o
+               ./layout <$< -l$* $(LAYOUTOPTS) \
+                       -e'=5AN' -E'*~=5rsm' -e'*~=9C' -e'*=*l' $o
 
 parts.ps:      showlib.d4 layout
                ./layout <$< $(LAYOUTOPTS_ALL) $o

diff --git a/pic.make b/pic.make
index b9c6aa921d99c611b7d7a689f4b45c6f1cecd8bf..5779de4f5b7efae8c2024641108b9146d74dc88a 100644 (file)
--- a/pic.make
+++ b/pic.make
@@ -22,7 +22,8 @@ o=>$@.new && mv -f $@.new $@
                ./layout <$< $(LAYOUTOPTS) '-e*C' '-ep=rm' $o
 
 ours-l%.ps:    ours.d4 layout
-               ./layout <$< -l$* $(LAYOUTOPTS) -e'*~=5cm' -e'*~=9rm' $o
+               ./layout <$< -l$* $(LAYOUTOPTS) \
+                       -e'=5AN' -E'*~=5rsm' -e'*~=9C' -e'*=*l' $o
 
 parts.ps:      showlib.d4 layout
                ./layout <$< $(LAYOUTOPTS_ALL) $o

diff --git a/spice/Makefile b/spice/Makefile
index b9c6aa921d99c611b7d7a689f4b45c6f1cecd8bf..5779de4f5b7efae8c2024641108b9146d74dc88a 100644 (file)
--- a/spice/Makefile
+++ b/spice/Makefile
@@ -22,7 +22,8 @@ o=>$@.new && mv -f $@.new $@
                ./layout <$< $(LAYOUTOPTS) '-e*C' '-ep=rm' $o
 
 ours-l%.ps:    ours.d4 layout
-               ./layout <$< -l$* $(LAYOUTOPTS) -e'*~=5cm' -e'*~=9rm' $o
+               ./layout <$< -l$* $(LAYOUTOPTS) \
+                       -e'=5AN' -E'*~=5rsm' -e'*~=9C' -e'*=*l' $o
 
 parts.ps:      showlib.d4 layout
                ./layout <$< $(LAYOUTOPTS_ALL) $o