X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=e9872fdf8eb09ba8e9bb534b52644583b7ef2744;hb=0e4883e95834d2692a0568e42d2fe697ae771c3a;hp=90d50d46e2ff43bafeeb90136f8f81ec55ce1251;hpb=e344ae579fa1d81fc6c6f3049494697872fd39f9;p=lilypond.git diff --git a/lily/pitch.cc b/lily/pitch.cc index 90d50d46e2..e9872fdf8e 100644 --- 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--2010 Han-Wen Nienhuys - (c) 1998--2008 Han-Wen Nienhuys + 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 . */ #include "pitch.hh" @@ -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);