lilypond-0.1.0

diff --git a/BUGS b/BUGS
index 4743ac694333310e377e46a10628cb74733b7a28..e0f534ec8e2c9e50e9fba6e15e9f1d5d6500d2d6 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -1,20 +1,11 @@
 
 [document reintroduced deficiencies.]
 
-wrong instrument:
-
-cad = \melodic { \id "Staff" "fr horn"; c4 }
-
-\score { 
-       \melodic {\cad}
-}
-
 *******************
  '.' -> lilypond: lexer.l:258: int My_lily_lexer::yylex(): Assertion `cnv == 1' failed.
 
 ***********************
 
-2nd staff takes too long.
 
 \score { < 
        \melodic { \id "Staff" ""; c'4 g'4 }

diff --git a/NEWS b/NEWS
index 2d7ff005fb79769f5069ca5f0e7513b6c1b50090..a06bb286319a54b3059ece426984b3280e93a7c5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,17 @@
 
+august 1
+
+VERSION 0.1.0
+       
+       - bf: output tempo to track 0 too
+       - bf: don't forget to copy id_str_, so moved  into Music
+
+pl 78.jcn1
+       - fix for multi-staff midi: wohltemperirt.ly, standchen.ly
+       - doze fixes
+       - bf: conflily, configure (text)
+*****
+july 31
 pl 78
        - bf: Midi_instrument 
        - added  enable/disable defaults to help.

diff --git a/TODO b/TODO
index 8a0802b5ef522ff7c077da2020459c803d739513..78cecc175ec03229882fe049cd19edfba904f3a3 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,7 +1,3 @@
-0.1:
-
-       * versioning stuff (cvt mudela, mudela, etc.)
-
 Features you cannot find in the doco as working, should be mentioned here.
        
 This is an assorted collection of stuff that will be done, might be
@@ -10,22 +6,22 @@ done, or is an idea that I want to think about
 Most of the items are marked in the code as well, with full explanation. 
 grep for TODO and ugh/ugr
 
+       * versioning stuff (cvt mudela, mudela, etc.)
+
+       * get rid of gif files.
+
+       * set_midi_channel/staff() out of performer.
+
        * dots into separate item.
 
        * use String iso Text_def for lyrics.
 
        * use position 0 for center of staff iso bottom.
 
-       * return status
+       * return status on exit
 
        * lyrics in chords still fuck up.
 
-       * add to MIDI output:
-       - tempo change
-       - repeat
-       - slurs
-       - dynamics etc.
-
        * rewire acknowledge_element() logic with a process_acknowledged()
 
        * progress when creating MIDI elts.
@@ -42,12 +38,16 @@ grep for TODO and ugh/ugr
 
        * decent TeX page layout
 
-       * enter script priority
-
-       * a hands on tutorial
+       * a tutorial
 
 PROJECTS
 
+       * add to MIDI output:
+       - tempo change
+       - repeat
+       - slurs
+       - dynamics etc.
+
        * grace notes
        - adapt for multiple font sizes.
        - make separate class for Grace_*_engravers 

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index dda2f568adc98a5c62bf667c1940e6e2db2a9984..8b26d3ee18f815c1f64f6984055d251b006319a6 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -22,11 +22,6 @@ class Music_list : public Music {
 public:
     int multi_level_i_;
   
-    /// what kind of iterator needed to walk this music?
-    String type_str_;
-
-    /// what name (or look for this name)
-    String id_str_;    
     Music_list(Music_list const&);    
     Music_list();
     DECLARE_MY_RUNTIME_TYPEINFO;

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 196f461eeb6bd290bdf9a62539f01488ab51e4f8..41531a790218770701f6aa02855a7bc039e2b38b 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -27,6 +27,16 @@
 class Music:public Input {
 public:
     Music_list * parent_music_l_;
+    
+    /** what kind of iterator needed to walk this music?  This doesn't
+      make sense for simple (ie non-list) music, but it does no harm
+      here. Yes, it did harm Music_list: you can forget to copy it.
+      
+      */
+    String type_str_;
+
+    /// what name (or look for this name)
+    String id_str_;    
 
     virtual MInterval time_int()const;
     virtual ~Music(){}

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 99b942b91ea2eaeed4c6f39b5b4d3b6863a42c21..09ee833db0ed22dc3295e198e1d3daf9c13939b4 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -128,18 +128,14 @@ Music_iterator::static_get_iterator_p(Music *m,
     else if (m->is_type_b( Voice::static_name())) 
        p =  new Voice_iterator(  (Voice*) m);
     
-     if ( m->is_type_b( Music_list::static_name())) {
-       Music_list* ml = (Music_list*) m;
-       if (ml -> type_str_ != "") {
-           Translator * a =report_l->
-               find_get_translator_l(ml-> type_str_, ml->id_str_);
-
-               
+    if (m -> type_str_ != "") {
+       Translator * a =report_l->
+           find_get_translator_l(m-> type_str_, m->id_str_);
            p->set_translator( a);
-           
-       } 
-     } 
-     if (! p->report_to_l() )
+    } 
+
+
+    if (! p->report_to_l() )
         p ->set_translator(report_l);
     
     return p;
@@ -214,7 +210,7 @@ IMPLEMENT_IS_TYPE_B1(Chord_iterator,Music_iterator);
 Moment
 Chord_iterator::next_moment()const
 {
-    Moment next_ = INFTY;
+    Moment next_ = INFTY_f;
     for (PCursor<Music_iterator*> i(children_p_list_.top()); i.ok(); i++)
        next_ = next_ <? i->next_moment() ;
     return next_;