lilypond-0.1.26

diff --git a/lily/command-request.cc b/lily/command-request.cc
index d6edd2cca048398a739269a2a7fe9bd8802987fe..ee9d34567427ac3d18c81a8bce1bfeddb21ab3ab 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -214,7 +214,7 @@ Measure_grouping_req::do_equal_b (Request*) const
 /* *************** */
 
 void
-Key_change_req::transpose (Melodic_req const & d) const
+Key_change_req::transpose (Melodic_req const * d) const
 {
   WARN << _("don't know how to transpose a key. \n");
   for (int i=0; i < melodic_p_arr_.size(); i++)

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 5ebe4cb3a382b390e7073c5e83ec32dada0ef803..f53fc44de1d96a4ccddd804e1b1c88a2e9d59873 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -126,7 +126,7 @@ struct Melodic_req :virtual Musical_req
   int height() const;
 
   /// transpose. #delta# is relative to central c.
-  void transpose (Melodic_req const &delta);
+  virtual void transpose (Melodic_req const *delta);
   /// return pitch from central c (in halfnotes)
   int pitch() const; 
   Melodic_req();

diff --git a/lily/music.cc b/lily/music.cc
index 93a3f093b001ab9b5f354669eac9f335ab8ea6c0..443088c9526c6b80224a6db4a15cfaaf37311630 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -22,10 +22,10 @@ Music::print() const
 {
 #ifndef NPRINT
   if (! check_debug)
-       return ;
+    return ;
   DOUT << name() << "{";
   if  (translator_type_str_.length_i ())
-       DOUT << translator_type_str_ << " = " << translator_id_str_;
+    DOUT << translator_type_str_ << " = " << translator_id_str_;
   do_print();
   DOUT << "}\n";
 #endif
@@ -60,3 +60,4 @@ Music::Music()
 
 IMPLEMENT_IS_TYPE_B1(Change_reg,Music)
 
+     

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index 4247e7e559c0551a25df9dbf6dda67cddabcd729..d24721587661cea36a26773704d7904d8b199e30 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -87,12 +87,12 @@ Melodic_req::Melodic_req()
 }
 
 void
-Melodic_req::transpose (Melodic_req const & delta)
+Melodic_req::transpose (Melodic_req const * delta)
 {
   int old_pitch = pitch();
-  int delta_pitch = delta.pitch();
-  octave_i_ += delta.octave_i_;
-  notename_i_ += delta.notename_i_;
+  int delta_pitch = delta->pitch();
+  octave_i_ += delta->octave_i_;
+  notename_i_ += delta->notename_i_;
   while  (notename_i_ >= 7)
     {
        notename_i_ -= 7;
@@ -105,7 +105,7 @@ Melodic_req::transpose (Melodic_req const & delta)
   accidental_i_ -= delta_acc;
   if (abs (accidental_i_) > 2)
     {
-       delta.warning (_("transposition makes accidental larger than 2"));
+       delta->warning (_("transposition makes accidental larger than 2"));
     }
 }