lilypond-1.5.12

diff --git a/config.hh.in b/config.hh.in
index 04d22f741f250f8c4770d6e877b429633d6c7edb..038a46c6617f98e7011a595329b63858bdb39deb 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -41,6 +41,18 @@
 /* define if you have kpse_find_tfm */
 #define HAVE_KPSE_FIND_TFM 0
 
+/* define if you have python2/Python.h header */
+#define HAVE_PYTHON2_PYTHON_H 0
+
+/* define if you have python1.5/Python.h */
+#define HAVE_PYTHON1_5_PYTHON_H 0
+
+/* define if you have python/Python.h header */
+#define HAVE_PYTHON_PYTHON_H 0
+
+/* define if you have Python.h header */
+#define HAVE_PYTHON_H 0
+
 /* define if explicit instantiation is needed */
 #undef NEED_EXPLICIT_INSTANTIATION
 

diff --git a/configure b/configure
index abca10383af745d57a1aa8fbfcc566c606b11674..93015c4e63d71eba8e4e1b891b4d398e6736fffd 100755 (executable)
--- a/configure
+++ b/configure
@@ -3481,6 +3481,48 @@ else
 fi
 
 
+for ac_hdr in python2/Python.h python/Python.h python1.5/Python.h Python.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:3489: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3494 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:3499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+
 
     trap '' 1 2 15
 cat > confcache <<\EOF

diff --git a/configure.in b/configure.in
index 4cf095deb818adff7cb0e7d1e8e3a3787f2a9af1..636d386f3500e59c182cae414be541d70de56e85 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -49,6 +49,9 @@ AC_STEPMAKE_MAKEINFO
 
 AC_PATH_PROG(PERL, perl, error)
 
+AC_HAVE_HEADERS(python2/Python.h python/Python.h python1.5/Python.h Python.h)
+
+
 AC_STEPMAKE_END
 
 test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 061650bbffd65a102061c95a8f7ec5023f969d55..d96acb32e973073f031dcc68ed025732e178a6cd 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -164,18 +164,18 @@ Tie_engraver::create_grobs ()
          if (!i)
            return;
          
-         SCM pair = gh_list_ref (head_list, gh_int2scm (i/2));
+         SCM pair = scm_list_ref (head_list, gh_int2scm (i/2));
          
          Spanner * p = new Spanner (basic);
 
          Tie::set_interface (p);
-         Tie::set_head (p,LEFT, dynamic_cast<Item*> (unsmob_grob (gh_car (pair))));
-         Tie::set_head (p,RIGHT, dynamic_cast<Item*> (unsmob_grob (gh_cdr (pair))));
+         Tie::set_head (p,LEFT, dynamic_cast<Item*> (unsmob_grob (ly_car (pair))));
+         Tie::set_head (p,RIGHT, dynamic_cast<Item*> (unsmob_grob (ly_cdr (pair))));
          
          tie_p_arr_.push (p);
          announce_grob (p, req_l_);
        }
