patch::: 1.0.14.tca1

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index b9dcde679dfd31b698d4939024957e4f69e06f59..10ee1a3b3f23e2659059305dfb0c870ef0227d80 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -3,38 +3,39 @@
 
   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
 {
-    return MInterval (0,0);
+  return MInterval (0,0);
 }
 
 void
-Music::print()const
+Music::print() const
 {
 #ifndef NPRINT
-    if ( ! check_debug)
-       return ;
-    DOUT << name() << "{";
-    if  (type_str_!="" || id_str_!="")
-       DOUT << "`" <<type_str_ << " = " << id_str_<<"\'";
-    do_print();
-    DOUT << "}\n";
+  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
@@ -43,7 +44,7 @@ Music::translate (Moment)
 }
 
 void
-Music::do_print()const
+Music::do_print() const
 {
 }
 
@@ -52,11 +53,15 @@ 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;
+}
 
+