Run grand-replace (issue 3765)

[lilypond.git] / lily / pitch.cc

diff --git a/lily/pitch.cc b/lily/pitch.cc
index e9872fdf8eb09ba8e9bb534b52644583b7ef2744..bf2fd714ac4a61fb0aac0c9b057980f1cb8f413c 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,14 +25,14 @@
 #include "warn.hh"
 
 #include "ly-smobs.icc"
-
+#include <cmath>
 
 Pitch::Pitch (int o, int n, Rational a)
 {
   notename_ = n;
   alteration_ = a;
   octave_ = o;
-  scale_ = default_global_scale; 
+  scale_ = default_global_scale;
   normalize_octave ();
 }
 
@@ -40,8 +40,9 @@ Pitch::Pitch (int o, int n, Rational a)
 Pitch::Pitch ()
 {
   notename_ = 0;
-  scale_ = default_global_scale; 
+  scale_ = default_global_scale;
   octave_ = 0;
+  alteration_ = (Rational)0;
 }
 
 int
@@ -56,8 +57,8 @@ Pitch::compare (Pitch const &m1, Pitch const &m2)
   if (n)
     return n;
   if (a)
-    return a;
-  
+    return a > (Rational)0 ? 1 : -1;
+
   return 0;
 }
 
@@ -78,13 +79,13 @@ Pitch::tone_pitch () const
 int
 Pitch::rounded_semitone_pitch () const
 {
-  return int (double (tone_pitch () * Rational (2)));
+  return int (floor (double (tone_pitch () * Rational (2) + Rational (1, 2))));
 }
 
 int
 Pitch::rounded_quartertone_pitch () const
 {
-  return int (double (tone_pitch () * Rational (4)));
+  return int (floor (double (tone_pitch () * Rational (4) + Rational (1, 2))));
 }
 
 void
@@ -137,9 +138,9 @@ pitch_interval (Pitch const &from, Pitch const &to)
 {
   Rational sound = to.tone_pitch () - from.tone_pitch ();
   Pitch pt (to.get_octave () - from.get_octave (),
-           to.get_notename () - from.get_notename (),
+            to.get_notename () - from.get_notename (),
 
-           to.get_alteration () - from.get_alteration ());
+            to.get_alteration () - from.get_alteration ());
 
   return pt.transposed (Pitch (0, 0, sound - pt.tone_pitch ()));
 }
@@ -147,14 +148,15 @@ pitch_interval (Pitch const &from, Pitch const &to)
 /* FIXME
    Merge with *pitch->text* funcs in chord-name.scm  */
 char const *accname[] = {"eses", "eseh", "es", "eh", "",
-                        "ih", "is", "isih", "isis"};
+                         "ih", "is", "isih", "isis"
+                        };
 
 string
 Pitch::to_string () const
 {
   int n = (notename_ + 2) % scale_->step_count ();
   string s = ::to_string (char (n + 'a'));
-  Rational qtones = alteration_ * Rational (4,1);
+  Rational qtones = alteration_ * Rational (4, 1);
   int qt = int (rint (Real (qtones)));
 
   s += string (accname[qt + 4]);
@@ -162,13 +164,13 @@ Pitch::to_string () const
     {
       int o = octave_ + 1;
       while (o--)
-       s += "'";
+        s += "'";
     }
   else if (octave_ < 0)
     {
       int o = (-octave_) - 1;
       while (o--)
-       s += ::to_string (',');
+        s += ::to_string (',');
     }
 
   return s;
@@ -221,7 +223,7 @@ IMPLEMENT_TYPE_P (Pitch, "ly:pitch?");
 SCM
 Pitch::mark_smob (SCM x)
 {
-  Pitch *p = (Pitch*) SCM_CELL_WORD_1 (x);
+  Pitch *p = (Pitch *) SCM_CELL_WORD_1 (x);
   return p->scale_->self_scm ();
 }
 
@@ -243,8 +245,8 @@ Pitch::equal_p (SCM a, SCM b)
   Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b);
 
   bool eq = p->notename_ == q->notename_
-    && p->octave_ == q->octave_
-    && p->alteration_ == q->alteration_;
+            && p->octave_ == q->octave_
+            && p->alteration_ == q->alteration_;
 
   return eq ? SCM_BOOL_T : SCM_BOOL_F;
 }