lilypond-1.1.36

diff --git a/aclocal.m4 b/aclocal.m4
index 0dedb26ffd7e5bcf8c72d74035be3876a1f859ca..0a8f9d46b4dd59a760cc2ba2aa89aab3b5390377 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -503,6 +503,7 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [
 
 AC_DEFUN(AC_STEPMAKE_TEXMF, [
     # urg, never know what names these teTeX guys will think up
+
     AC_CHECK_PROGS(METAFONT, mf, no)
     if test "x$METAFONT" = "xno"; then
        AC_CHECK_PROGS(MFONT, mfont, -echo no mf or mfont)
@@ -515,8 +516,22 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
        METAPOST=$MPOST
     fi
 
+    AC_CHECK_PROGS(INIMETAFONT, inimf, no)
+    if test "x$INIMETAFONT" = "xno"; then
+       AC_CHECK_PROGS(INIMFONT, inimfont, -echo no inimf or inimfont)
+       INIMETAFONT=$INIMFONT
+    fi
+
+    AC_CHECK_PROGS(INIMETAPOST, inimp, no)
+    if test "x$INIMETAPOST" = "xno"; then
+       AC_CHECK_PROGS(INIMPOST, inimpost, -echo no inimp or inimpost)
+       INIMETAPOST=$INIMPOST
+    fi
+
     AC_SUBST(METAFONT)
     AC_SUBST(METAPOST)
+    AC_SUBST(INIMETAFONT)
+    AC_SUBST(INIMETAPOST)
 ])
 
 AC_DEFUN(AC_STEPMAKE_WARN, [

diff --git a/buildscripts/ps-to-pfa.py b/buildscripts/ps-to-pfa.py
index 33ee75ddec096632e521420a952811918e1ec256..2bbd2813da258a7cefd8b115f9bb1f4ebc8ffeb8 100644 (file)
--- a/buildscripts/ps-to-pfa.py
+++ b/buildscripts/ps-to-pfa.py
@@ -85,9 +85,9 @@ def header (f):
 '/FontMatrix [.001 0 0 .001 0 0] def\n'
 '%%/FontMatrix [.01 0 0 .01 0 0] def\n'
 '%%/FontMatrix [0.1 0 0 0.1 0 0] def\n'
-'%% /FontBBox [-1000 -1000 1000 1000] def\n'
-' /FontBBox [-3000 -3000 3000 3000] def\n'
-'%% /FontBBox [-300 -300 300 300] def\n'
+'%%/FontBBox [-1000 -1000 1000 1000] def\n'
+'/FontBBox [-3000 -3000 3000 3000] def\n'
+'%%/FontBBox [-300 -300 300 300] def\n'
 '%%/FontBBox [-30 -30 30 30] def\n'
 '\n'
 '/Encoding 256 array def                     %% Trivial encoding vector\n'
@@ -97,9 +97,11 @@ def footer (f):
        f.write ('\n'
 '/BuildGlyph {                               % Stack contains: font charname\n'
 '%  1000 0                                   % Width\n'
+'%  -1000 -1000 1000 1000                    % Bounding Box\n'
 '%  -750 -750 750 750                        % Bounding Box\n'
-'  3000 0                                    % Width\n'
-'  -3000 -3000 3000 3000                     % Bounding Box\n'
+'%  -750 -750 750 750                        % Bounding Box\n'
+'   3000 0                                   % Width\n'
+'   -3000 -3000 3000 3000                    % Bounding Box\n'
 '%  300 0                                    % Width\n'
 '%  -300 -300 300 300                        % Bounding Box\n'
 '%  30 0                                     % Width\n'

diff --git a/config.make.in b/config.make.in
index 8eef00972fba97fa117b68f558d4eab5dcb3240b..841d5e28d1bf6342bdba4511382eb0172c5d24bd 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -46,6 +46,8 @@ BASH = @BASH@
 BISON = @BISON@
 FIND = @FIND@
 FLEX = @FLEX@
+INIMETAFONT = @INIMETAFONT@
+INIMETAPOST = @INIMETAPOST@
 LN = @LN@
 LN_S = @LN_S@
 METAFONT = @METAFONT@

diff --git a/configure b/configure
index 5423c297443002e9a58d4df63578f7a21ea36309..7db90382ff7e3e0746ed499f37a5f5d83402efec 100755 (executable)
--- a/configure
+++ b/configure
@@ -2064,12 +2064,13 @@ echo "configure:2046: checking whether msgfmt accepts -o" >&5
 
 
     # urg, never know what names these teTeX guys will think up
+
     for ac_prog in mf
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2073: checking for $ac_word" >&5
+echo "configure:2074: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_METAFONT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2104,7 +2105,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2108: checking for $ac_word" >&5
+echo "configure:2109: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MFONT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2141,7 +2142,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2145: checking for $ac_word" >&5
+echo "configure:2146: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_METAPOST'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2176,7 +2177,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2180: checking for $ac_word" >&5
+echo "configure:2181: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MPOST'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2208,6 +2209,152 @@ test -n "$MPOST" || MPOST="-echo no mp or mpost"
        METAPOST=$MPOST
     fi
 
+    for ac_prog in inimf
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2218: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_INIMETAFONT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$INIMETAFONT"; then
+  ac_cv_prog_INIMETAFONT="$INIMETAFONT" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_INIMETAFONT="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+INIMETAFONT="$ac_cv_prog_INIMETAFONT"
+if test -n "$INIMETAFONT"; then
+  echo "$ac_t""$INIMETAFONT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$INIMETAFONT" && break
+done
+test -n "$INIMETAFONT" || INIMETAFONT="no"
+
+    if test "x$INIMETAFONT" = "xno"; then
+       for ac_prog in inimfont
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2253: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_INIMFONT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$INIMFONT"; then
+  ac_cv_prog_INIMFONT="$INIMFONT" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_INIMFONT="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+INIMFONT="$ac_cv_prog_INIMFONT"
+if test -n "$INIMFONT"; then
+  echo "$ac_t""$INIMFONT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$INIMFONT" && break
+done
+test -n "$INIMFONT" || INIMFONT="-echo no inimf or inimfont"
+
+       INIMETAFONT=$INIMFONT
+    fi
+
+    for ac_prog in inimp
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2290: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_INIMETAPOST'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$INIMETAPOST"; then
+  ac_cv_prog_INIMETAPOST="$INIMETAPOST" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_INIMETAPOST="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+INIMETAPOST="$ac_cv_prog_INIMETAPOST"
+if test -n "$INIMETAPOST"; then
+  echo "$ac_t""$INIMETAPOST" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$INIMETAPOST" && break
+done
+test -n "$INIMETAPOST" || INIMETAPOST="no"
+
+    if test "x$INIMETAPOST" = "xno"; then
+       for ac_prog in inimpost
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2325: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_INIMPOST'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$INIMPOST"; then
+  ac_cv_prog_INIMPOST="$INIMPOST" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_INIMPOST="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+INIMPOST="$ac_cv_prog_INIMPOST"
+if test -n "$INIMPOST"; then
+  echo "$ac_t""$INIMPOST" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$INIMPOST" && break
+done
+test -n "$INIMPOST" || INIMPOST="-echo no inimp or inimpost"
+
+       INIMETAPOST=$INIMPOST
+    fi
+
+    
+    
     
     
 
@@ -2219,7 +2366,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2223: checking for $ac_word" >&5
+echo "configure:2370: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2253,7 +2400,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2257: checking for $ac_word" >&5
+echo "configure:2404: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2287,7 +2434,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2291: checking for $ac_word" >&5
+echo "configure:2438: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2321,7 +2468,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2325: checking for $ac_word" >&5
+echo "configure:2472: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2354,7 +2501,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2358: checking for $ac_word" >&5
+echo "configure:2505: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2388,7 +2535,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2392: checking for $ac_word" >&5
+echo "configure:2539: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2422,7 +2569,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2426: checking for $ac_word" >&5
+echo "configure:2573: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2456,7 +2603,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2460: checking for $ac_word" >&5
+echo "configure:2607: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2516,7 +2663,7 @@ test -n "$YODL2TXT" || YODL2TXT="-echo no yodl"
 ## The GUILE_FLAGS macro.
   ## First, let's just see if we can find Guile at all.
   echo $ac_n "checking for Guile""... $ac_c" 1>&6
-echo "configure:2520: checking for Guile" >&5
+echo "configure:2667: checking for Guile" >&5
   guile-config link > /dev/null || {
     echo "configure: cannot find guile-config; is Guile installed?" 1>&2
     exit 1
@@ -2528,7 +2675,7 @@ echo "configure:2520: checking for Guile" >&5
   echo "$ac_t""yes" 1>&6
 
     echo $ac_n "checking for gh_scm2doubles in -lguile""... $ac_c" 1>&6
-echo "configure:2532: checking for gh_scm2doubles in -lguile" >&5
+echo "configure:2679: checking for gh_scm2doubles in -lguile" >&5
 ac_lib_var=`echo guile'_'gh_scm2doubles | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2536,7 +2683,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lguile $GUILE_LDFLAGS      $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2540 "configure"
+#line 2687 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2550,7 +2697,7 @@ int main() {
 gh_scm2doubles()
 ; return 0; }
 EOF
-if { (eval echo configure:2554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2584,7 +2731,7 @@ fi
 
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:2588: checking for 8-bit clean memcmp" >&5
+echo "configure:2735: checking for 8-bit clean memcmp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2592,7 +2739,7 @@ else
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2596 "configure"
+#line 2743 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -2605,7 +2752,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -2623,12 +2770,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2627: checking for vprintf" >&5
+echo "configure:2774: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2632 "configure"
+#line 2779 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -2654,7 +2801,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -2678,12 +2825,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2682: checking for _doprnt" >&5
+echo "configure:2829: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2687 "configure"
+#line 2834 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -2709,7 +2856,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -2736,12 +2883,12 @@ fi
 for ac_func in memmem snprintf vsnprintf gettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2740: checking for $ac_func" >&5
+echo "configure:2887: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2745 "configure"
+#line 2892 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2767,7 +2914,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2806,7 +2953,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2810: checking for $ac_word" >&5
+echo "configure:2957: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2847,7 +2994,7 @@ test -n "$MAKEINFO" || MAKEINFO="error"
 
 
 echo $ac_n "checking Checking TFM directory""... $ac_c" 1>&6
-echo "configure:2851: checking Checking TFM directory" >&5
+echo "configure:2998: checking Checking TFM directory" >&5
 CMR10=`kpsewhich tfm cmr10.tfm`
 TEX_TFMDIR=`dirname $CMR10`
 echo "$ac_t""$TEX_TFMDIR" 1>&6
@@ -3032,6 +3179,10 @@ s%@METAFONT@%$METAFONT%g
 s%@MFONT@%$MFONT%g
 s%@METAPOST@%$METAPOST%g
 s%@MPOST@%$MPOST%g
+s%@INIMETAFONT@%$INIMETAFONT%g
+s%@INIMFONT@%$INIMFONT%g
+s%@INIMETAPOST@%$INIMETAPOST%g
+s%@INIMPOST@%$INIMPOST%g
 s%@STRIPROFF@%$STRIPROFF%g
 s%@YODL@%$YODL%g
 s%@YODL2HTML@%$YODL2HTML%g

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 3c04833f4499016010c450215a037871c6bebc15..2566a2f5f714ae0a5084437732457406b87b9a00 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -39,3 +39,5 @@ default: $(ALL_GEN_FILES)
 $(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
        $(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
 
+localclean:
+       rm -f mfplain.mem mfplain.log

diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps
index 7bc7ae58ea4e5b468f9765af7dac2f22a1339260..4aa7edbdc25e595adba28fcfd2af5b86fb608c00 100644 (file)
--- a/ps/lilyponddefs.ps
+++ b/ps/lilyponddefs.ps
@@ -54,16 +54,17 @@
        grestore
 } bind def
 
-/vrule % width height depth
+/vrule % width depth height
 {
        gsave
        3 -1 roll setlinewidth
-       neg 0 exch moveto
-       0 exch lineto stroke
+       %neg 0 exch moveto
+       0 exch moveto
+       neg 0 exch lineto stroke
        grestore
 } bind def
 
-/draw_stem % kern width height depth
+/draw_stem % breapth width depth height
 {
        gsave
        4 -1 roll neg 0 translate

diff --git a/scm/lily.scm b/scm/lily.scm
index 59af7371a9684af3417f994867446be8d1c639b2..a07a1fcd7e22ac573e6fd52da99467c7d84c77de 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -391,8 +391,8 @@
   
   (define (experimental-on) "")
   
-  (define (filledbox kern width height depth) 
-    (string-append (numbers->string (list kern width height depth))
+  (define (filledbox breapth width depth height) 
+    (string-append (numbers->string (list breapth width depth height))
                   "draw_stem" ))
 
   ;; obsolete?
@@ -449,8 +449,8 @@
       (clear-fontcache)
       "\nstart_line {\n"))
   
-  (define (stem kern width height depth) 
-    (string-append (numbers->string (list kern width height depth))
+  (define (stem breapth width depth height) 
+    (string-append (numbers->string (list breapth width depth height))
                   "draw_stem" ))
 
   (define (stop-line)

diff --git a/stepmake/NEWS b/stepmake/NEWS
index cfc9576c3ed980316f0454b7bd23a649e237b51b..480f8a8cd289547422132fb959de1847b49a148e 100644 (file)
--- a/stepmake/NEWS
+++ b/stepmake/NEWS
@@ -1,3 +1,7 @@
+pl 72
+       - bf: mfplain dependency
+       - inimf, inimf checking (sigh)
+
 pl 71
        - bf: c-tags
        - yodl: groff, ditroff

diff --git a/stepmake/VERSION b/stepmake/VERSION
index 833861a630de6ec449faf2ce41dc8cb852fd1ee4..df407f27e30f792ef85edc7f05f6196063c8f6e9 100644 (file)
--- a/stepmake/VERSION
+++ b/stepmake/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=71
+PATCH_LEVEL=72
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index cf7c1a686ed0a310c9a7497a6f41a13e0b533b47..c9e042c0e5cc4efc2cefff60060b7dc12291a646 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -501,6 +501,7 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [
 
 AC_DEFUN(AC_STEPMAKE_TEXMF, [
     # urg, never know what names these teTeX guys will think up
+
     AC_CHECK_PROGS(METAFONT, mf, no)
     if test "x$METAFONT" = "xno"; then
        AC_CHECK_PROGS(MFONT, mfont, -echo no mf or mfont)
@@ -513,8 +514,22 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
        METAPOST=$MPOST
     fi
 
+    AC_CHECK_PROGS(INIMETAFONT, inimf, no)
+    if test "x$INIMETAFONT" = "xno"; then
+       AC_CHECK_PROGS(INIMFONT, inimfont, -echo no inimf or inimfont)
+       INIMETAFONT=$INIMFONT
+    fi
+
+    AC_CHECK_PROGS(INIMETAPOST, inimp, no)
+    if test "x$INIMETAPOST" = "xno"; then
+       AC_CHECK_PROGS(INIMPOST, inimpost, -echo no inimp or inimpost)
+       INIMETAPOST=$INIMPOST
+    fi
+
     AC_SUBST(METAFONT)
     AC_SUBST(METAPOST)
+    AC_SUBST(INIMETAFONT)
+    AC_SUBST(INIMETAPOST)
 ])
 
 AC_DEFUN(AC_STEPMAKE_WARN, [

diff --git a/stepmake/config.make.in b/stepmake/config.make.in
index 442d65c0a41b3df960cbaf59ba70d211f5e6750b..f3fcccab6eb4574d7924127add591c9feff6dc32 100644 (file)
--- a/stepmake/config.make.in
+++ b/stepmake/config.make.in
@@ -45,6 +45,8 @@ BASH = @BASH@
 BISON = @BISON@
 FIND = @FIND@
 FLEX = @FLEX@
+INIMETAFONT = @INIMETAFONT@
+INIMETAPOST = @INIMETAPOST@
 LN = @LN@
 LN_S = @LN_S@
 METAFONT = @METAFONT@

diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make
index 4cd6423483dc3075d5cdefa3a262c2d8163c3aa4..cddbaf88c53c5ff5d23d57705e102c36c3795727 100644 (file)
--- a/stepmake/stepmake/metapost-rules.make
+++ b/stepmake/stepmake/metapost-rules.make
@@ -4,8 +4,9 @@ $(outdir)/%.pfa: %.mf
 # i've got no idea what this scaling could be for, on both sides...
 # it seems that 'low_res', which should be all we ever need according
 # to the metapost mfplain guru, really does 200dpi, iso 600dpi (minimun)
-       -$(METAPOST) "&mfplain \mode=lowres; \mag=100.0; batchmode; input $<"
 #      -$(METAPOST) "&mfmp \mode=ljfour; \mag=100.0; batchmode; input $<"
+#      -$(METAPOST) "&mfplain \mode=lowres; \mag=100.0; batchmode; input $<"
+       -$(METAPOST) "&mfplain \mode=lowres; \mag=30.0; batchmode; input $<"
        $(PYTHON) $(depth)/buildscripts/ps-to-pfa.py $<
        rm -f $(basename $(@F)).[0-9]*
        rm -f $(basename $<).log $(basename $<).tfm

diff --git a/stepmake/stepmake/metapost-targets.make b/stepmake/stepmake/metapost-targets.make
index cf632d9de1ae0e8e583406493eaa9075132f7147..fb013f244fbafc445dfb3ce3ecad38d6478e2ef1 100644 (file)
--- a/stepmake/stepmake/metapost-targets.make
+++ b/stepmake/stepmake/metapost-targets.make
@@ -1,5 +1,5 @@
 
-pfa: $(PFA_FILES) mfplain.mem
+pfa: mfplain.mem $(PFA_FILES)
 
-mfplain.mem:
-       inimpost mfplain.ini
+mfplain.mem: mfplain.ini
+       $(INIMETAPOST) mfplain.ini