lilypond-0.1.18

diff --git a/bin/convert-mudela.in b/bin/convert-mudela.in
index 1efde362a5740671d6c7382612ebbabb6c13b1d6..8b05c1561ad7ad9835cd70fa1f446acabf1afe06 100644 (file)
--- a/bin/convert-mudela.in
+++ b/bin/convert-mudela.in
@@ -254,10 +254,8 @@ sub  set_files
     if ($ARGV [0])  {
        $infile = $ARGV[0];
     } 
-    if (( ! -f $infile) && (! $infile =~ /\\.ly$/s ) ){
+    if (!(-f $infile) && !($infile =~ /\.ly$/s)) {
        $infile .= ".ly";
-       
-
     }
     if ($opt_edit && $infile ne "-") {
        $opt_edit = 1;

diff --git a/lily/VERSION b/lily/VERSION
index c905573ecc87a233a73a08e2e10815e6bb17e5d4..783f85e04920698da40ca9c3dce199a545f1fce1 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 1
-PATCH_LEVEL = 17
+PATCH_LEVEL = 18
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf
 

diff --git a/mi2mu/midi-track-parser.cc b/mi2mu/midi-track-parser.cc
index 028c3face3f749a77e6ae86d8361577743a25180..b7472aab85005b0992b9f8e6ab913baae86dd76f 100644 (file)
--- a/mi2mu/midi-track-parser.cc
+++ b/mi2mu/midi-track-parser.cc
@@ -51,6 +51,8 @@ Midi_track_parser::note_end (Mudela_column* col_l, int channel_i, int pitch_i, i
   // junk dynamics
   (void)aftertouch_i;
 
+  assert (col_l);
+
   for (PCursor<Mudela_note*> i (open_note_l_list_.top ()); i.ok (); i++) 
     {
       if ((i->pitch_i_ == pitch_i) && (i->channel_i_ == channel_i)) 
@@ -72,12 +74,13 @@ void
 Midi_track_parser::note_end_all (Mudela_column* col_l) 
 {
   // find 
-  for  (PCursor<Mudela_note*> i (open_note_l_list_.top ()); i.ok (); i++) 
+  assert (col_l);
+  for (PCursor<Mudela_note*> i (open_note_l_list_.top ()); i.ok (); i++) 
     {
       i->end_column_l_ = col_l;
       i.remove_p();
       // ugh
-      if  (!i.ok())
+      if (!i.ok())
        break;
     }
 }
@@ -96,6 +99,9 @@ Midi_track_parser::parse (Mudela_column* col_l)
   if (!eot())
     return 0;
 
+  // vangnet
+  note_end_all (col_l);
+
   Mudela_staff* p = mudela_staff_p_;
   mudela_staff_p_ = 0;
   return p;
@@ -265,7 +271,7 @@ Midi_track_parser::parse_event (Mudela_column* col_l)
            {
              next_byte ();
              unsigned useconds_per_4_u = get_u (3);
-             // $$ = new Mudela_tempo ( ($2 << 16) +  ($3 << 8) + $4);
+             // $$ = new Mudela_tempo ( ($2 << 16) + ($3 << 8) + $4);
              // LOGOUT (DEBUG_ver) << $$->str() << endl;
              Mudela_tempo* p = new Mudela_tempo ( useconds_per_4_u );
              item_p = p;

diff --git a/mi2mu/mudela-item.cc b/mi2mu/mudela-item.cc
index 7a69984b9a618825f010908bea1cf632ad36c4f9..cc7bacdfa5ff3c711071e99e9488b20c5c405c81 100644 (file)
--- a/mi2mu/mudela-item.cc
+++ b/mi2mu/mudela-item.cc
@@ -175,6 +175,7 @@ Mudela_note::duration_mom ()
 {
 // ugh
 //    return Duration_convert::dur2_mom (duration ());
+  assert (end_column_l_);
   return end_column_l_->at_mom () - at_mom ();
 }