chiark
/
gitweb
/
~ijackson
/
d.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b1d87c0
)
numbered-alias-sheet: new paperpts arrangement
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 3 Nov 2013 23:41:16 +0000
(23:41 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 3 Nov 2013 23:41:16 +0000
(23:41 +0000)
numbered-alias-sheet
patch
|
blob
|
history
diff --git
a/numbered-alias-sheet
b/numbered-alias-sheet
index 8c2758da5463a0bd3864ee713546086e7da92d4f..600a461f065b6b82d8e11aba613cf7e123f94a5b 100755
(executable)
--- a/
numbered-alias-sheet
+++ b/
numbered-alias-sheet
@@
-5,7
+5,7
@@
our $us = $0; $us =~ s#.*/##;
use POSIX;
use Data::Dumper;
use POSIX;
use Data::Dumper;
-our
$papersize = 'creditcard'
;
+our
@paperpts = ('creditcard')
;
our $fontname_num = 'Helvetica';
our $fontscale_num = 0.8;
our $fontname = 'Courier';
our $fontname_num = 'Helvetica';
our $fontscale_num = 0.8;
our $fontname = 'Courier';
@@
-23,7
+23,7
@@
our @lp_fixed;
our $usage = <<END;
usage: $us [<options>] <foo-mail-pregen> <foo-mail-pregen-opts>...
options:
our $usage = <<END;
usage: $us [<options>] <foo-mail-pregen> <foo-mail-pregen-opts>...
options:
- -p<papersize> for libpaper, or "creditcard", default is $paper
size
+ -p<papersize> for libpaper, or "creditcard", default is $paper
pts[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
-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
+40,6
@@
END
open DEBUG, ">/dev/null" or die $!;
open DEBUG, ">/dev/null" or die $!;
-our @paperpts;
-
sub badusage () { die "bad usage\n\n$usage"; }
sub mm2pt { map { $_ * 72.0 / 25.4 } @_; }
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+)$//) {
last if m/^--?$/;
while (m/^-./) {
if (s/^-p(\w+)$//) {
- $papersize = $1;
- @paperpts = ();
+ @paperpts = ($1);
} elsif (s/^-p($dbl_re)x($dbl_re)$//o) {
} 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;
@paperpts = mm2pt($1,$2);
} elsif (s/^-f($fontname_re)$//o) {
$fontname = $fontname_num = $1;
@@
-119,12
+115,12
@@
for (;;) {
}
}
}
}
-if (
!@paperpts
) {
- if ($paper
size
eq 'creditcard') {
+if (
@paperpts==1
) {
+ if ($paper
pts[0]
eq 'creditcard') {
# ISO/IEC 7810 ID-1, from en.wikipedia.org/wiki/Payment_card
@paperpts = mm2pt qw(85.60 53.98);
} else {
# 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);
defined $r or die "paperconf failed: $? $!\n";
$r =~ m/^([0-9.]+) ([0-9.]+)$/ or die "$_ ?";
@paperpts = ($1,$2);