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 (from parent 1:
15121ff
)
numbered-alias-sheet: introduce canonpaper, nfc
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 3 Nov 2013 23:44:16 +0000
(23:44 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 3 Nov 2013 23:44:16 +0000
(23:44 +0000)
numbered-alias-sheet
patch
|
blob
|
history
diff --git
a/numbered-alias-sheet
b/numbered-alias-sheet
index 48056f76eeb571abafcba9ea4c2fd6d1fb39d6f8..ac581c83da3016560f24bc53800dc3a7d95d1947 100755
(executable)
--- a/
numbered-alias-sheet
+++ b/
numbered-alias-sheet
@@
-115,18
+115,25
@@
for (;;) {
}
}
}
}
-if (@paperpts==1) {
- if ($paperpts[0] 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
# ISO/IEC 7810 ID-1, from en.wikipedia.org/wiki/Payment_card
- @
paper
pts = mm2pt qw(85.60 53.98);
+ @
$
pts = mm2pt qw(85.60 53.98);
} else {
} else {
- $!=0; $?=0; my $r = `paperconf -sp $
paperpts[0]
`;
+ $!=0; $?=0; my $r = `paperconf -sp $
name
`;
defined $r or die "paperconf failed: $? $!\n";
$r =~ m/^([0-9.]+) ([0-9.]+)$/ or die "$_ ?";
defined $r or die "paperconf failed: $? $!\n";
$r =~ m/^([0-9.]+) ([0-9.]+)$/ or die "$_ ?";
- @
paper
pts = ($1,$2);
+ @
$
pts = ($1,$2);
}
}
}
}
+canonpaper(\@paperpts);
+
@borders = mm2pt @borders;
@ARGV >= 2 or badusage;
@borders = mm2pt @borders;
@ARGV >= 2 or badusage;