From 4de38bf975e8d283253e3164e470c3cd05dee4e1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 Nov 2013 23:44:16 +0000
Subject: [PATCH] numbered-alias-sheet: introduce canonpaper, nfc

---
 numbered-alias-sheet | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/numbered-alias-sheet b/numbered-alias-sheet
index 48056f7..ac581c8 100755
--- 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;
-- 
2.30.2