X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=5b33f57c54ad4e8b1dcd709992b15ea49685c37b;hb=6bc0a8a090e82c4bce57df8e980b48cc78cb422b;hp=155c7e31ff50564498196e294a1238bd1705c62d;hpb=0d2593e4ef1f3d1eb6994223f1de8f6c8fbcd066;p=lilypond.git

diff --git a/lily/music.cc b/lily/music.cc
index 155c7e31ff..5b33f57c54 100644
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -3,45 +3,66 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 
 #include "music.hh"
+#include "music-list.hh"
 #include "debug.hh"
+#include "musical-pitch.hh"
 
 MInterval
 Music::time_int() const
 {
-    return MInterval(0,0);
+  return MInterval (0,0);
 }
+
 void
-Music::print()const
+Music::print() const
 {
-    #ifndef NPRINT
-    mtor << name() << "{" ;
-    do_print();
-    mtor << "}\n";
-    #endif
+#ifndef NPRINT
+  if (! check_debug)
+    return ;
+  DOUT << name() << "{";
+  if  (translator_type_str_.length_i ())
+    DOUT << translator_type_str_ << " = " << translator_id_str_;
+  do_print();
+  DOUT << "}\n";
+#endif
 }
+
 void
-Music::transpose(Melodic_req const*)
+Music::transpose (Musical_pitch )
 {
-    
+  
 }
 
 void
-Music::translate(Moment )
+Music::translate (Moment)
 {
 }
 
 void
-Music::do_print()const
+Music::do_print() const
 {
 }
 
-IMPLEMENT_STATIC_NAME(Music);
 
+IMPLEMENT_IS_TYPE_B(Music);
+
+
+
+  
+Music::Music()
+{
+  parent_music_l_ =0;
+}
+
+Musical_pitch
+Music::to_relative_octave (Musical_pitch m)
+{
+  return m;
+}
 
-    
-Music::Music(){}
+