libwmf-fontmap-pld.patch

   1 --- libwmf-0.2.1/fonts/libwmf-fontmap.in.orig   Sat May 19 14:12:06 2001
   2 +++ libwmf-0.2.1/fonts/libwmf-fontmap.in        Mon Jun 11 13:24:44 2001
   3 @@ -33,9 +33,9 @@
   4  fi
   5
   6  if test "x$font_dir" = "x"; then
   7 -       font_dir="@WMF_FONTDIR@"
   8 +       font_dir="@WMF_FONTDIR@ /usr/share/fonts/Type1 /usr/share/fonts/TTF"
   9  else
  10 -       font_dir="$font_dir @WMF_FONTDIR@"
  11 +       font_dir="$font_dir @WMF_FONTDIR@ /usr/share/fonts/Type1 /usr/share/fonts/TTF"
  12  fi
  13
  14  if test $echo_help = yes; then
  15 @@ -64,9 +64,9 @@
  16                 font_cwd=`pwd`;
  17                 echo scanning $i;
  18
  19 -               for j in `ls *.afm 2> /dev/null`; do
  20 -                       font_root=`echo $j | sed s/.afm//`
  21 -                       font_metrics=$font_cwd/$font_root.afm
  22 +               for j in `ls *.afm afm/*.afm 2> /dev/null`; do
  23 +                       font_root=`echo $j | sed -e 's@.*/@@' -e 's@\.afm@@'`
  24 +                       font_metrics=$font_cwd/$j
  25                         font_glyphs=
  26                         if test -r $font_cwd/$font_root.pfa; then
  27                                 font_glyphs=$font_cwd/$font_root.pfa
  28 @@ -75,10 +75,10 @@
  29                         fi
  30                         if test "x$font_glyphs" != "x"; then
  31                                 echo font: $font_root
  32 -                               FontName=`grep "FontName " $font_metrics | sed "s/FontName //"`
  33 -                               FullName=`grep "FullName " $font_metrics | sed "s/FullName //"`
  34 -                               FamilyName=`grep "FamilyName " $font_metrics | sed "s/FamilyName //"`
  35 -                               Weight=`grep "Weight " $font_metrics | sed "s/Weight //"`
  36 +                               FontName=`grep "FontName " $font_metrics | sed "s/FontName //" | tr -d '\r'`
  37 +                               FullName=`grep "FullName " $font_metrics | sed "s/FullName //" | tr -d '\r'`
  38 +                               FamilyName=`grep "FamilyName " $font_metrics | sed "s/FamilyName //" | tr -d '\r'`
  39 +                               Weight=`grep "Weight " $font_metrics | sed "s/Weight //" | tr -d '\r'`
  40                                 cd $font_pwd
  41                                 echo '<font format="type1" metrics="'$font_metrics'" glyphs="'$font_glyphs'" name="'$FontName'" fullname="'$FullName'" familyname="'$FamilyName'" weight="'$Weight'" version="0.1" alias="'$FontName'"/>' >> $font_map
  42                                 cd $font_cwd