2 files changed, 29 insertions, 23 deletions
diff --git a/src/utils/afmtodit/afmtodit.man b/src/utils/afmtodit/afmtodit.man
index df2eb072..0c79a614 100644
--- a/src/utils/afmtodit/afmtodit.man
+++ b/src/utils/afmtodit/afmtodit.man
@@ -21,13 +21,13 @@ the original English.
 .\" Like TP, but if specified indent is more than half
 .\" the current line-length - indent, use the default indent.
 .de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
+.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.  el .TP "\\$1"
 ..
 .
 .de OP
-.ie \\n(.$-1 .RI "[\ \fB\\$1\fP\ " "\\$2" "\ ]"
-.el .RB "[\ " "\\$1" "\ ]"
+.  ie \\n(.$-1 .RI "[\ \fB\\$1\fP\ " "\\$2" "\ ]"
+.  el .RB "[\ " "\\$1" "\ ]"
 ..
 .
 .
@@ -45,7 +45,7 @@ afmtodit \- create font files for use with groff \-Tps
 .in +\w'\fBafmtodit 'u
 .ti \niu
 .B afmtodit
-.OP \-mnsv
+.OP \-mnsvx
 .OP \-a n
 .OP \-d desc_file
 .OP \-e enc_file
@@ -110,7 +110,7 @@ If a PostScript character is not named as
 are four uppercase hexadecimal digits), and is not mentioned in
 .IR map_file ,
 and a generic groff glyph name can't be deduced using the
-Adobe Glyph List (built into
+Adobe Glyph List (AGL, built into
 .BR  afmtodit ),
 then
 .B afmtodit
@@ -295,6 +295,10 @@ command to the font file.
 .B \-v
 Print version.
 .
+.TP
+.B \-x
+Don't use the built-in Adobe Glyph List.
+.
 .
 .SH FILES
 .Tp \w'\fB@FONTDIR@/devps/download'u+2n
diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
index 0a4d7070..3d35049c 100644
--- a/src/utils/afmtodit/afmtodit.pl
+++ b/src/utils/afmtodit/afmtodit.pl
@@ -6046,7 +6046,7 @@ $prog =~ s@.*/@@;
 $groff_sys_fontdir = "@FONTDIR@";
 
 do 'getopts.pl';
-do Getopts('a:d:e:i:mnsv');
+do Getopts('a:d:e:i:mnsvx');
 
 if ($opt_v) {
     print "GNU afmtodit (groff) version @VERSION@\n";
@@ -6054,7 +6054,7 @@ if ($opt_v) {
 }
 
 if ($#ARGV != 2) {
-    die "usage: $prog [-mnsv] [-a angle] [-d DESC] [-e encoding]\n" .
+    die "usage: $prog [-mnsvx] [-a angle] [-d DESC] [-e encoding]\n" .
 	"       [-i n] afmfile mapfile font\n";
 }
 
@@ -6225,22 +6225,24 @@ $italic_angle = $opt_a if $opt_a;
 
 # add unencoded characters and unmapped characters of the form `uniXXXX'
 
-$i = ($#encoding > 256) ? ($#encoding + 1) : 256;
-while ($ch = each %width) {
-    if (!$in_encoding{$ch}) {
-	$encoding[$i] = $ch;
-	$i++;
-    }
-    if (!$nmap{$ch}) {
-	$u1 = $AGL_to_unicode{$ch};
-	if (!$u1 && ($ch =~ /^uni([0-9A-F]{4})$/)) {
-	    $u1 = "u" . $1;
+if (!$opt_x) {
+    $i = ($#encoding > 256) ? ($#encoding + 1) : 256;
+    while ($ch = each %width) {
+	if (!$in_encoding{$ch}) {
+	    $encoding[$i] = $ch;
+	    $i++;
 	}
-	if ($u1) {
-	    $u2 = $unicode_decomposed{$u1};
-	    $u = $u2 ? $u2 : $u1;
-	    $nmap{$ch} += 1;
-	    $map{$ch,"0"} = $u;
+	if (!$nmap{$ch}) {
+	    $u1 = $AGL_to_unicode{$ch};
+	    if (!$u1 && ($ch =~ /^uni([0-9A-F]{4})$/)) {
+		$u1 = "u" . $1;
+	    }
+	    if ($u1) {
+		$u2 = $unicode_decomposed{$u1};
+		$u = $u2 ? $u2 : $u1;
+		$nmap{$ch} += 1;
+		$map{$ch,"0"} = $u;
+	    }
 	}
     }
 }