lilypond-0.0.26

diff --git a/src/inputstaff.cc b/src/inputstaff.cc
index 70d91c669f8ce9d4d5f01f899b1cf6a23c6aff6f..3c3909468ddfca3faf79f27fd301087874acdc97 100644 (file)
--- a/src/inputstaff.cc
+++ b/src/inputstaff.cc
@@ -8,6 +8,7 @@
 #include "melodicstaff.hh"
 #include "rhythmstaff.hh"
 #include "lyricstaff.hh"
+#include "complexmelodicstaff.hh"
 #include "staff.hh"
 
 void
@@ -34,13 +35,18 @@ Staff*
 Input_staff::parse(Score*score_l)
 {
     Staff *p=0;
-    
-    if (type == "melodic")
+
+    if (type == "complex")
+       p = new Complex_melodic_staff;
+    else if (type == "melodic")
        p = new Melodic_staff;
     else if (type == "rhythmic")
        p = new Rhythmic_staff;
     else if (type == "lyric")
        p = new Lyric_staff;
+    else
+       error("Unknown staff-type `" + type +"\'");
+    
     p->score_l_ = score_l;
     p->define_spot_str_ = define_spot_str_;
     

diff --git a/src/mylexer.cc b/src/mylexer.cc
index d2e4b18ff8959e58154d0a10e0fee8d18d99ac37..acda945d3fe55e7a46d4734820ccdddbc7f53e44 100644 (file)
--- a/src/mylexer.cc
+++ b/src/mylexer.cc
@@ -22,9 +22,7 @@ static Keyword_ent the_key_tab[]={
     "goto", GOTO,
     "in", IN,
     "key", KEY,
-    "lyric", LYRIC,
     "mark", MARK,
-    "melodic", MELODIC,
     "meter", METER,
     "mm", MM,
     "octave", OCTAVECOMMAND,
@@ -33,7 +31,6 @@ static Keyword_ent the_key_tab[]={
     "paper", PAPER,
     "plet", PLET,
     "pt", PT,
-    "rhythmic", RHYTHMIC,
     "score", SCORE,
     "script", SCRIPT,
     "skip", SKIP,