X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=gpg-key2ps%2Fgpg-key2ps;h=4fbafad840c365c569c31e4dd542b2090acfb959;hb=28f1515c0baeb2d7c3faf46bd54bcc8605610cf5;hp=e73d9a6d17d3e21d89ae45b9cbe325338ed0991e;hpb=ee693ab81febe14a8e81da19b016a47a8761b083;p=pgp-tools.git

diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps
index e73d9a6..4fbafad 100755
--- a/gpg-key2ps/gpg-key2ps
+++ b/gpg-key2ps/gpg-key2ps
@@ -121,7 +121,21 @@ print <<EOF;
 /w $w def
 /h $h def
 
-/Times-Roman findfont 9 scalefont setfont 
+/reencode {
+	exch findfont
+	dup length dict
+	begin {
+		1 index /FID eq
+		{ pop pop }
+		{ def } ifelse
+	} forall
+	/Encoding ISOLatin1Encoding def
+	currentdict
+	end
+	definefont
+} bind def
+
+/Times-Roman /trlatin1 reencode 9 scalefont setfont
 
 /newline {
 	/y y 10 sub def
@@ -253,7 +267,7 @@ while(<GPG>) {
 	}
 	# user ids
 	s/\\x([0-9a-f][0-9a-f])/ chr(hex($1)) /gie;
-	$_ = `echo "$_" | iconv -ct latin1`;
+	$_ = `echo "$_" | iconv -c -f utf-8 -t latin1`;
 	s/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/	($1) uid/;
 	# revoked user id
 	if (s/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/	($1) revuid/) {