/*
- 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--2006 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"
notename_ = n;
alteration_ = a;
octave_ = o;
- scale_ = default_global_scale;
- normalize ();
+ scale_ = default_global_scale;
+ normalize_octave ();
}
/* FIXME: why is octave == 0 and default not middleC ? */
Pitch::Pitch ()
{
notename_ = 0;
- scale_ = default_global_scale;
+ scale_ = default_global_scale;
octave_ = 0;
+ alteration_ = (Rational)0;
}
int
if (n)
return n;
if (a)
- return a;
-
+ return a > (Rational)0;
+
return 0;
}
int
Pitch::steps () const
{
- return notename_ + octave_ * scale_->step_tones_.size ();
+ return notename_ + octave_ * scale_->step_count ();
}
Rational
Pitch::tone_pitch () const
{
- int o = octave_;
- int n = notename_;
- while (n < 0)
- {
- n += scale_->step_tones_.size ();
- o--;
- }
-
- Rational tones ((o + n / scale_->step_tones_.size ()) * 6, 1);
- tones += scale_->step_tones_[n % scale_->step_tones_.size ()];
-
- tones += alteration_;
-
- return tones;
+ return scale_->tones_at_step (notename_, octave_) + alteration_;
}
/* Calculate pitch height in 12th octave steps. Don't assume
}
void
-Pitch::normalize ()
+Pitch::normalize_octave ()
{
- Rational pitch = tone_pitch ();
- while (notename_ >= (int) scale_->step_tones_.size ())
- {
- notename_ -= scale_->step_tones_.size ();
- octave_++;
- alteration_ -= tone_pitch () - pitch;
- }
- while (notename_ < 0)
- {
- notename_ += scale_->step_tones_.size ();
- octave_--;
- alteration_ -= tone_pitch () - pitch;
- }
+ int normalized_step = notename_ % scale_->step_count ();
+ if (normalized_step < 0)
+ normalized_step += scale_->step_count ();
+
+ octave_ += (notename_ - normalized_step) / scale_->step_count ();
+ notename_ = normalized_step;
+}
+void
+Pitch::normalize_alteration ()
+{
while (alteration_ > Rational (1))
{
- if (notename_ == int (scale_->step_tones_.size ()))
- {
- notename_ = 0;
- octave_++;
- }
- else
- notename_++;
-
- alteration_ = Rational (0);
- alteration_ -= tone_pitch () - pitch;
+ alteration_ -= scale_->step_size (notename_);
+ notename_++;
}
- while (alteration_ < Rational(-1))
+ while (alteration_ < Rational (-1))
{
- if (notename_ == 0)
- {
- notename_ = scale_->step_tones_.size ();
- octave_--;
- }
- else
- notename_--;
-
- alteration_ = 0;
- alteration_ -= tone_pitch () - pitch;
+ notename_--;
+ alteration_ += scale_->step_size (notename_);
}
}
+void
+Pitch::normalize ()
+{
+ normalize_alteration ();
+ normalize_octave ();
+}
+
void
Pitch::transpose (Pitch delta)
{
notename_ += delta.notename_;
alteration_ += new_alter - tone_pitch ();
- normalize ();
+ normalize_octave ();
}
Pitch
string
Pitch::to_string () const
{
- int n = (notename_ + 2) % scale_->step_tones_.size ();
+ int n = (notename_ + 2) % scale_->step_count ();
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)
{
{
Pitch *r = (Pitch *) SCM_CELL_WORD_1 (s);
scm_puts ("#<Pitch ", port);
- scm_display (scm_makfrom0str (r->to_string ().c_str ()), port);
+ scm_display (ly_string2scm (r->to_string ()), port);
scm_puts (" >", port);
return 1;
}
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);