lilypond-0.0.30

diff --git a/src/inputscore.cc b/src/inputscore.cc
index ef684047c4e06e210d9474288fa2b02b9afc5e8d..cb9086b1a3ebcc313fd70ec10a93d8c13f567aa8 100644 (file)
--- a/src/inputscore.cc
+++ b/src/inputscore.cc
@@ -26,6 +26,7 @@ Input_score::set(Paperdef*p)
     delete paper_;
     paper_ = p;
 }
+
 Input_score::Input_score(Input_score const&)
 {
     assert(false);
@@ -53,9 +54,7 @@ Input_score::parse()
 
 Input_score::~Input_score()
 {
-    // TODO!
-//should fix paper/symtabs to allow this deletion.
-//    delete paper_;
+    delete paper_;
 }
 
 Input_score::Input_score()

diff --git a/src/inputstaff.cc b/src/inputstaff.cc
index 27e9a55732a462a1be2696009483dd4d19d3b978..d79aac1021f2f47c18173330a77183d8c766c6f4 100644 (file)
--- a/src/inputstaff.cc
+++ b/src/inputstaff.cc
@@ -5,12 +5,10 @@
 #include "inputstaff.hh"
 #include "inputcommand.hh"
 #include "staffcommands.hh"
-#include "melodicstaff.hh"
-#include "rhythmstaff.hh"
-#include "lyricstaff.hh"
 #include "staff.hh"
 #include "complexstaff.hh"
 #include "lexer.hh"
+#include "lyricstaff.hh"
 
 void
 Input_staff::add(Array<Input_command*> &s)
@@ -37,13 +35,16 @@ Staff*
 Input_staff::parse(Score*score_l)
 {
     Staff *p=0;
-
+#if 0
     if (type == "simple")
        p = new Melodic_staff;
-    else if (type == "melodic")
-       p = new Complex_staff;
     else if (type == "rhythmic")
        p = new Rhythmic_staff;
+    else
+#endif
+       
+       if (type == "melodic")
+       p = new Complex_staff;
     else if (type == "lyric")
        p = new Lyric_staff;
     else