lilypond-1.5.16

diff --git a/aclocal.m4 b/aclocal.m4
index 1cf59b1171348ba86c1f508011fbae7647f86123..3003cbd938eec27cd4eb075798847334cab0a441 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -31,6 +31,10 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
     [  --enable-debugging      compile with debugging info.  Default: on],
     [debug_b=$enableval])
 
+    AC_ARG_ENABLE(optimising,
+    [  --enable-optimising      compile with optimising.  Default: on],
+    [optimise_b=$enableval])
+
     AC_ARG_ENABLE(profiling, 
     [  --enable-profiling      compile with gprof support.  Default: off],
     [profile_b=$enableval])

diff --git a/configure.in b/configure.in
index e0fa5a2f5d1bd01e73f2d62955d321c053fa4055..e64d0e859d0b75e486d21446ffa27fe98d18428a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,9 +17,6 @@ AC_STEPMAKE_COMPILE
 AC_HAVE_HEADERS(assert.h sys/stat.h)
 AC_HEADER_STAT
 
-DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
-AC_DEFINE(STRINGS_UTILS_INLINED)
-
 AC_STEPMAKE_CXX
 AC_STEPMAKE_GXX
 AC_STEPMAKE_CXXTEMPLATE
@@ -34,6 +31,13 @@ AC_STEPMAKE_GUILE
 AC_STEPMAKE_KPATHSEA
 AC_STEPMAKE_BIBTEX2HTML
 
+
+if test "$optimise_b" = yes; then
+    DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
+    AC_DEFINE(STRINGS_UTILS_INLINED)
+fi
+
+
 dnl should check out -print
 dnl huh?
 dnl AC_CHECK_SEARCH_RESULT($FIND, find, Please use --enable-tex-dir)

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 157115741b1b174ee7c94e76fcfbecedc85abff8..4c1f865fd25735656f6a7bc592ecb5eb6092be58 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -172,7 +172,7 @@ Paper_outputter::output_scope (Scope *scope, String prefix)
        {
          output_String_def (prefix + s, ly_scm2string (v));
        }
-      else if (scm_integer_p (v) == SCM_BOOL_T)
+      else if (scm_exact_p (v) == SCM_BOOL_T)
        {
          output_int_def (prefix + s, gh_scm2int (v));    
        }

diff --git a/modules/midi.c b/modules/midi.c
index 1228d1c50f474b6160822b1a3637384a42095bdc..e3cbea720182696c8275806489a69a750e6e2912 100644 (file)
--- a/modules/midi.c
+++ b/modules/midi.c
@@ -279,15 +279,10 @@ midi_parse_track (unsigned char **track, unsigned char *track_end)
   debug_print ("%s", "\n");
   
   track_size = track_end - *track;
-#if 0
-  /* need this for direct midi.parse_track (s) on midi file */
-  if (strcmp (*track, "MTrk"))
-    *track = memmem (*track, track_size - 1, "MTrk", 4);
-#endif
 
   debug_print ("%s", "\n");
-  if (!strcmp (*track, "MTrk"))
-    return midi_error ("parse_track(): MTrk expected");
+  if (strcmp (*track, "MTrk"))
+    return midi_error (__FUNCTION__ ": MTrk expected");
   
   *track += 4;
 
@@ -299,7 +294,8 @@ midi_parse_track (unsigned char **track, unsigned char *track_end)
   debug_print ("track begin: %p\n", track);
   debug_print ("track end: %p\n", track + track_len);
   
-  //assert (track_len <= track_size);
+  if (track_len > track_size)
+    return midi_error (__FUNCTION__ ": track size corrupt");
 
   pytrack = PyList_New (0);
 
@@ -341,7 +337,7 @@ pymidi_parse_track (PyObject *self, PyObject *args)
     return 0;
 
   if (track_size < 0)
-    return midi_error ("negative track size");
+    return midi_error (__FUNCTION__  ": negative track size");
 
   track_end = track + track_size;
   
@@ -364,13 +360,13 @@ midi_parse (unsigned char **midi,unsigned  char *midi_end)
 
   
   if (header_len < 6)
-    return midi_error ("header too short");
+    return midi_error (__FUNCTION__ ": header too short");
     
   format = get_number (midi, *midi + 2, 2);
   tracks = get_number (midi, *midi + 2, 2);
 
   if (tracks > 32)
-    return midi_error ("too many tracks");
+    return midi_error (__FUNCTION__ ": too many tracks");
   
   division = get_number (midi, *midi + 2, 2) * 4;
 
@@ -404,7 +400,7 @@ pymidi_parse (PyObject *self, PyObject *args)
     return 0;
 
   if (strcmp (midi, "MThd"))
-      return midi_error ("MThd expected");
+      return midi_error (__FUNCTION__ ": MThd expected");
   
   midi += 4;
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 1cf59b1171348ba86c1f508011fbae7647f86123..3003cbd938eec27cd4eb075798847334cab0a441 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -31,6 +31,10 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
     [  --enable-debugging      compile with debugging info.  Default: on],
     [debug_b=$enableval])
 
+    AC_ARG_ENABLE(optimising,
+    [  --enable-optimising      compile with optimising.  Default: on],
+    [optimise_b=$enableval])
+
     AC_ARG_ENABLE(profiling, 
     [  --enable-profiling      compile with gprof support.  Default: off],
     [profile_b=$enableval])