X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=bc8a9e45a6cd9b8467ecc3af1344deed84da3998;hb=0b6fb72e8c43ef86ff770ecf7c5b046fc005a39a;hp=3be10e21533ce66aedf59998258be325ad3590ea;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git diff --git a/lily/pitch.cc b/lily/pitch.cc index 3be10e2153..bc8a9e45a6 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -1,104 +1,118 @@ -/* - musical-pitch.cc -- implement Pitch - +/* + musical-pitch.cc -- implement Pitch + source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ + + (c) 1998--2007 Han-Wen Nienhuys +*/ + #include "pitch.hh" -#include "warn.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_ = n; alteration_ = a; octave_ = o; - - if (n < 0 || n >= 7 || - a < -2 || a > 2) - { - String s = _ ("Pitch arguments out of range"); - s += ": alteration = " + to_string (a); - s += ", notename = " + to_string (n); - warning (s); - } - 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 o; if (n) - return n; + return n; if (a) - return 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 pitch_byte_a[ ] = { 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--; } - return (o + n / 7) * 12 + pitch_byte_a[n % 7] + alteration_; + + /* + we're effictively hardcoding the octave to 6 whole-tones, + which is as arbitrary as coding it to 1200 cents + */ + Rational tones ((o + n / scale_->step_tones_.size ()) * 6, 1); + tones += scale_->step_tones_[n % scale_->step_tones_.size ()]; + + 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::rounded_semitone_pitch () const +{ + return int (double (tone_pitch () * Rational (2))); +} + +int +Pitch::rounded_quartertone_pitch () const +{ + return int (double (tone_pitch () * Rational (4))); } void -Pitch::normalise () +Pitch::normalize () { - int pitch = semitone_pitch (); - while (notename_ >= 7) + Rational pitch = tone_pitch (); + while (notename_ >= (int) scale_->step_tones_.size ()) { - notename_ -= 7; + notename_ -= scale_->step_tones_.size (); octave_++; - alteration_ -= semitone_pitch () - pitch; + alteration_ -= tone_pitch () - pitch; } while (notename_ < 0) { - notename_ += 7; + notename_ += scale_->step_tones_.size (); octave_--; - alteration_ -= semitone_pitch () - pitch; + alteration_ -= tone_pitch () - pitch; } - while (alteration_ >= 3) + + while (alteration_ > Rational (1)) { - if (notename_ == 6) + if (notename_ == int (scale_->step_tones_.size ())) { notename_ = 0; octave_++; @@ -106,54 +120,62 @@ Pitch::normalise () else notename_++; - alteration_ = 0; - alteration_ -= semitone_pitch () - pitch; + alteration_ = Rational (0); + alteration_ -= tone_pitch () - pitch; } - while (alteration_ <= -3) + while (alteration_ < Rational (-1)) { if (notename_ == 0) { - notename_ = 6; + notename_ = scale_->step_tones_.size (); octave_--; } else notename_--; alteration_ = 0; - alteration_ -= semitone_pitch () - pitch; + alteration_ -= tone_pitch () - pitch; } } -/* WHugh, wat een intervaas */ void Pitch::transpose (Pitch delta) { - int old_semi = semitone_pitch (); - int delta_semi = delta.semitone_pitch (); + Rational new_alter = tone_pitch () + delta.tone_pitch (); + octave_ += delta.octave_; notename_ += delta.notename_; + alteration_ += new_alter - tone_pitch (); - int new_semi = semitone_pitch (); - int delta_acc = new_semi - old_semi - delta_semi; - alteration_ -= delta_acc; - - normalise (); + normalize (); } +Pitch +pitch_interval (Pitch const &from, Pitch const &to) +{ + 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", "es", "", "is" , "isis"}; + Merge with *pitch->text* funcs in chord-name.scm */ +char const *accname[] = {"eses", "eseh", "es", "eh", "", + "ih", "is", "isih", "isis"}; -String -Pitch::string () const +string +Pitch::to_string () const { - int n = (notename_ + 2) % 7; - String s = to_string (char (n + 'a')); - if (alteration_) - s += String (accname[alteration_ + 2]); - + 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; @@ -164,26 +186,25 @@ Pitch::string () const { int o = (-octave_) - 1; while (o--) - s += to_string (','); + 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_ + 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_ = alteration_; down_pitch.alteration_ = alteration_; - + Pitch n = *this; up_pitch.up_to (notename_); down_pitch.down_to (notename_); @@ -193,79 +214,51 @@ Pitch::to_relative_octave (Pitch p) n = up_pitch; else n = down_pitch; - - n.octave_ += oct_mod; - *this = n; - return *this; + n.octave_ += oct_mod; + return n; } void Pitch::up_to (int notename) { - if (notename_ > notename) - { - octave_ ++; - } - notename_ = notename; + if (notename_ > notename) + octave_++; + notename_ = notename; } void Pitch::down_to (int notename) { if (notename_ < notename) - { - octave_ --; - } + octave_--; notename_ = notename; } - -LY_DEFINE(ly_pitch_transpose, - "ly-transpose-pitch", 2, 0, 0, - (SCM p, SCM delta), - "Transpose @var{p} by the amount @var{delta}, where @var{delta} is the -pitch that central C is transposed to. -") -{ - Pitch* t = unsmob_pitch (p); - Pitch *d = unsmob_pitch (delta); - SCM_ASSERT_TYPE(t, p, SCM_ARG1, __FUNCTION__, "pitch") ; - SCM_ASSERT_TYPE(d, delta, SCM_ARG1, __FUNCTION__, "pitch") ; - - Pitch tp =*t; - tp.transpose (*d); - return tp.smobbed_copy (); -} - -/****************************************************************/ - - -IMPLEMENT_TYPE_P (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); int Pitch::print_smob (SCM s, SCM port, scm_print_state *) { - Pitch *r = (Pitch *) ly_cdr (s); - + Pitch *r = (Pitch *) SCM_CELL_WORD_1 (s); scm_puts ("#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 *) ly_cdr (a); - Pitch *q = (Pitch *) ly_cdr (b); + Pitch *p = (Pitch *) SCM_CELL_WORD_1 (a); + Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b); bool eq = p->notename_ == q->notename_ && p->octave_ == q->octave_ @@ -287,96 +280,8 @@ Pitch::less_p (SCM p1, SCM p2) return SCM_BOOL_F; } -/* - should add optional args - */ - -LY_DEFINE(make_pitch, "make-pitch", 3, 0, 0, - (SCM o, SCM n, SCM a), - " -@var{octave} is specified by an integer, zero for the octave containing -middle C. @var{note} is a number from 0 to 6, with 0 corresponding to C -and 6 corresponding to B. The shift is zero for a natural, negative for -flats, or positive for sharps. - -") -{ - SCM_ASSERT_TYPE(gh_number_p (o), o, SCM_ARG1, __FUNCTION__, "number"); - SCM_ASSERT_TYPE(gh_number_p (n), n, SCM_ARG2, __FUNCTION__, "number"); - SCM_ASSERT_TYPE(gh_number_p (a), a, SCM_ARG3, __FUNCTION__, "number"); - - Pitch p (gh_scm2int (o), gh_scm2int (n), gh_scm2int (a)); - return p.smobbed_copy (); -} - - -LY_DEFINE(pitch_octave, "pitch-octave", 1, 0, 0, - (SCM pp), - "extract the octave from pitch @var{p}.") -{ - Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE(p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); - int q = p->get_octave (); - - return gh_int2scm (q); -} - -LY_DEFINE(pitch_alteration, "pitch-alteration", 1, 0, 0, - (SCM pp), - "extract the alteration from pitch @var{p}.") -{ - Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE(p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); - int q = p->get_alteration (); - - return gh_int2scm (q); -} - -LY_DEFINE(pitch_notename, "pitch-notename", 1, 0, 0, - (SCM pp), - "extract the note name from pitch @var{pp}.") -{ - Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE(p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); - int q = p->get_notename (); - - return gh_int2scm (q); -} - -LY_DEFINE(pitch_semitones, "pitch-semitones", 1, 0, 0, - (SCM pp), - "calculate the number of semitones of @var{p} from central C.") -{ - Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE(p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); - - int q = p->semitone_pitch (); - - // Was : - // - //int q = p->steps (); - // - // As the function is called "pitch_semitones", I assume it was a mistake ! - // Jiba - - return gh_int2scm (q); -} - -LY_DEFINE(pitch_less, "pitchsmobbed_self (); -} - int -Pitch::get_octave ()const +Pitch::get_octave () const { return octave_; } @@ -387,9 +292,27 @@ Pitch::get_notename () const return notename_; } -int +Rational Pitch::get_alteration () const { return alteration_; } +Pitch +Pitch::transposed (Pitch d) const +{ + Pitch p = *this; + 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 ()); +}