[Pgp-tools-commit] r745 - in trunk: debian gpg-key2latex

[Guilhem Moulin]

Author: guilhem-guest
Date: 2014-12-12 01:08:00 +0000 (Fri, 12 Dec 2014)
New Revision: 745

Modified:
   trunk/debian/changelog
   trunk/gpg-key2latex/gpg-key2latex
Log:
Add a fixed 4 module wide quiet zone around QR codes.

As specified in the standard. Closes #772854.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2014-12-11 23:53:59 UTC (rev 744)
+++ trunk/debian/changelog	2014-12-12 01:08:00 UTC (rev 745)
@@ -16,6 +16,9 @@
       field. (Closes: #771436)
   * keyart:
     + Replace shebang by /usr/bin/python.
+  * gpg-key2latex
+    + Add a fixed 4 module wide quiet zone around QR codes as specified in the
+      standard. (Closes: #772854)
 
  -- Guilhem Moulin <guilhem at guilhem.org>  Mon, 17 Nov 2014 16:49:51 +0100
 

Modified: trunk/gpg-key2latex/gpg-key2latex
===================================================================
--- trunk/gpg-key2latex/gpg-key2latex	2014-12-11 23:53:59 UTC (rev 744)
+++ trunk/gpg-key2latex/gpg-key2latex	2014-12-12 01:08:00 UTC (rev 745)
@@ -221,7 +221,7 @@
             close $rfd or die "Can't close: $!";
             dup2 (fileno $wfd, 1);
             close $wfd or die "Can't close: $!";
-            exec qw/qrencode -i -m0 -d300 -tEPS -o -/, "OPENPGP4FPR:$key{fpr}" or die "Can't exec: $!";
+            exec qw/qrencode -i -d300 -tEPS -o -/, "OPENPGP4FPR:$key{fpr}" or die "Can't exec: $!";
         }
     }
 
@@ -354,7 +354,7 @@
             if defined $key->{photo};
         print "      ".($#{$key->{uids}} < 1.5*$options{'attr-height'} ? "~" : "\\\\[1ex]")."%\n"
             if defined $key->{photo} and defined $key->{qrcode};
-        print "      \\includegraphics[height=$options{'attr-height'}\\baselineskip,max width=5\\baselineskip,raise=-.3\\baselineskip]{$key->{qrcode}}%\n"
+        print "      \\includegraphics[padding=-1ex,height=$options{'attr-height'}\\baselineskip,max width=5\\baselineskip,raise=-.3\\baselineskip]{$key->{qrcode}}%\n"
             if defined $key->{qrcode};
         print "    }%\n";
     }