numbered-alias-sheet: new paperpts arrangement

[d.git] / numbered-alias-sheet

diff --git a/numbered-alias-sheet b/numbered-alias-sheet
index 16db545838c7cd255fd19014847d71cb064ab856..600a461f065b6b82d8e11aba613cf7e123f94a5b 100755 (executable)
--- a/numbered-alias-sheet
+++ b/numbered-alias-sheet
@@ -5,13 +5,13 @@ our $us = $0; $us =~ s#.*/##;
 use POSIX;
 use Data::Dumper;
 
-our $papersize =  'creditcard';
+our @paperpts = ('creditcard');
 our $fontname_num = 'Helvetica';
 our $fontscale_num = 0.8;
 our $fontname = 'Courier';
 our $gapratio = 1.5;
 our $lineratio = 1;
-our $blankratio = 1;
+our $blankratio = 1.0;
 our @borders = (4,4);
 our @tiles = (1,2);
 
@@ -23,14 +23,14 @@ 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]
   -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
   -T[<xtiles>x]<ytiles>   default is $tiles[0]x$tiles[1]
   -g<gapratio>            number-to-addr gap adjustment
   -l<lineratio>           inter-line space ("leading") adjustment factor
-  -b<blankratio>          (blank space size) / (text size)
+  -B<blankratio>          (blank space size) / (text size)
   -D                      debug
 END
 
@@ -40,8 +40,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,10 +71,8 @@ for (;;) {
     last if m/^--?$/;
     while (m/^-./) {
        if (s/^-p(\w+)$//) {
-           $papersize = $1;
-           @paperpts = ();
+           @paperpts = ($1);
        } elsif (s/^-p($dbl_re)x($dbl_re)$//o) {
-           $papersize = undef;
            @paperpts = mm2pt($1,$2);
        } elsif (s/^-f($fontname_re)$//o) {
            $fontname = $fontname_num = $1;
@@ -96,7 +92,7 @@ for (;;) {
            $lineratio = $1;
        } elsif (s/^-g($dbl_re)$//o) {
            $gapratio = $1;
-       } elsif (s/^-b($dbl_re)$//o) {
+       } elsif (s/^-B($dbl_re)$//o) {
            $blankratio = $1;
        } elsif (s/^-T(?:(\d+)x)(\d+)?$//o) {
            $tiles[0] = $1 || 1;
@@ -119,12 +115,12 @@ for (;;) {
     }
 }
 
-if (!@paperpts) {
-    if ($papersize eq 'creditcard') {
+if (@paperpts==1) {
+    if ($paperpts[0] eq 'creditcard') {
        # ISO/IEC 7810 ID-1, from en.wikipedia.org/wiki/Payment_card
        @paperpts = mm2pt qw(85.60 53.98);
     } else {
-       $!=0; $?=0; my $r = `paperconf -sp $1`;
+       $!=0; $?=0; my $r = `paperconf -sp $paperpts[0]`;
        defined $r or die "paperconf failed: $? $!\n";
        $r =~ m/^([0-9.]+) ([0-9.]+)$/ or die "$_ ?";
        @paperpts = ($1,$2);
@@ -280,6 +276,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);
@@ -375,7 +374,6 @@ sub write_output_tile ($) {
     my ($tile_string_off) = @_;
     my @cnr;
     my $c;
-    prf "gsave\n";
     for ($cnr[0]=0; $cnr[0]<2; $cnr[0]++) {
        for ($cnr[1]=0; $cnr[1]<2; $cnr[1]++) {
            foreach my $cnrc (qw(0 1)) {
@@ -388,7 +386,6 @@ sub write_output_tile ($) {
            }
        }
     }
-    prf "grestore gsave\n";
     prf "%s ", $borders[$_] foreach qw(0 1);
     prf "translate\n";
     if ($lp_y->{rotate_paper}) {
@@ -444,7 +441,6 @@ sub write_output_tile ($) {
            }
        }
     }
-    prf "grestore\n";
 }
 
 sub write_output () {