release: 1.3.144

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

diff --git a/lily/include/music.hh b/lily/include/music.hh
index a139ae28d4af589a286a80b0a8576d433238f555..2c67ebdd90e00bd35743dffe7cc4b4f8871984c7 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -16,12 +16,14 @@
 #include "lily-proto.hh"
 #include "string.hh"
 #include "smobs.hh"
+#include "music-constructor.hh"
+
 
 /** Music is anything that has duration and supports both time compression and
   transposition.
   
   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",
+ (which has a duration which can be transposed) is considered "music",
 
   Music is hierarchical: 
 
@@ -49,21 +51,20 @@ public:
   /// The duration of this piece of music
   virtual Moment length_mom () const;
 
-  void print() const;
+  void print () const;
   /// Transpose, with the interval central C to #p#
   virtual void transpose (Pitch p);
 
   /// Scale the music in time by #factor#.
   virtual void compress (Moment factor);
-  VIRTUAL_COPY_CONS(Music);
+  VIRTUAL_COPY_CONS (Music);
+  Music ();
   Music (Music const &m);
-  Music();
+  Music (SCM);
 protected:
-
-  DECLARE_SMOBS(Music,);
+  DECLARE_SMOBS (Music,);
   SCM immutable_property_alist_;
   SCM mutable_property_alist_;
- 
 };