Tim Waugh e20f35
--- a2ps-4.13/afm/make_fonts_map.sh.make-fonts-map	1999-01-20 14:28:27.000000000 +0000
Tim Waugh e20f35
+++ a2ps-4.13/afm/make_fonts_map.sh	2004-12-09 12:34:45.517150083 +0000
Tim Waugh e20f35
@@ -58,23 +58,15 @@
Tim Waugh e20f35
 do
Tim Waugh e20f35
   # Extract the font name.
Tim Waugh e20f35
   name=`sed -n -e '/^FontName/{
Tim Waugh e20f35
-s/FontName[ ]*\([-a-zA-Z]*\).*/\1/p
Tim Waugh e20f35
+s/FontName[ ]*\([-a-zA-Z0-9]*\).*/\1/p
Tim Waugh e20f35
 q
Tim Waugh e20f35
 }' $file`
Tim Waugh e20f35
   shortname=`basename $file | sed -e 's/\.[^\.]*$//g'`
Tim Waugh e20f35
   if test x$name = x; then :; else
Tim Waugh e20f35
-    # This is probably not a correct AFM file.
Tim Waugh e20f35
+    # If name was empty this is probably not a correct AFM file.
Tim Waugh e20f35
     # (For instance Ogonkify's pseudo AFMs that define the encodings)
Tim Waugh e20f35
     # Forget it.
Tim Waugh e20f35
-    col1=`echo "$name$many_spaces" | sed -e 's/^\('$many_dots'\).*$/\1/g'`
Tim Waugh e20f35
-    # Make sure the name has not been cut
Tim Waugh e20f35
-    case "$col1" in
Tim Waugh e20f35
-      $name*) ;;
Tim Waugh e20f35
-      *) echo "A name has been cut ($name -> $col1)." 1>&2
Tim Waugh e20f35
-	 exit 1 ;;
Tim Waugh e20f35
-    esac
Tim Waugh e20f35
-    col2="$shortname"
Tim Waugh e20f35
-    echo "$col1$col2" >> fonts.map.new
Tim Waugh e20f35
+    printf "%-30s %s\n" $name $shortname >> fonts.map.new
Tim Waugh e20f35
   fi
Tim Waugh e20f35
 done
Tim Waugh e20f35