release: 1.0.8

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index 196f461eeb6bd290bdf9a62539f01488ab51e4f8..9a7b6f2d97cff1e1e0fa0189e69dece543a7ad74 100644 (file)
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -17,28 +17,41 @@
 #include "lily-proto.hh"
 #include "string.hh"
 
-/** In Lily, everything that has a length and a pitch (which can be
-  transposed) is considered "music", 
+/** 
+  Anything which has length or pitch.
+  
+  In Lily, everything that can be thought to have a length and a pitch
+  (which has a duration which can be transposed) is considered "music",
 
   Music is hierarchical: 
 
-  @seealso Music_list
+  @see Music_sequence
+
   */
 class Music:public Input {
 public:
-    Music_list * parent_music_l_;
-
-    virtual MInterval time_int()const;
-    virtual ~Music(){}
-    void print() const;
-    virtual void transpose(Melodic_req const *);
-    virtual void translate(Moment dt);
-    VIRTUAL_COPY_CONS(Music,Music);
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Music();
+    
+  /** The 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_sequence: you can forget to copy it.
+      
+    */
+  String translator_type_str_;
+
+  /// what name (or look for this name)
+  String translator_id_str_;    
+
+  virtual Musical_pitch to_relative_octave (Musical_pitch);
+  virtual MInterval time_int() const;
+  virtual ~Music(){}
+  void print() const;
+  virtual void transpose (Musical_pitch );
+  virtual void translate (Moment dt);
+  VIRTUAL_COPY_CONS(Music,Music);
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  Music();
 protected:
-    virtual void do_print() const;
-  
+  virtual void do_print() const;
 };
 
 #endif // MUSIC_HH