resolve merge

[lilypond.git] / lily / pitch.cc

diff --git a/lily/pitch.cc b/lily/pitch.cc
index 590d13872f34ebc67b207983b4b6dc4a732446ae..c87f6f7610657a72e4ac81554015bba6be2b939a 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -1,9 +1,20 @@
 /*
-  musical-pitch.cc -- implement Pitch
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2009 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pitch.hh"
@@ -45,7 +56,7 @@ Pitch::compare (Pitch const &m1, Pitch const &m2)
   if (n)
     return n;
   if (a)
-    return a;
+    return a > (Rational)0;
   
   return 0;
 }
@@ -145,7 +156,7 @@ Pitch::to_string () const
   string s = ::to_string (char (n + 'a'));
   Rational qtones = alteration_ * Rational (4,1);
   int qt = int (rint (Real (qtones)));
-      
+
   s += string (accname[qt + 4]);
   if (octave_ >= 0)
     {
@@ -277,6 +288,14 @@ Pitch::transposed (Pitch d) const
   return p;
 }
 
+Pitch
+Pitch::normalized () const
+{
+  Pitch p = *this;
+  p.normalize ();
+  return p;
+}
+
 Rational NATURAL_ALTERATION (0);
 Rational FLAT_ALTERATION (-1, 2);
 Rational DOUBLE_FLAT_ALTERATION (-1);