patch::: 1.0.14.tca1

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index 7de77d1fc9551ee6d5eed197aa5165054593cc4c..10ee1a3b3f23e2659059305dfb0c870ef0227d80 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -3,13 +3,14 @@
 
   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>
 */
 
 
 #include "music.hh"
 #include "music-list.hh"
 #include "debug.hh"
+#include "musical-pitch.hh"
 
 MInterval
 Music::time_int() const
@@ -22,17 +23,17 @@ Music::print() const
 {
 #ifndef NPRINT
   if (! check_debug)
-       return ;
+    return ;
   DOUT << name() << "{";
-  if  (type_str_!="" || id_str_!="")
-       DOUT << "`" <<type_str_ << " = " << id_str_<<"\'";
+  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 )
 {
   
 }
@@ -55,8 +56,12 @@ IMPLEMENT_IS_TYPE_B(Music);
   
 Music::Music()
 {
-  parent_music_l_ =0;
 }
 
-IMPLEMENT_IS_TYPE_B1(Change_reg,Music)
+Musical_pitch
+Music::to_relative_octave (Musical_pitch m)
+{
+  return m;
+}
 
+