X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=gpg-key2ps%2Fgpg-key2ps;h=9498e6b04bac513d23f262e80353efb99b0be9cb;hb=f1073482adc7c4989676dfc098dc8fb80864bebe;hp=5b875856fd6d09b102f04db3a06790627001a374;hpb=4a7f8a7988a5fbf3a1884ee121c8b87d4c547803;p=pgp-tools.git

diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps
index 5b87585..9498e6b 100755
--- a/gpg-key2ps/gpg-key2ps
+++ b/gpg-key2ps/gpg-key2ps
@@ -165,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";
@@ -223,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++;
@@ -237,6 +237,8 @@ unless ($started) {
 	exit 1;
 }
 
+print STDERR "numlines $numlines\n";
+
 # output the remaining postscript
 print <<EOF;
 } def