-      else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s))
+      else for (SCM s = head_list; gh_pair_p (s); s = ly_cdr (s))
        {
          Grob * p = new Spanner (basic);
          Tie::set_interface (p);

diff --git a/modules/midi.c b/modules/midi.c
index 11fdd25d4fa442521d3e4fe671882b7d55de179e..747ed1b5ab359d8720f68fe4e70a4c569ef0a448 100644 (file)
--- a/modules/midi.c
+++ b/modules/midi.c
@@ -18,7 +18,22 @@ midi.parse (s)
 
 */
 
-#include <python2.0/Python.h>
+#include "config.h"
+
+/* urg */
+#if HAVE_PYTHON2_PYTHON_H
+#include <python2/Python.h>
+#elif HAVE_PYTHON1_5_PYTHON_H
+#include <python1.5/Python.h>
+#elif HAVE_PYTHON_PYTHON_H
+#define assert(x)
+#include <python/Python.h>
+#elif HAVE_PYTHON_H
+#define assert(x)
+#include <Python.h>
+#else
+#error Need Python.h
+#endif
 
 #if 0
 int x = 0;
@@ -94,22 +109,33 @@ message_t metaEvents[] = {
   0,0
 };
 
+void
+add_constants (PyObject *dict)
+{
+  message_t * p[] = {metaEvents, channelModeMessages, channelVoiceMessages ,0};
+  int i,j;
+  for ( j =0; p[j]; j++)
+    for ( i = 0; p[j][i].description; i++)
+      PyDict_SetItemString (dict, p[j][i].description, Py_BuildValue ("i", p[j][i].msg));
+}
+
 unsigned long int
-get_number (char * str, char * end_str, int length)
+get_number (unsigned char ** str, unsigned char * end_str, int length)
 {
   /* # MIDI uses big-endian for everything */
   long sum = 0;
   int i = 0;
   
   for (; i < length; i++)
-    sum = (sum << 8) + (unsigned char) str[i];
+    sum = (sum << 8) + (unsigned char) (*str)[i];
 
+  *str += length;
   debug_print ("%d:\n", sum);
   return sum;
 }
 
 unsigned long int
-get_variable_length_number (char **str, char * end_str)
+get_variable_length_number (unsigned char **str, unsigned char * end_str)
 {
   long sum = 0;
   int i = 0;
@@ -125,103 +151,76 @@ get_variable_length_number (char **str, char * end_str)
   return sum;
 }
 
-static PyObject *
-read_unimplemented_event (char **track, char *end, unsigned long time,
-                         unsigned char x, unsigned char z)
+PyObject *
+read_one_byte (unsigned char **track, unsigned char *end, 
+              unsigned char x)
 {
-  debug_print ("%x:%s", z, "unimplemented MIDI event\n");
-  *track += 2;
-  return Py_BuildValue ("(iii)", z, *((*track) -2), *((*track) -1));
+  PyObject *pyev = Py_BuildValue ("(i)", x);
+  debug_print ("%x:%s", x, "event\n");
+
+  return pyev;
 }
 
 PyObject *
-read_one_byte (char **track, char *end, unsigned long time,
-              unsigned char x, unsigned char z)
+read_two_bytes (unsigned char **track, unsigned char *end, 
+               unsigned char x)
 {
-  debug_print ("%x:%s", z, "event\n");
+  PyObject *pyev = Py_BuildValue ("(ii)", x, (*track)[0]);
   *track += 1;
-  return Py_BuildValue ("(ii)", z, *((*track) -1));
+  debug_print ("%x:%s", x, "event\n");
+  return pyev;
 }
 
 PyObject *
-read_two_bytes (char **track, char *end, unsigned long time,
-               unsigned char x, unsigned char z)
+read_three_bytes (unsigned char **track, unsigned char *end, 
+                 unsigned char x)
 {
-  debug_print ("%x:%s", z, "event\n");
-  *track += 2;
-  return Py_BuildValue ("(iii)", z, *((*track) -2), *((*track) -1));
-}
+  PyObject *pyev = Py_BuildValue ("(iii)", x, (*track)[0],
+                                 (*track)[1]);
 
-PyObject *
-read_three_bytes (char **track, char *end, unsigned long time,
-                 unsigned char x, unsigned char z)
-{
-  debug_print ("%x:%s", z, "event\n");
-  *track += 3;
-  return Py_BuildValue ("(iiii)", z, *((*track) -3), *((*track) -2), *((*track) -1));
+  *track += 2;
+  debug_print ("%x:%s", x, "event\n");
+  return pyev;
 }
 
 PyObject *
-read_string (char **track, char *end, unsigned long time,
-            unsigned char x, unsigned char z)
+read_string (unsigned char **track, unsigned char *end) 
 {
   unsigned long length = get_variable_length_number (track, end);
-  if (length < *track - end)
-    debug_print ("%s", "zero length string\n");
+  if (length > end - *track)
+    length = end - *track;
+
   *track += length;
-  debug_print ("%x:%s", length, "string\n");
-  return Py_BuildValue ("(is)", z, *((*track) -length));
+  return Py_BuildValue ("s", ((*track) -length));
 }
 
 typedef PyObject* (*Read_midi_event)
-     (char **track, char *end, unsigned long time,
-      unsigned char x, unsigned char z);
-
-Read_midi_event read_ff_byte [16] =
-{
-  read_three_bytes,  //  0
-  read_one_byte,     // 10
-  read_one_byte,  // 20
-  read_one_byte,  // 30
-  read_one_byte,  // 40
-  read_one_byte,  // 50
-  read_one_byte,  // 60
-  read_two_bytes, // 70
-  read_two_bytes, // 80
-  read_two_bytes, // 90
-  read_two_bytes, // a0
-  read_two_bytes, // b0
-  read_one_byte,  // c0
-  read_two_bytes, // d0
-  read_two_bytes, // e0
-  read_two_bytes, // e0
-};
+     (unsigned char **track, unsigned char *end, 
+      unsigned char x);
 
 
 static PyObject *
-read_f0_byte (char **track, char *end, unsigned long time,
-             unsigned char x, unsigned char z)
+read_f0_byte (unsigned char **track, unsigned char *end, 
+             unsigned char x)
              
 {
-  debug_print ("%x:%s", z, "event\n");
-  if (z == 0xff)
+  debug_print ("%x:%s", x, "event\n");
+  if (x == 0xff)
     {
-      unsigned char zz = *(*track)++;
-      debug_print ("%x:%s", zz, "f0-event\n");
-      if (zz == 0x01 && **track <= 0x07)
-       return read_string (track, end, time, x, zz);
-      else if (zz == 0x2f && **track == 0x00)
+      unsigned char z = (*track)[0 ];
+      *track += 1;
+      debug_print ("%x:%s", z, "f0-event\n");
+      
+      if (z == 0x2f && (*track)[0] == 0x00) /* end of track */
        {
-         (*track)++;
-         debug_print ("%s", "done\n");
+         *track += 1;
          return 0;
        }
       else
-       return read_unimplemented_event (track, end, time, x, zz);
-      exit (0);
+       return Py_BuildValue ("(iiO)", x, z, read_string (track, end));
     }
-  else
-    return read_string (track, end, time, x, z);
+
+  return Py_BuildValue ("(iO)", x, read_string (track, end));
 }
 
 Read_midi_event read_midi_event [16] =
@@ -232,36 +231,42 @@ Read_midi_event read_midi_event [16] =
   read_one_byte,  // 30
   read_one_byte,  // 40
   read_one_byte,  // 50
-  read_one_byte,  // 60
-  read_two_bytes, // 70
-  read_two_bytes, // 80
-  read_two_bytes, // 90
-  read_two_bytes, // a0
-  read_two_bytes, // b0
-  read_one_byte,  // c0
-  read_two_bytes, // d0
-  read_two_bytes, // e0
+  read_one_byte,  // 60 data entry.
+  read_two_bytes, // 70 all notes off
+  read_three_bytes, // 80 note off
+  read_three_bytes, // 90 note on
+  read_three_bytes, // a0 poly aftertouch
+  read_three_bytes, // b0 control
+  read_two_bytes,  // c0 prog change
+  read_two_bytes, // d0 ch aftertouch
+  read_three_bytes, // e0 pitchwheel range 
   read_f0_byte,   // f0
 };
