numbered-alias-sheet: fix -T

[d.git] / numbered-alias-sheet

diff --git a/numbered-alias-sheet b/numbered-alias-sheet
index 8bda11aa9f4ee3f1c193e02c86e72bd42d6eb75c..fa356d19f4b9855160f6610fbdc622e73b7ca07e 100755 (executable)
--- a/numbered-alias-sheet
+++ b/numbered-alias-sheet
@@ -5,15 +5,16 @@ our $us = $0; $us =~ s#.*/##;
 use POSIX;
 use Data::Dumper;
 
-our $papersize =  'creditcard';
+our @paperpts = ('creditcard');
+our @bigpaperpts = ();
 our $fontname_num = 'Helvetica';
 our $fontscale_num = 0.8;
-our $fontname = 'Courier';
+our $fontname = 'Helvetica';
 our $gapratio = 1.5;
 our $lineratio = 1;
 our $blankratio = 1.0;
 our @borders = (4,4);
-our @tiles = (1,2);
+our @tiles = (1,1);
 
 our @lp_options = ( [ 'blank-below', 'blank-to-right', ],
                    [ 'landscape', 'portrait' ],
@@ -23,7 +24,8 @@ our @lp_fixed;
 our $usage = <<END;
 usage: $us [<options>] <foo-mail-pregen> <foo-mail-pregen-opts>...
 options:
-  -p<papersize>           for libpaper, or "creditcard", default is $papersize
+  -p<papersize>           for libpaper, or "creditcard", default is $paperpts[0]
+  -P<actual-papersize>    center in this; default is not to center
   -f<bothfont>            set both to same font name
   -f[<numfont>[*<scale>]],[<addrfont>]  default is $fontname_num*$fontscale_num,$fontname
   -b<border>|-b<bx>x<by>  all in mm
@@ -40,8 +42,6 @@ END
 
 open DEBUG, ">/dev/null" or die $!;
 
-our @paperpts;
-
 sub badusage () { die "bad usage\n\n$usage"; }
 
 sub mm2pt { map { $_ * 72.0 / 25.4 } @_; }
@@ -73,11 +73,13 @@ for (;;) {
     last if m/^--?$/;
     while (m/^-./) {
        if (s/^-p(\w+)$//) {
-           $papersize = $1;
-           @paperpts = ();
+           @paperpts = ($1);
+       } elsif (s/^-P(\w+)$//) {
+           @bigpaperpts = ($1);
        } elsif (s/^-p($dbl_re)x($dbl_re)$//o) {
-           $papersize = undef;
            @paperpts = mm2pt($1,$2);
+       } elsif (s/^-P($dbl_re)x($dbl_re)$//o) {
+           @bigpaperpts = mm2pt($1,$2);
        } elsif (s/^-f($fontname_re)$//o) {
            $fontname = $fontname_num = $1;
        } elsif (s/^-f(?:($fontname_re)(?:\*($dbl_re))?)?,($fontname_re)?$//o) {
@@ -98,7 +100,7 @@ for (;;) {
            $gapratio = $1;
        } elsif (s/^-B($dbl_re)$//o) {
            $blankratio = $1;
-       } elsif (s/^-T(?:(\d+)x)(\d+)?$//o) {
+       } elsif (s/^-T(?:(\d+)x)?(\d+)$//o) {
            $tiles[0] = $1 || 1;
            $tiles[1] = $2;
        } elsif (s/^-D/-/) {
@@ -119,18 +121,26 @@ for (;;) {
     }
 }
 
-if (!@paperpts) {
-    if ($papersize eq 'creditcard') {
+sub canonpaper ($) {
+    my ($pts) = @_;
+
+    return unless @$pts==1;
+    my ($name) = @$pts;
+
+    if ($name eq 'creditcard') {
        # ISO/IEC 7810 ID-1, from en.wikipedia.org/wiki/Payment_card
-       @paperpts = mm2pt qw(85.60 53.98);
+       @$pts = mm2pt qw(85.60 53.98);
     } else {
-       $!=0; $?=0; my $r = `paperconf -sp $1`;
+       $!=0; $?=0; my $r = `paperconf -sp $name`;
        defined $r or die "paperconf failed: $? $!\n";
        $r =~ m/^([0-9.]+) ([0-9.]+)$/ or die "$_ ?";
-       @paperpts = ($1,$2);
+       @$pts = ($1,$2);
     }
 }
 
+canonpaper(\@paperpts);
+canonpaper(\@bigpaperpts);
+
 @borders = mm2pt @borders;
 
 @ARGV >= 2 or badusage;
@@ -280,6 +290,9 @@ sub do_layout_recursive_search ($) {
     $eff_paper_size[$_] = $paperpts[$_] - 2.0*$borders[$_] foreach qw(0 1);
     @eff_paper_size = reverse @eff_paper_size if $lp_y{rotate_paper};
 
+    $eff_paper_size[0] >= $domain_metr[4] 
+       or return wontfit "domain suffix too long";
+
     @item_size = @core_size;
     my $blank_coord = !!$lp_y{'blank-below'};
     $item_size[$blank_coord] *= (1.0 + $blankratio);
@@ -451,6 +464,14 @@ sub write_output () {
        for ($tile[1]=0; $tile[1]<$tiles[1]; $tile[1]++) {
            prf "%% tile @tile\n";
            prf "gsave\n";
+           if (@bigpaperpts) {
+               foreach (qw(0 1)) {
+                   my $spare = $bigpaperpts[$_] - $tiles[$_] * $paperpts[$_];
+                   $spare >= 0 or die "too many tiles: will not fit!\n";
+                   prf "%s ", $spare*0.5;
+               }
+               prf "translate\n";
+           }
            prf "%s ", $tile[$_] * $paperpts[$_] foreach qw(0 1);
            prf "translate\n";
            write_output_tile($tile[0] * $pertile + 
@@ -458,6 +479,7 @@ sub write_output () {
            prf "grestore\n";
        }
     }
+    prf "showpage\n";
 }
 
 readstrings();