quacks-ingredients: -counts: Include spares in Base_White

[reprap-play.git] / quacks-ingredients-counts

diff --git a/quacks-ingredients-counts b/quacks-ingredients-counts
index ae55648450fd3a854f3b9d0439e673a0d415bac5..fefbc72a1c046874f5eafa9363acceca948780db 100755 (executable)
--- a/quacks-ingredients-counts
+++ b/quacks-ingredients-counts
@@ -26,7 +26,7 @@ our @names = split /\t/, $_;
 
 our %count;
 
-foreach my $nspots (qw(1 2 3 4)) {
+foreach my $nspots (qw(1 2 3 4 0)) {
     $_=<DATA>; chomp or die;
     xdata sub {
        my ($xcount,$xnspots) = @_;
@@ -57,10 +57,10 @@ our $max_nrows=0;
 our $max_rowsz=0;
 
 sub wrtoplevel () {
-    print "module ${which}_$name(){ ////toplevel\n";
     my $cs = $count{$name};
     my $total = 0; $total += $_ foreach values %$cs;
     return unless $total;
+    print "module ${which}_$name(){ ////toplevel\n";
     my $rowsz = ceil(sqrt($total));
     my $nrows = ceil($total / $rowsz);
     $total_count += $total;
@@ -103,8 +103,9 @@ END
 STDOUT->error and die $!;
 
 __DATA__
-White  Green   Blue    Red     Yellow  Purple  Black   Orange
-20+6   15+10   14+8    12+6    13+6    15+8    18+8    20+12
-8+3    10+5    10+5    8+5     6+5
-4+2
+White  Green   Blue    Red     Yellow  Purple  Black   Orange  Orange6 Loco    WhiteSpare
+21+6   15+10   14+8    12+6    13+6    15+8    18+8    20+12                   1+0
+9+3    10+5    10+5    8+5     6+5                                             1+0
+5+2                                                                            1+0
        13+5    10+5    10+5    10+5
+                                                               0+20    0+25