From: fred <fred>
Date: Sun, 24 Mar 2002 19:26:39 +0000 (+0000)
Subject: lilypond-0.0.17
X-Git-Tag: release/1.5.59~5680
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1b513547f3d915ec8efc53431c4057e2ead2f08a;p=lilypond.git

lilypond-0.0.17
---

diff --git a/hdr/identparent.hh b/hdr/identparent.hh
index 2e65537fc0..addfd26e0b 100644
--- a/hdr/identparent.hh
+++ b/hdr/identparent.hh
@@ -20,8 +20,7 @@ struct Identifier
     virtual const char*classname() { return "new Identifier"; }
     void error();
     virtual Input_staff * staff(bool = false) { error(); return 0; }
-    virtual Horizontal_music*hmusic(bool = false) { error(); return 0; }
-    virtual Vertical_music*vmusic(bool = false) { error(); return 0; }
+    virtual Input_music *music(bool = false) { error(); return 0; }
     virtual Music_voice *mvoice(bool = false) { error(); return 0; }
     virtual Symtables *symtables(bool = false) { error(); return 0; }
     virtual Music_general_chord *mchord(bool = false) { error(); return 0; }
diff --git a/hdr/inputstaff.hh b/hdr/inputstaff.hh
index abfcc52f61..e2caea7dc2 100644
--- a/hdr/inputstaff.hh
+++ b/hdr/inputstaff.hh
@@ -15,11 +15,11 @@
 struct Input_staff {
     String type;
     IPointerList<Input_command*> commands_;
-    IPointerList<Horizontal_music*> music_;
+    IPointerList<Input_music*> music_;
 
     /****************/
 
-    void add(Horizontal_music*m);
+    void add(Input_music*m);
     Input_staff(Input_staff&);
     Input_staff(String);
     void add(svec<Input_command*> &s);
diff --git a/src/inputstaff.cc b/src/inputstaff.cc
index 2337f6ae2d..4a38d38bc1 100644
--- a/src/inputstaff.cc
+++ b/src/inputstaff.cc
@@ -24,7 +24,7 @@ Input_staff::Input_staff(String s)
 }
 
 void
-Input_staff::add(Horizontal_music*m)
+Input_staff::add(Input_music*m)
 {
     music_.bottom().add(m);
 }
@@ -39,7 +39,7 @@ Input_staff::parse(PointerList<Input_command*> score_wide)
     else if (type == "rhythmic")
 	p = new Rhythmic_staff;
 
-    for (PCursor<Horizontal_music*> i(music_); i.ok(); i++) {
+    for (PCursor<Input_music*> i(music_); i.ok(); i++) {
 	Voice_list vl = i->convert();
 	p->add(vl);
     }
@@ -59,7 +59,7 @@ Input_staff::Input_staff(Input_staff&s)
 {
     for (PCursor<Input_command*> i(s.commands_); i.ok(); i++)
 	commands_.bottom().add(new Input_command(**i));
-    for (PCursor<Horizontal_music*> i(s.music_); i.ok(); i++)
+    for (PCursor<Input_music*> i(s.music_); i.ok(); i++)
 	add(i);
 
     type = s.type;
@@ -72,7 +72,7 @@ Input_staff::print() const
     mtor << "Input_staff {\n";
     for (PCursor<Input_command*> i(commands_); i.ok(); i++)
 	i->print();
-    for (PCursor<Horizontal_music*> i(music_); i.ok(); i++)
+    for (PCursor<Input_music*> i(music_); i.ok(); i++)
 	i->print();
     mtor << "}\n";
 #endif