X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=gpg-key2ps%2Fgpg-key2ps;h=e18dbc22dad2c09d254dddf0fadd13bd6992facb;hb=2f0115f6b16472e6b0e6dd316c4dce032f6a3c19;hp=c8e58fa57cc403a61fc51331cc3020dac41a89ee;hpb=a17369aaa3f8783c7ea3ee7425e14f7c8534df18;p=pgp-tools.git

diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps
index c8e58fa..e18dbc2 100755
--- a/gpg-key2ps/gpg-key2ps
+++ b/gpg-key2ps/gpg-key2ps
@@ -85,6 +85,7 @@ if ( -x "/usr/bin/paperconf" ) {
 	chomp($h);
 } else {
 	# Default to A4.
+	print STDERR "Warning: libpaper-utils is not installed, defaulting to A4.\n";
 	$w=596;
 	$h=842;
 }
@@ -164,8 +165,6 @@ if ( $revokestyle eq "grey" ) {
 	print "	uid\n";
 	print "	0 setgray\n";
 	print "} def\n";
-} elsif ( $revokestyle eq "hide" ) {
-	print "/revuid {} def\n";
 } elsif ( $revokestyle eq "note" ) {
 	print "/revuid {\n";
 	print "	50 y moveto (uid) show\n";
@@ -222,7 +221,9 @@ while(<GPG>) {
 	# user ids
 	s/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/	($1) uid/;
 	# revoked user id
-	s/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/	($1) revuid/;
+	if (s/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/	($1) revuid/) {
+		next if $revokestyle eq "hide";
+	}
 	# subkey
 	s/^sub:[^:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	($4) ($3) $2 ($1) sbk/;
 	$numlines++;