*** empty log message ***

[lilypond.git] / buildscripts / mf-to-xpms.sh

diff --git a/buildscripts/mf-to-xpms.sh b/buildscripts/mf-to-xpms.sh
index 8ea9134e3a0de4c7cfc9f50ca9d3636e7e9ee51a..3e3d84dcd0a4d8af35e1b7b897e7ab70cb5dd635 100644 (file)
--- a/buildscripts/mf-to-xpms.sh
+++ b/buildscripts/mf-to-xpms.sh
@@ -6,7 +6,7 @@ if [ $# -ne 1 ]; then
        exit 2
 fi
 
-font=$1
+font=`basename $1 .mf`
 mf=$font.mf
 afm=out/$font.afm
 PKTOPBM=pktopbm
@@ -44,11 +44,11 @@ fi
 
 # numbered files
 if [ "x$named" = "x" ]; then
-       NUMS=`grep "^C *[0-9]*;" $afm | sed "s!^C *\([^;]*\).*!\\1!"`
-       PBMS=`grep "^C *[0-9]*;" $afm | sed "s!^C *\([^;]*\).*!out/$font-\\1.pbm!"`
+       NUMS=`grep "^C *[0-9]* *;" $afm | sed "s!^C *\([^ ;]*\).*!\\1!"`
+       PBMS=`grep "^C *[0-9]* *;" $afm | sed "s!^C *\([^ ;]*\).*!out/$font-\\1.pbm!"`
 else
-       NUMS=`grep "^C *[0-9]*;" $afm | sed "s!^C [^;]*; *N *\([^;]*\).*!\\1!"`
-       PBMS=`grep "^C *[0-9]*;" $afm | sed "s!^C [^;]*; *N *\([^;]*\).*!out/$font-\\1.pbm!"`
+       NUMS=`grep "^C *[0-9]* *;" $afm | sed "s!^C *.*; *N *\([^ ;]*\).*!\\1!"`
+       PBMS=`grep "^C *[0-9]* *;" $afm | sed "s!^C *.*; *N *\([^ ;]*\).*!out/$font-\\1.pbm!"`
 fi
 
 # $PKTOPBM out/$font.${RESOLUTION}pk -x 100 -y 100 $PBMS