numbered-alias-sheet: introduce canonpaper, nfc

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
-       @paperpts = mm2pt qw(85.60 53.98);
+       @$pts = mm2pt qw(85.60 53.98);
     } 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 "$_ ?";
-       @paperpts = ($1,$2);
+       @$pts = ($1,$2);
     }
 }
 
+canonpaper(\@paperpts);
+
 @borders = mm2pt @borders;
 
 @ARGV >= 2 or badusage;