-            
+
+
 static PyObject *
-read_event (char **track, char *end, unsigned long time,
+read_event (unsigned char **track, unsigned char *end, PyObject *time,
            unsigned char *running_status)
 {
   int rsb_skip = ((**track & 0x80)) ? 1 :0;
 
   unsigned char x = (rsb_skip) ? (*track)[0]: *running_status;
-  // unsigned char y = x & 0xf0;
-  unsigned char z = (*track)[1 + rsb_skip];
-  
-  debug_print ("%x:%s", z, "event\n");
-  *track += 2 + rsb_skip;
 
-  return (*read_midi_event[z >> 4]) (track, end, time, x, z);
+  PyObject * bare_event = 0;
+  debug_print ("%x:%s", x, "event\n");
+  *running_status = x;
+  *track += rsb_skip;
+  
+  //  printf ("%x %x %d next %x\n", x, (*track)[0], rsb_skip, (*track)[1]);
+  bare_event = (*read_midi_event[x >> 4]) (track, end, x);
+  if (bare_event)
+    return Py_BuildValue ("(OO)", time, bare_event);
+  else
+    return NULL;
 }
 
 static PyObject *
-midi_parse_track (char **track, char *track_end)
+midi_parse_track (unsigned char **track, unsigned char *track_end)
 {
   unsigned int time = 0;
   unsigned char running_status;
@@ -271,15 +276,18 @@ midi_parse_track (char **track, 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");
   assert (!strcmp (*track, "MTrk"));
   *track += 4;
 
-  track_len = get_number (*track, *track + 4, 4);
-  *track += 4;
+  track_len = get_number (track, *track + 4, 4);
+
 
   debug_print ("track_len: %u\n", track_len);
   debug_print ("track_size: %u\n", track_size);
@@ -292,14 +300,24 @@ midi_parse_track (char **track, char *track_end)
 
   track_end = *track + track_len;
 
-  while (*track < track_end)
-    {
-      long dt = get_variable_length_number(track, track_end);
-      time += dt;
-      PyList_Append (pytrack, read_event (track, track_end, time,
-                                         &running_status));
-    }
-
+  {  
+    PyObject *pytime = PyInt_FromLong (0L);
+    while (*track < track_end)
+      {
+       long dt = get_variable_length_number(track, track_end);
+       PyObject *pyev = 0;
+
+       time += dt;
+       if (dt)
+         pytime = PyInt_FromLong (time);
+
+       pyev = read_event (track, track_end, pytime,
+                          &running_status);
+       if (pyev)
+         PyList_Append (pytrack, pyev);
+      }
+  }
+  
   *track = track_end;
   return pytrack;
 }
@@ -308,7 +326,7 @@ midi_parse_track (char **track, char *track_end)
 static PyObject *
 pymidi_parse_track (PyObject *self, PyObject *args)
 {
-  char *track, *track_end;
+  unsigned char *track, *track_end;
   unsigned long track_size, track_len;
 
   PyObject * sobj = PyTuple_GetItem (args, 0);
@@ -326,7 +344,7 @@ pymidi_parse_track (PyObject *self, PyObject *args)
 }
 
 static PyObject *
-midi_parse (char **midi, char *midi_end)
+midi_parse (unsigned char **midi,unsigned  char *midi_end)
 {
   PyObject *pymidi = 0;
   unsigned long header_len;
@@ -337,23 +355,20 @@ midi_parse (char **midi, char *midi_end)
   debug_print ("%s", "\n");
 
   /* Header */
-  header_len = get_number (*midi, *midi + 4, 4);
-  *midi += 4;
+  header_len = get_number (midi, *midi + 4, 4);
+
   
   if (header_len < 6)
     return midi_error ("header too short");
     
-  format = get_number (*midi, *midi + 2, 2);
-  *midi += 2;
-  
-  tracks = get_number (*midi, *midi + 2, 2);
-  *midi += 2;
+  format = get_number (midi, *midi + 2, 2);
+  tracks = get_number (midi, *midi + 2, 2);
 
   if (tracks > 32)
     return midi_error ("too many tracks");
   
-  division = get_number (*midi, *midi + 2, 2) * 4;
-  *midi += 2;
+  division = get_number (midi, *midi + 2, 2) * 4;
+
 
   if (division < 0)
     /* return midi_error ("can't handle non-metrical time"); */
@@ -361,19 +376,20 @@ midi_parse (char **midi, char *midi_end)
   *midi += header_len - 6;
 
   pymidi = PyList_New (0);
-  PyList_Append (pymidi, Py_BuildValue ("(iii)", format, tracks, division));
 
   /* Tracks */
   for (i = 0; i < tracks; i++)
     PyList_Append (pymidi, midi_parse_track (midi, midi_end));
 
+  pymidi = Py_BuildValue ("(OO)", Py_BuildValue ("(ii)", format, division),
+                         pymidi);
   return pymidi;
 }
 
 static PyObject *
 pymidi_parse (PyObject *self, PyObject *args)
 {
-  char *midi, *midi_end;
+  unsigned char *midi, *midi_end;
   unsigned long midi_size, midi_len;
   
   PyObject *sobj = PyTuple_GetItem (args, 0);
@@ -408,6 +424,7 @@ initmidi ()
   
   Midi_error = PyString_FromString ("midi.error");
   PyDict_SetItemString (d, "error", Midi_error);
+  add_constants (d);
   Midi_warning = PyString_FromString ("midi.warning");
   PyDict_SetItemString (d, "warning", Midi_warning);
 }