lilypond-0.0.34

diff --git a/NEWS b/NEWS
index ce2cca67caa4e897e5366874df8a78231d70e097..9e99b19fe00690cec3ad6c2ebf3398014a4f4acd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,24 @@
+*******
+pl 34
+       - better midi syntax.
+       - --midi,-M option.
+       - preliminary midi2mudela (/mudela2midi) converter: m2m (JCN)
+Internal
+       - m2m sources: midi-*; (JCN)
+       - new Midi_walker, fixes several MIDI bugs.
+       - junked Midi_staff, Staff_column children, Midi_walker
+       - Midi_output
+
 *******
 pl33
 Examples
        - Swedish notenames (MB)
+
+pl pre33-2
+
+Bugfix
+       - midi pitch
+       
 Features
        - Jan's patches, see below
 Bugfix

diff --git a/input/error.ly b/input/error.ly
index 74924e9b25da244a09d0cd8be8846c31b9a2659c..283f48922d8491e0bec716d3deb60257ef019e72 100644 (file)
--- a/input/error.ly
+++ b/input/error.ly
@@ -5,7 +5,7 @@ mwa = music {
        [ a8 a8 a8 a8 a8 ]      % 
        [ a8 ]  % 
 %       segfault
-%      { \music{ [ bes^"1"( )a bes-. g-. ] a4-.^"4" } \music{ [ e ] } \music{ [ c ] } } |
+       { \music{ [ bes^"1"( )a bes-. g-. ] a4-.^"4" } \music{ [ e ] } \music{ [ c ] } } |
        a ) b ] c       % warning
        &               % ok; error
        a b ) ]         % ok; error

diff --git a/input/pavane.ly b/input/pavane.ly
index 1e2c6da688318afa64d5ab9e92b7068aec6782af..bb7fd643b0e25b946657ead2cf72e50e7b531b96 100644 (file)
--- a/input/pavane.ly
+++ b/input/pavane.ly
@@ -115,5 +115,4 @@ score {
                bar "||"
        }
        midi { tempo 4:70 }
-       staff { midi   music { horn } }
 }

diff --git a/src/scores.cc b/src/scores.cc
index 2788fe062a958eecbd40c0117d1a49f8aae82da8..b4019fd141bf99d6c62ad236ca4db086cc1dae8d 100644 (file)
--- a/src/scores.cc
+++ b/src/scores.cc
@@ -2,22 +2,33 @@
 #include "inputscore.hh"
 #include "score.hh"
 #include "string.hh"
+#include "paperdef.hh"
+#include "debug.hh"
 
 static Array<Input_score*> score_array_global;
+String default_out_fn = "lelie";
 
-static String outfn="lelie.out";
-
-// todo: check we don't overwrite default output.
 void
 do_scores()
 {
     for (int i=0; i < score_array_global.size(); i++) {
-       Score * s_p = score_array_global[i]->parse();   
-       delete score_array_global[i];
+       Input_score* &is_p = score_array_global[i];
+       if (is_p->errorlevel_i_) {
+           warning("Score contains errors. Will not process it. ",
+                   is_p->defined_ch_c_l_);
+           delete is_p;
+           continue;
+       } 
+       
+       if (only_midi) {
+           delete is_p->paper_p_;
+           is_p->paper_p_ = 0;
+       }
+
+       Score * s_p = is_p->parse();    
+       delete is_p;
        s_p->print ();
        s_p->process();
-       s_p->output(outfn);
-       s_p->midi();
        delete s_p;
     }
     score_array_global.set_size(0);
@@ -29,20 +40,9 @@ add_score(Input_score * s)
     score_array_global.push(s);
 }
 
-#if 0
-Input_score*
-current_iscore_l()
-{
-    if ( score_array_global.size() )
-       return score_array_global.top(); // UGH
-    else
-       return 0;
-}
-#endif
-
 void
 set_default_output(String s)
 {
-    outfn = s;
+    default_out_fn = s;
 }