X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=quacks-ingredients-counts;fp=quacks-ingredients-counts;h=6ee3500196c5dcf72a75a6b7003f9b09409d6233;hb=4934af852ec58113b24eb981043d1a430e000664;hp=870970a9c718d296b1aca93b2a98ac8780ae34b1;hpb=eac753be7c665e8459f008062c7238ff04c1f57c;p=reprap-play.git

diff --git a/quacks-ingredients-counts b/quacks-ingredients-counts
index 870970a..6ee3500 100755
--- a/quacks-ingredients-counts
+++ b/quacks-ingredients-counts
@@ -29,16 +29,17 @@ sub wrtoplevel () {
     my $nrows = ceil($total / $rowsz);
     my $ix = 0;
     print "// total=$total, rowsz=$rowsz, nrows=$nrows\n";
-    foreach my $ndots (sort keys %$cs) {
-	my $c = $cs->{$ndots};
+    foreach my $nspots (sort keys %$cs) {
+	my $c = $cs->{$nspots};
 	print <<END;
   union(){
-    \$ndots = $ndots;
+    Frame(\$phase, token_pitch * [ $rowsz + 0.5, $nrows ]);
+    \$nspots = $nspots;
 END
 	while ($c--) {
 	    my $xy = sprintf "[ %5.1f, %5.1f ]",
-		$ix / $nrows - 0.5 * $rowsz,
-		$ix % $nrows - 0.5 * $nrows;
+		int($ix / $nrows) - 0.5 * ($rowsz-1),
+		$ix % $nrows - 0.5 * ($nrows-1);
 	    print "    translate(token_pitch * $xy) Token_L();\n";
 	    $ix++;
 	}