X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=80b32e3c69ee97d3fd3e72f484d202dda13dd687;hb=7697100194a647d04667946bcd0ba35c0554aac0;hp=4d1096fcc6fdd7aadc334da651d1ebef25667f6f;hpb=e418310195c3a0044e355ccd38ea88407af941b2;p=lilypond.git diff --git a/lily/pitch.cc b/lily/pitch.cc index 4d1096fcc6..80b32e3c69 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -1,35 +1,28 @@ -/* - musical-pitch.cc -- implement Pitch - +/* + musical-pitch.cc -- implement Pitch + source file of the GNU LilyPond music typesetter - - (c) 1998--2003 Han-Wen Nienhuys - - */ + + (c) 1998--2006 Han-Wen Nienhuys +*/ + #include "pitch.hh" -#include "warn.hh" -#include "main.hh" -#include "ly-smobs.icc" +#include "main.hh" +#include "string-convert.hh" +#include "warn.hh" +#include "ly-smobs.icc" Pitch::Pitch (int o, int n, int 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 (); } +/* FIXME: why is octave == 0 and default not middleC ? */ Pitch::Pitch () { notename_ = 0; @@ -40,30 +33,27 @@ Pitch::Pitch () 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_; 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_ * 7; } -/* - should be settable from input? - */ -static Byte pitch_byte_a[ ] = { 0, 2, 4, 5, 7, 9, 11 }; - +/* 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. */ @@ -75,28 +65,50 @@ Pitch::semitone_pitch () const while (n < 0) { n += 7; - o --; + o--; + } + + if (alteration_ % 2) + programming_error ("semitone_pitch () called on quarter tone alteration."); + + return ((o + n / 7) * 12 + + diatonic_scale_semitones[n % 7] + + (alteration_ / 2)); +} + +int +Pitch::quartertone_pitch () const +{ + int o = octave_; + int n = notename_; + while (n < 0) + { + n += 7; + o--; } - return (o + n / 7) * 12 + pitch_byte_a[n % 7] + alteration_; + + return ((o + n / 7) * 24 + + 2 * diatonic_scale_semitones[n % 7] + + alteration_); } void Pitch::normalise () { - int pitch = semitone_pitch (); + int pitch = quartertone_pitch (); while (notename_ >= 7) { notename_ -= 7; octave_++; - alteration_ -= semitone_pitch () - pitch; + alteration_ -= quartertone_pitch () - pitch; } while (notename_ < 0) { notename_ += 7; octave_--; - alteration_ -= semitone_pitch () - pitch; + alteration_ -= quartertone_pitch () - pitch; } - while (alteration_ >= 3) + while (alteration_ > DOUBLE_SHARP) { if (notename_ == 6) { @@ -107,9 +119,10 @@ Pitch::normalise () notename_++; alteration_ = 0; - alteration_ -= semitone_pitch () - pitch; + alteration_ -= quartertone_pitch () - pitch; } - while (alteration_ <= -3) + + while (alteration_ < DOUBLE_FLAT) { if (notename_ == 0) { @@ -120,7 +133,7 @@ Pitch::normalise () notename_--; alteration_ = 0; - alteration_ -= semitone_pitch () - pitch; + alteration_ -= quartertone_pitch () - pitch; } } @@ -128,38 +141,38 @@ Pitch::normalise () void Pitch::transpose (Pitch delta) { - int new_semi = semitone_pitch () +delta.semitone_pitch(); + int new_semi = quartertone_pitch () +delta.quartertone_pitch (); octave_ += delta.octave_; notename_ += delta.notename_; - alteration_ += new_semi - semitone_pitch(); + alteration_ += new_semi - quartertone_pitch (); normalise (); } Pitch -interval (Pitch const & from , Pitch const & to ) +pitch_interval (Pitch const &from, Pitch const &to) { - int sound = to.semitone_pitch() - from.semitone_pitch (); + int sound = to.quartertone_pitch () - from.quartertone_pitch (); Pitch pt (to.get_octave () - from.get_octave (), - to.get_notename() - from.get_notename(), - to.get_alteration() - from.get_alteration()); + to.get_notename () - from.get_notename (), - return pt.transposed (Pitch(0,0,sound - pt.semitone_pitch())); -} + to.get_alteration () - from.get_alteration ()); + return pt.transposed (Pitch (0, 0, sound - pt.quartertone_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')); + string s = ::to_string (char (n + 'a')); if (alteration_) - s += String (accname[alteration_ + 2]); + s += string (accname[alteration_ - DOUBLE_FLAT]); if (octave_ >= 0) { @@ -171,26 +184,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) 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_); @@ -200,7 +212,7 @@ Pitch::to_relative_octave (Pitch p) const n = up_pitch; else n = down_pitch; - + n.octave_ += oct_mod; return n; } @@ -208,39 +220,18 @@ Pitch::to_relative_octave (Pitch p) const 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:pitch-transpose", 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") ; - - return t->transposed (*d).smobbed_copy (); -} - -/****************************************************************/ - IMPLEMENT_TYPE_P (Pitch, "ly:pitch?"); @@ -254,20 +245,18 @@ 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 (scm_makfrom0str (r->to_string ().c_str ()), 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_ @@ -289,95 +278,8 @@ Pitch::less_p (SCM p1, SCM p2) return SCM_BOOL_F; } -/* - should add optional args - */ - -LY_DEFINE(make_pitch, "ly: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_steps, "ly:pitch-steps", 1, 0,0, - (SCM p), - "Number of steps counted from central C of the pitch @var{p}.") -{ - Pitch *pp = unsmob_pitch (p); - SCM_ASSERT_TYPE(pp, p, SCM_ARG1, __FUNCTION__, "Pitch"); - - return gh_int2scm (pp->steps()); -} - -LY_DEFINE(pitch_octave, "ly: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, "ly: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, "ly: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, "ly: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 (); - - return gh_int2scm (q); -} - -LY_DEFINE(pitch_less, "ly:pitchsmobbed_self (); -} - int -Pitch::get_octave ()const +Pitch::get_octave () const { return octave_; } @@ -397,7 +299,7 @@ Pitch::get_alteration () const Pitch Pitch::transposed (Pitch d) const { - Pitch p =*this; + Pitch p = *this; p.transpose (d); return p; }