Merge branch 'master' of ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / pitch.cc

diff --git a/lily/pitch.cc b/lily/pitch.cc
index c0a24f47b2b3a0fb79b067c0deb84c7cddf2d152..bc8a9e45a6cd9b8467ecc3af1344deed84da3998 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pitch.hh"
@@ -67,6 +67,10 @@ Pitch::tone_pitch () const
       o--;
     }
 
+  /*
+    we're effictively hardcoding the octave to 6 whole-tones,
+    which is as arbitrary as coding it to 1200 cents
+  */
   Rational tones ((o + n / scale_->step_tones_.size ()) * 6, 1);
   tones += scale_->step_tones_[n % scale_->step_tones_.size ()];
 
@@ -119,7 +123,7 @@ Pitch::normalize ()
       alteration_ = Rational (0);
       alteration_ -= tone_pitch () - pitch;
     }
-  while (alteration_ < Rational(-1))
+  while (alteration_ < Rational (-1))
     {
       if (notename_ == 0)
        {