release: 0.1.11

[lilypond.git] / lily / include / music-list.hh

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index 6ea2ae0f478907d4d587a40f53fb37cd35f62112..f084c19ecb00409deff1bd3a9f00193aea763053 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -22,17 +22,12 @@ 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 (Music_list const&);    
     Music_list();
-    NAME_MEMBERS();
+    DECLARE_MY_RUNTIME_TYPEINFO;
     VIRTUAL_COPY_CONS(Music_list,Music);
-    virtual void add(Music*);
-    virtual void transpose(Melodic_req const *);
+    virtual void add (Music*);
+    virtual void transpose (Melodic_req const *);
     
     Pointer_list<Music*> music_p_list_;
 protected:
@@ -47,17 +42,21 @@ protected:
 class Chord : public Music_list {
 public:
     Chord();
-    NAME_MEMBERS();
+    DECLARE_MY_RUNTIME_TYPEINFO;
     VIRTUAL_COPY_CONS(Chord,Music);
-    virtual void translate(Moment dt);
-    virtual MInterval time_int()const;
+    virtual void translate (Moment dt);
+    virtual MInterval time_int() const;
 };
 
-class Voice_element : public Chord {
+/**
+  The request is a collection of Requests. A note that you enter in mudela is 
+  one Request_chord, one syllable of lyrics is one Request_chord
+ */
+class Request_chord : public Chord {
 public:
-    NAME_MEMBERS();
-    Voice_element();
-    VIRTUAL_COPY_CONS(Voice_element,Music);
+    DECLARE_MY_RUNTIME_TYPEINFO;
+    Request_chord();
+    VIRTUAL_COPY_CONS(Request_chord,Music);
 };
 
 /**
@@ -69,10 +68,10 @@ public:
     Moment offset_mom_;
 
     Voice();
-    NAME_MEMBERS();
+    DECLARE_MY_RUNTIME_TYPEINFO;
     VIRTUAL_COPY_CONS(Voice, Music);
-    virtual void translate(Moment dt);
-    virtual MInterval time_int()const;
+    virtual void translate (Moment dt);
+    virtual MInterval time_int() const;
 };
 
 /** A simple piece of music, which wishes to change the spot of its
@@ -86,7 +85,7 @@ public:
     /// what name (or look for this name)
     String id_str_;
 
-    NAME_MEMBERS();
+    DECLARE_MY_RUNTIME_TYPEINFO;
     VIRTUAL_COPY_CONS(Change_reg, Music);
 };
 #endif // MUSIC_LIST_HH