lilypond-0.0.78

diff --git a/Documentation/mudela-course.doc b/Documentation/mudela-course.doc
index 23fc00cb4ec18b92fad69b7ca657ece0c3165393..089b74444c3bd5f6dd5a2951c04ec0aeb53607a4 100644 (file)
--- a/Documentation/mudela-course.doc
+++ b/Documentation/mudela-course.doc
@@ -1,4 +1,8 @@
 % -*-LaTeX-*-
+% this document should be run through the mudela-book script after lilypond
+% has been installed.
+
+
 \documentclass{article}
 \usepackage{a4wide}
 \title{Mudela and LilyPond crash course}
@@ -33,10 +37,10 @@ chords by \verb+<+ and \verb+>+.
 
 \begin[verbatim]{mudela}
 \score {
-        \melodic {      % { means voice
-        c'4 g'4         % 4 means quaver, 1 beat in 4/4 meter
+        \melodic {      % {...} is a voice
+        c'4 g'4         % c and g are pitches, 4 is the duration (quaver)
         c''4 ''c4       % c' is 1 octave up, 'c 1 down.
-        <c'4 g'4>       % <> means a chord
+        <c'4 g'4>       % <...> is a chord
         }
 } 
 \end{mudela}

diff --git a/bin/conflily b/bin/conflily
index 4623edacf5c8c081e0631bd3135582ffbfa54fa4..2a495a1308a0c20f6e3576b0285c3c753b315b55 100644 (file)
--- a/bin/conflily
+++ b/bin/conflily
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # conflily
 # ugh: must be executed from lilypond-x.x.x (bin/conflily)
 
@@ -17,16 +17,18 @@ if [ ! -e $HOME/lelie ]; then
        ln -s $lelie $HOME/lelie
 fi
 
-rm $lelie/current >& /dev/null
+rm $lelie/current 2>&1 > /dev/null
 current=`basename \`pwd\``
 echo ln -s $lelie/$current $lelie/current
 ln -s $lelie/$current $lelie/current
 
-ln -sf $lelie/current/lily/out/lilypond bin/lilypond
-ln -sf $lelie/current/mi2mu/out/mi2mu bin/mi2mu
+ln -sf $lelie/current/lily/out/lilypond bin/out/lilypond
+ln -sf $lelie/current/mi2mu/out/mi2mu bin/out/mi2mu
 
 if [ "x$LILYINCLUDE" = "x" ]; then
-       export LILYINCLUDE=$lelie/current/init
+       echo you should make add the following to your login script
+       echo "export LILYINCLUDE=$lelie/current/init"
+       echo "export PATH=$PATH:$lelie/current/bin/out/"
 fi
 
 configure --prefix=$root --enable-debugging --enable-printing --enable-checking

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 0ff49514e0e54570b3e28a9c6e99ad9de9c13476..5d3c98b84263ed13a54cdd8924ad108c59f1de91 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -50,7 +50,7 @@ Score_performer::finish()
     Midi_stream output_stream( midi_l_->outfile_str_, midi_item_p_arr_.size() + 1, 384 );    
     *mlog << "MIDI output to " << midi_l_->outfile_str_ << " ..." << endl;    
 
-    header( output_stream);        
+    header( output_stream);
     int track_i = 1;
     for (int i=0; i<  midi_item_p_arr_.size(); i++) {
        Midi_item * it_p = midi_item_p_arr_[i];
@@ -59,6 +59,7 @@ Score_performer::finish()
            ((Midi_track*)it_p )->number_i_ = track_i ++;
        output_stream<< *it_p;
     }
+    *output_stream.os_p_ << flush;
     *mlog << endl;
 }
 

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index b21bc5c45aee54db7435607ef2a7fa92788d713f..b0368f9c4f91e45e391c629f029b93f3f5b8b05a 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -48,11 +48,18 @@ Staff_performer::header()
     Midi_text track_name( Midi_text::TRACK_NAME, instrument_str());
     midi_track_p_->add( Moment( 0 ), &track_name );
 
-    // set instrument :-)
+    // set instrument description
     Midi_text instrument_name( Midi_text::INSTRUMENT_NAME, instrument_str() );
     midi_track_p_->add( Moment( 0 ), &instrument_name );
 
-    
+    // set instrument :-)
+    // lieve wendy, nu heb je mijn track_i_ / get_staff_i weggehaald...
+    // zie ook note-performer: ugh
+    // ugh, need to know channel (===track===staff) too
+    int channel_i = 0;
+    Midi_instrument instrument( channel_i, instrument_str() );
+    midi_track_p_->add( Moment( 0 ), &instrument );
+
     Midi_tempo midi_tempo( get_tempo_i(  ) );
     midi_track_p_->add( Moment( 0 ), &midi_tempo );
 }

diff --git a/mi2mu/midi-event.cc b/mi2mu/midi-event.cc
index 04395149870da3f1d7bd2a97c9b51e1479039fad..f698cde71cda66ae22814ca92b7f24ddc5e353fe 100644 (file)
--- a/mi2mu/midi-event.cc
+++ b/mi2mu/midi-event.cc
@@ -39,7 +39,8 @@ Midi_key::mudela_str( bool command_mode_bo )
                str += String( (char)( ( key_i_ + 2 ) % 7 + 'A'  ) );
        else // heu, -2: should be - 1 1/2: A -> fis
                str += String( (char)( ( key_i_ + 2 - 2 ) % 7 + 'a'  ) );
-       str = String( "% " ) + '"' + str + '"' + "; % not supported yet\n"; 
+       str = String( "% \"" ) + str
+           + String('"') + "; % not supported yet\n"; 
        return str;
 }