/*
- musical-pitch.cc -- implement Pitch
+ musical-pitch.cc -- implement Pitch
source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "pitch.hh"
-#include "warn.hh"
+
#include "main.hh"
+#include "scale.hh"
+#include "string-convert.hh"
+#include "warn.hh"
#include "ly-smobs.icc"
-Pitch::Pitch (int o, int n, int a)
+
+Pitch::Pitch (int o, int n, Rational a)
{
notename_ = n;
alteration_ = a;
octave_ = o;
- normalise ();
+ scale_ = default_global_scale;
+ normalize ();
}
/* FIXME: why is octave == 0 and default not middleC ? */
Pitch::Pitch ()
{
notename_ = 0;
- alteration_ = 0;
+ scale_ = default_global_scale;
octave_ = 0;
}
int
Pitch::compare (Pitch const &m1, Pitch const &m2)
{
- int o = m1.octave_ - m2.octave_;
+ int o = m1.octave_ - m2.octave_;
int n = m1.notename_ - m2.notename_;
- int a = m1.alteration_ - m2.alteration_;
+ Rational a = m1.alteration_ - m2.alteration_;
if (o)
return o;
return n;
if (a)
return a;
+
return 0;
}
int
Pitch::steps () const
{
- return notename_ + octave_*7;
+ return notename_ + octave_ * scale_->step_tones_.size ();
}
-/* Should be settable from input? */
-static Byte diatonic_scale_semitones[ ] = { 0, 2, 4, 5, 7, 9, 11 };
-
-
-/* Calculate pitch height in 12th octave steps. Don't assume
- normalised pitch as this function is used to normalise the pitch. */
-int
-Pitch::semitone_pitch () const
+Rational
+Pitch::tone_pitch () const
{
int o = octave_;
int n = notename_;
while (n < 0)
{
- n += 7;
- o --;
+ n += scale_->step_tones_.size ();
+ o--;
}
- if (alteration_ % 2)
- programming_error ("semitone_pitch () called on quarter tone alteration.");
+ Rational tones ((o + n / scale_->step_tones_.size ()) * 6, 1);
+ tones += scale_->step_tones_[n % scale_->step_tones_.size ()];
- return ((o + n / 7) * 12
- + diatonic_scale_semitones[n % 7]
- + (alteration_ / 2));
+ tones += alteration_;
+
+ return tones;
}
+/* Calculate pitch height in 12th octave steps. Don't assume
+ normalized pitch as this function is used to normalize the pitch. */
int
-Pitch::quartertone_pitch () const
+Pitch::rounded_semitone_pitch () const
{
- int o = octave_;
- int n = notename_;
- while (n < 0)
- {
- n += 7;
- o --;
- }
+ return int (double (tone_pitch () * Rational (2)));
+}
- return ((o + n / 7) * 24
- + 2 * diatonic_scale_semitones[n % 7]
- + alteration_);
+int
+Pitch::rounded_quartertone_pitch () const
+{
+ return int (double (tone_pitch () * Rational (4)));
}
void
-Pitch::normalise ()
+Pitch::normalize ()
{
- int pitch = quartertone_pitch ();
- while (notename_ >= 7)
+ Rational pitch = tone_pitch ();
+ while (notename_ >= (int) scale_->step_tones_.size ())
{
- notename_ -= 7;
+ notename_ -= scale_->step_tones_.size ();
octave_++;
- alteration_ -= quartertone_pitch () - pitch;
+ alteration_ -= tone_pitch () - pitch;
}
while (notename_ < 0)
{
- notename_ += 7;
+ notename_ += scale_->step_tones_.size ();
octave_--;
- alteration_ -= quartertone_pitch () - pitch;
+ alteration_ -= tone_pitch () - pitch;
}
- while (alteration_ > DOUBLE_SHARP)
+
+ while (alteration_ > Rational (1))
{
- if (notename_ == 6)
+ if (notename_ == int (scale_->step_tones_.size ()))
{
notename_ = 0;
octave_++;
else
notename_++;
- alteration_ = 0;
- alteration_ -= quartertone_pitch () - pitch;
+ alteration_ = Rational (0);
+ alteration_ -= tone_pitch () - pitch;
}
-
- while (alteration_ < DOUBLE_FLAT)
+ while (alteration_ < Rational(-1))
{
if (notename_ == 0)
{
- notename_ = 6;
+ notename_ = scale_->step_tones_.size ();
octave_--;
}
else
notename_--;
alteration_ = 0;
- alteration_ -= quartertone_pitch () - pitch;
+ alteration_ -= tone_pitch () - pitch;
}
}
-/* WHugh, wat een intervaas */
void
Pitch::transpose (Pitch delta)
{
- int new_semi = quartertone_pitch () +delta.quartertone_pitch ();
+ Rational new_alter = tone_pitch () + delta.tone_pitch ();
+
octave_ += delta.octave_;
notename_ += delta.notename_;
- alteration_ += new_semi - quartertone_pitch ();
+ alteration_ += new_alter - tone_pitch ();
- normalise ();
+ normalize ();
}
Pitch
-pitch_interval (Pitch const & from , Pitch const & to )
+pitch_interval (Pitch const &from, Pitch const &to)
{
- int sound = to.quartertone_pitch () - from.quartertone_pitch ();
+ Rational sound = to.tone_pitch () - from.tone_pitch ();
Pitch pt (to.get_octave () - from.get_octave (),
to.get_notename () - from.get_notename (),
to.get_alteration () - from.get_alteration ());
- return pt.transposed (Pitch (0,0,sound - pt.quartertone_pitch ()));
+ return pt.transposed (Pitch (0, 0, sound - pt.tone_pitch ()));
}
-
/* 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
+string
Pitch::to_string () const
{
- int n = (notename_ + 2) % 7;
- String s = ::to_string (char (n + 'a'));
- if (alteration_)
- s += String (accname[alteration_ - DOUBLE_FLAT]);
-
+ int n = (notename_ + 2) % scale_->step_tones_.size ();
+ 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)
{
int o = octave_ + 1;
Pitch::to_relative_octave (Pitch p) const
{
/* account for c' = octave 1 iso. 0 4 */
- int oct_mod = octave_ + 1;
+ int oct_mod = octave_ + 1;
Pitch up_pitch (p);
Pitch down_pitch (p);
{
if (notename_ > notename)
octave_++;
- notename_ = notename;
+ notename_ = notename;
}
void
}
IMPLEMENT_TYPE_P (Pitch, "ly:pitch?");
-
SCM
-Pitch::mark_smob (SCM)
+Pitch::mark_smob (SCM x)
{
- return SCM_EOL;
+ Pitch *p = (Pitch*) SCM_CELL_WORD_1 (x);
+ return p->scale_->self_scm ();
}
IMPLEMENT_SIMPLE_SMOBS (Pitch);
{
Pitch *r = (Pitch *) SCM_CELL_WORD_1 (s);
scm_puts ("#<Pitch ", port);
- scm_display (scm_makfrom0str (r->to_string ().to_str0 ()), port);
+ scm_display (ly_string2scm (r->to_string ()), port);
scm_puts (" >", port);
return 1;
}
SCM
-Pitch::equal_p (SCM a , SCM b)
+Pitch::equal_p (SCM a, SCM b)
{
Pitch *p = (Pitch *) SCM_CELL_WORD_1 (a);
Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b);
return eq ? SCM_BOOL_T : SCM_BOOL_F;
}
-
MAKE_SCHEME_CALLBACK (Pitch, less_p, 2);
SCM
Pitch::less_p (SCM p1, SCM p2)
return SCM_BOOL_F;
}
-
int
Pitch::get_octave () const
{
return notename_;
}
-int
+Rational
Pitch::get_alteration () const
{
return alteration_;
p.transpose (d);
return p;
}
+
+Rational NATURAL_ALTERATION (0);
+Rational FLAT_ALTERATION (-1, 2);
+Rational DOUBLE_FLAT_ALTERATION (-1);
+Rational SHARP_ALTERATION (1, 2);
+
+Pitch
+Pitch::negated () const
+{
+ return pitch_interval (*this, Pitch ());
+}
projects / lilypond.git / blobdiff