- updated to 0.2.12 from github fork

[packages/libwmf.git] / libwmf-fontmap-pld.patch

diff --git a/libwmf-fontmap-pld.patch b/libwmf-fontmap-pld.patch
index 7dc9e9ce4a14cc15c2fcc41b0d96a08d430acc8b..f1d00cdfaa416263a5ed84ab458cbfda299d16a7 100644 (file)
--- a/libwmf-fontmap-pld.patch
+++ b/libwmf-fontmap-pld.patch
@@ -1,5 +1,5 @@
---- libwmf-0.2.1/fonts/libwmf-fontmap.in.orig  Sat May 19 14:12:06 2001
-+++ libwmf-0.2.1/fonts/libwmf-fontmap.in       Mon Jun 11 13:24:44 2001
+--- libwmf-0.2.12/fonts/libwmf-fontmap.in.orig 2019-02-01 18:51:32.000000000 +0100
++++ libwmf-0.2.12/fonts/libwmf-fontmap.in      2019-04-24 17:01:09.676500394 +0200
 @@ -33,9 +33,9 @@
  fi
  
@@ -12,31 +12,32 @@
  fi
  
  if test $echo_help = yes; then
-@@ -64,9 +64,9 @@
-               font_cwd=`pwd`;
-               echo scanning $i;
+@@ -64,10 +64,10 @@
+               font_cwd=$(pwd)
+               echo scanning "$i"
  
--              for j in `ls *.afm 2> /dev/null`; do
--                      font_root=`echo $j | sed s/.afm//`
+-              for j in *.afm; do
++              for j in *.afm afm/*.afm ; do
+                       [ -e "$j" ] || continue
+-                      font_root=$(echo "$j" | sed s/.afm//)
 -                      font_metrics=$font_cwd/$font_root.afm
-+              for j in `ls *.afm afm/*.afm 2> /dev/null`; do
-+                      font_root=`echo $j | sed -e 's@.*/@@' -e 's@\.afm@@'`
++                      font_root=$(basename "$j" .afm)
 +                      font_metrics=$font_cwd/$j
                        font_glyphs=
-                       if test -r $font_cwd/$font_root.pfa; then
-                               font_glyphs=$font_cwd/$font_root.pfa
-@@ -75,10 +75,10 @@
+                       if test -r "$font_cwd/$font_root.pfa"; then
+                               font_glyphs="$font_cwd/$font_root.pfa"
+@@ -78,10 +78,10 @@
                        fi
                        if test "x$font_glyphs" != "x"; then
-                               echo font: $font_root
--                              FontName=`grep "FontName " $font_metrics | sed "s/FontName //"`
--                              FullName=`grep "FullName " $font_metrics | sed "s/FullName //"`
--                              FamilyName=`grep "FamilyName " $font_metrics | sed "s/FamilyName //"`
--                              Weight=`grep "Weight " $font_metrics | sed "s/Weight //"`
-+                              FontName=`grep "FontName " $font_metrics | sed "s/FontName //" | tr -d '\r'`
-+                              FullName=`grep "FullName " $font_metrics | sed "s/FullName //" | tr -d '\r'`
-+                              FamilyName=`grep "FamilyName " $font_metrics | sed "s/FamilyName //" | tr -d '\r'`
-+                              Weight=`grep "Weight " $font_metrics | sed "s/Weight //" | tr -d '\r'`
-                               cd $font_pwd
-                               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
-                               cd $font_cwd
+                               echo font: "$font_root"
+-                              FontName=$(grep "FontName " "$font_metrics" | sed "s/FontName //")
+-                              FullName=$(grep "FullName " "$font_metrics" | sed "s/FullName //")
+-                              FamilyName=$(grep "FamilyName " "$font_metrics" | sed "s/FamilyName //")
+-                              Weight=$(grep "Weight " "$font_metrics" | sed "s/Weight //")
++                              FontName=$(grep "FontName " "$font_metrics" | sed "s/FontName //" | tr -d '\r')
++                              FullName=$(grep "FullName " "$font_metrics" | sed "s/FullName //" | tr -d '\r')
++                              FamilyName=$(grep "FamilyName " "$font_metrics" | sed "s/FamilyName //" | tr -d '\r')
++                              Weight=$(grep "Weight " "$font_metrics" | sed "s/Weight //" | tr -d '\r')
+                               cd "$font_pwd" || continue
+                               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
+                               cd "$font_cwd" || continue