-/*
- musical-pitch.cc -- implement Pitch
-
+/*
+ musical-pitch.cc -- implement Pitch
+
source file of the GNU LilyPond music typesetter
-
- (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+
+ (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
#include "pitch.hh"
-#include "debug.hh"
+
#include "main.hh"
-#include "ly-smobs.icc"
+#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_i_ = n;
- alteration_i_ = a;
- octave_i_ = o;
-
- if (n < 0 || n >= 7 ||
- a < -2 || a > 2)
- {
- String s = _("Pitch arguments out of range");
- s += ": alteration = " + to_str (a);
- s += ", notename = " + to_str (n);
- warning (s);
- }
+ notename_ = n;
+ alteration_ = a;
+ octave_ = o;
+ scale_ = default_global_scale;
+ normalize_octave ();
}
+/* FIXME: why is octave == 0 and default not middleC ? */
Pitch::Pitch ()
{
- notename_i_ = 0;
- alteration_i_ = 0;
- octave_i_ = 0;
+ notename_ = 0;
+ scale_ = default_global_scale;
+ octave_ = 0;
}
int
Pitch::compare (Pitch const &m1, Pitch const &m2)
{
- int o= m1.octave_i_ - m2.octave_i_;
- int n = m1.notename_i_ - m2.notename_i_;
- int a = m1.alteration_i_ - m2.alteration_i_;
+ int o = m1.octave_ - m2.octave_;
+ int n = m1.notename_ - m2.notename_;
+ Rational a = m1.alteration_ - m2.alteration_;
if (o)
- return o;
+ return o;
if (n)
- return n;
+ return n;
if (a)
- return a;
+ return a;
+
return 0;
}
int
Pitch::steps () const
{
- return notename_i_ + octave_i_*7;
+ return notename_ + octave_ * scale_->step_count ();
}
-/*
- should be settable from input?
- */
-static Byte pitch_byte_a[ ] = { 0, 2, 4, 5, 7, 9, 11 };
+Rational
+Pitch::tone_pitch () const
+{
+ return scale_->tones_at_step (notename_, octave_) + alteration_;
+}
+
+/* Calculate pitch height in 12th octave steps. Don't assume
+ normalized pitch as this function is used to normalize the pitch. */
+int
+Pitch::rounded_semitone_pitch () const
+{
+ return int (double (tone_pitch () * Rational (2)));
+}
int
-Pitch::semitone_pitch () const
+Pitch::rounded_quartertone_pitch () const
{
- return pitch_byte_a[ notename_i_ % 7 ] + alteration_i_ + octave_i_ * 12;
+ return int (double (tone_pitch () * Rational (4)));
}
-/* WHugh, wat een intervaas */
void
-Pitch::transpose (Pitch delta)
+Pitch::normalize_octave ()
{
- int old_pitch = semitone_pitch ();
- int delta_pitch = delta.semitone_pitch ();
- octave_i_ += delta.octave_i_;
- notename_i_ += delta.notename_i_;
+ int normalized_step = notename_ % scale_->step_count ();
+ if (normalized_step < 0)
+ normalized_step += scale_->step_count ();
-
- while (notename_i_ >= 7)
+ octave_ += (notename_ - normalized_step) / scale_->step_count ();
+ notename_ = normalized_step;
+}
+
+void
+Pitch::normalize_alteration ()
+{
+ while (alteration_ > Rational (1))
{
- notename_i_ -= 7;
- octave_i_ ++;
+ alteration_ -= scale_->step_size (notename_);
+ notename_++;
+ }
+ while (alteration_ < Rational (-1))
+ {
+ notename_--;
+ alteration_ += scale_->step_size (notename_);
}
-
- int new_pitch = semitone_pitch ();
- int delta_acc = new_pitch - old_pitch - delta_pitch;
- alteration_i_ -= delta_acc;
}
+void
+Pitch::normalize ()
+{
+ normalize_alteration ();
+ normalize_octave ();
+}
+void
+Pitch::transpose (Pitch delta)
+{
+ Rational new_alter = tone_pitch () + delta.tone_pitch ();
+ octave_ += delta.octave_;
+ notename_ += delta.notename_;
+ alteration_ += new_alter - tone_pitch ();
-/* FIXME */
-#if 0
-// nice test for internationalisation strings
-char const *accname[] = {"double flat", "flat", "natural",
- "sharp" , "double sharp"};
-#else
-char const *accname[] = {"eses", "es", "", "is" , "isis"};
-#endif
+ normalize_octave ();
+}
-String
-Pitch::str () const
+Pitch
+pitch_interval (Pitch const &from, Pitch const &to)
{
- int n = (notename_i_ + 2) % 7;
- String s = to_str (char(n + 'a'));
- if (alteration_i_)
- s += String (accname[alteration_i_ + 2]);
+ 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.tone_pitch ()));
+}
+
+/* FIXME
+ Merge with *pitch->text* funcs in chord-name.scm */
+char const *accname[] = {"eses", "eseh", "es", "eh", "",
+ "ih", "is", "isih", "isis"};
- if (octave_i_ > 0)
+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);
+ int qt = int (rint (Real (qtones)));
+
+ s += string (accname[qt + 4]);
+ if (octave_ >= 0)
{
- int o = octave_i_ + 1;
+ int o = octave_ + 1;
while (o--)
s += "'";
}
- else if (octave_i_ <0)
+ else if (octave_ < 0)
{
- int o = (-octave_i_) - 1;
+ int o = (-octave_) - 1;
while (o--)
- s += to_str (',');
+ s += ::to_string (',');
}
-
return s;
}
-/*
- change me to relative, counting from last pitch p
- return copy of resulting pitch
- */
+/* Change me to relative, counting from last pitch p
+ return copy of resulting pitch. */
Pitch
-Pitch::to_relative_octave (Pitch p)
+Pitch::to_relative_octave (Pitch p) const
{
- int oct_mod = octave_i_ + 1; // account for c' = octave 1 iso. 0 4
+ /* account for c' = octave 1 iso. 0 4 */
+ int oct_mod = octave_ + 1;
Pitch up_pitch (p);
Pitch down_pitch (p);
- up_pitch.alteration_i_ = alteration_i_;
- down_pitch.alteration_i_ = alteration_i_;
-
+ up_pitch.alteration_ = alteration_;
+ down_pitch.alteration_ = alteration_;
+
Pitch n = *this;
- up_pitch.up_to (notename_i_);
- down_pitch.down_to (notename_i_);
+ up_pitch.up_to (notename_);
+ down_pitch.down_to (notename_);
int h = p.steps ();
if (abs (up_pitch.steps () - h) < abs (down_pitch.steps () - h))
n = up_pitch;
else
n = down_pitch;
-
- n.octave_i_ += oct_mod;
- *this = n;
- return *this;
+ n.octave_ += oct_mod;
+ return n;
}
void
Pitch::up_to (int notename)
{
- if (notename_i_ > notename)
- {
- octave_i_ ++;
- }
- notename_i_ = notename;
+ if (notename_ > notename)
+ octave_++;
+ notename_ = notename;
}
void
Pitch::down_to (int notename)
{
- if (notename_i_ < notename)
- {
- octave_i_ --;
- }
- notename_i_ = notename;
-}
-
-///MAKE_SCHEME_CALLBACK (Pitch, transpose, 2);
-///transpose_proc?
-SCM
-Pitch::transpose (SCM p, SCM delta)
-{
- Pitch t = *unsmob_pitch (p);
- t.transpose (*unsmob_pitch (delta));
- return t.smobbed_copy ();
-}
-
-static SCM
-pitch_transpose (SCM p, SCM delta)
-{
- return Pitch::transpose (p, delta);
+ if (notename_ < notename)
+ octave_--;
+ notename_ = notename;
}
-/****************************************************************/
-
-
-IMPLEMENT_TYPE_P(Pitch, "pitch?");
-IMPLEMENT_UNSMOB(Pitch, pitch);
+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);
-
-
+IMPLEMENT_SIMPLE_SMOBS (Pitch);
int
Pitch::print_smob (SCM s, SCM port, scm_print_state *)
{
- Pitch *r = (Pitch *) gh_cdr (s);
-
+ Pitch *r = (Pitch *) SCM_CELL_WORD_1 (s);
scm_puts ("#<Pitch ", port);
- scm_display (ly_str02scm (r->str().ch_C()), 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 *) gh_cdr (a);
- Pitch *q = (Pitch *) gh_cdr (b);
+ Pitch *p = (Pitch *) SCM_CELL_WORD_1 (a);
+ Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b);
- bool eq = p->notename_i_ == q->notename_i_
- && p->octave_i_ == q->octave_i_
- && p->alteration_i_ == q->alteration_i_;
+ bool eq = p->notename_ == q->notename_
+ && p->octave_ == q->octave_
+ && p->alteration_ == q->alteration_;
return eq ? SCM_BOOL_T : SCM_BOOL_F;
}
-MAKE_SCHEME_CALLBACK(Pitch, less_p, 2);
+MAKE_SCHEME_CALLBACK (Pitch, less_p, 2);
SCM
Pitch::less_p (SCM p1, SCM p2)
{
Pitch *a = unsmob_pitch (p1);
Pitch *b = unsmob_pitch (p2);
- if (compare(*a, *b) < 0 )
+ if (compare (*a, *b) < 0)
return SCM_BOOL_T;
else
return SCM_BOOL_F;
}
-/*
- should add optional args
- */
-
-static SCM
-make_pitch (SCM o, SCM n, SCM a)
-{
- Pitch p;
- p.octave_i_ = gh_scm2int (o);
- p.notename_i_ = gh_scm2int (n);
- p.alteration_i_ = gh_scm2int (a);
- return p.smobbed_copy ();
-}
-
-static SCM
-pitch_octave (SCM pp)
-{
- Pitch *p = unsmob_pitch (pp);
- int q = 0;
- if (!p)
- warning ("Not a pitch");
- else
- q = p->octave_i();
-
- return gh_int2scm (q);
-}
-
-static SCM
-pitch_alteration (SCM pp)
-{
- Pitch *p = unsmob_pitch (pp);
- int q = 0;
- if (!p)
- warning ("Not a pitch");
- else
- q = p->alteration_i();
-
- return gh_int2scm (q);
-}
-
-static SCM
-pitch_notename (SCM pp)
-{
- Pitch *p = unsmob_pitch (pp);
- int q = 0;
- if (!p)
- warning ("Not a pitch");
- else
- q = p->notename_i();
-
- return gh_int2scm (q);
-}
-
-static SCM
-pitch_semitones (SCM pp)
+int
+Pitch::get_octave () const
{
- Pitch *p = unsmob_pitch (pp);
- int q = 0;
- if (!p)
- warning ("Not a pitch");
- else
- q = p->steps();
-
- return gh_int2scm (q);
+ return octave_;
}
-static void
-add_funcs()
+int
+Pitch::get_notename () const
{
- // should take list?: (make-pitch '(octave name accidental))
- scm_make_gsubr ("make-pitch", 3, 0, 0, (Scheme_function_unknown)make_pitch);
-
- scm_make_gsubr ("pitch-octave", 1, 0, 0, (Scheme_function_unknown)pitch_octave);
- scm_make_gsubr ("pitch-notename", 1, 0, 0, (Scheme_function_unknown)pitch_notename);
- scm_make_gsubr ("pitch-alteration", 1, 0, 0, (Scheme_function_unknown)pitch_alteration);
- scm_make_gsubr ("pitch-semitones", 1, 0, 0, (Scheme_function_unknown)pitch_semitones);
- scm_make_gsubr ("Pitch::transpose", 2, 0, 0, (Scheme_function_unknown) pitch_transpose);
+ return notename_;
}
-ADD_SCM_INIT_FUNC(pitch, add_funcs);
-
-SCM
-Pitch::smobbed_copy ()const
+Rational
+Pitch::get_alteration () const
{
- Pitch * p = new Pitch (*this);
- return p->smobbed_self ();
+ return alteration_;
}
-int
-Pitch::octave_i ()const
+Pitch
+Pitch::transposed (Pitch d) const
{
- return octave_i_;
+ Pitch p = *this;
+ p.transpose (d);
+ return p;
}
-int
-Pitch::notename_i () const
-{
- return notename_i_;
-}
+Rational NATURAL_ALTERATION (0);
+Rational FLAT_ALTERATION (-1, 2);
+Rational DOUBLE_FLAT_ALTERATION (-1);
+Rational SHARP_ALTERATION (1, 2);
-int
-Pitch::alteration_i () const
+Pitch
+Pitch::negated () const
{
- return alteration_i_;
+ return pitch_interval (*this, Pitch ());
}
projects / lilypond.git / blobdiff