X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch-scheme.cc;h=be499050c128f1b8435d768f90b8defaca6b8cb2;hb=a1c2a3a778efafbb8abbd44eb212a3f52f34c5f9;hp=440df366ebe68a7175b412bbfc09a010426e0326;hpb=f9214bac21e9926dc3248416f58190c98c4167a9;p=lilypond.git diff --git a/lily/pitch-scheme.cc b/lily/pitch-scheme.cc index 440df366eb..be499050c1 100644 --- a/lily/pitch-scheme.cc +++ b/lily/pitch-scheme.cc @@ -1,38 +1,50 @@ /* - pitch-scheme.cc -- implement scheme functions for Pitch + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2005--2010 Han-Wen Nienhuys - (c) 2005--2007 Han-Wen Nienhuys + 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 . */ #include "pitch.hh" 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 relative to middle C.") + "Transpose @var{p} by the amount @var{delta}," + " where @var{delta} is relative to middle@tie{}C.") { + LY_ASSERT_SMOB (Pitch, p, 1); + LY_ASSERT_SMOB (Pitch, delta, 2); + 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 (); } /* Should add optional args. */ LY_DEFINE (ly_make_pitch, "ly:make-pitch", 2, 1, 0, (SCM octave, SCM note, SCM alter), - "@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 @var{alter} is a rational number of whole tones for alteration.") + "@var{octave} is specified by an integer, zero for the octave" + " containing middle@tie{}C. @var{note} is a number indexing the" + " global default scale, with 0 corresponding to pitch@tie{}C" + " and 6 usually corresponding to pitch@tie{}B. @var{alter} is" + " a rational number of 200-cent whole tones for alteration.") + { - SCM_ASSERT_TYPE (scm_is_integer (octave), octave, SCM_ARG1, __FUNCTION__, "integer"); - SCM_ASSERT_TYPE (scm_is_integer (note), note, SCM_ARG2, __FUNCTION__, "integer"); - SCM_ASSERT_TYPE (scm_is_rational (alter), - alter, SCM_ARG3, __FUNCTION__, "rational"); + LY_ASSERT_TYPE (scm_is_integer, octave, 1); + LY_ASSERT_TYPE (scm_is_integer, note, 2); + LY_ASSERT_TYPE (scm_is_rational, alter, 3); Pitch p (scm_to_int (octave), scm_to_int (note), ly_scm2rational (alter)); @@ -44,36 +56,37 @@ LY_DEFINE (ly_pitch_negate, "ly:pitch-negate", 1, 0, 0, (SCM p), "Negate @var{p}.") { + LY_ASSERT_SMOB (Pitch, p, 1); Pitch *pp = unsmob_pitch (p); - SCM_ASSERT_TYPE (pp, p, SCM_ARG1, __FUNCTION__, "Pitch"); return pp->negated ().smobbed_copy (); } LY_DEFINE (ly_pitch_steps, "ly:pitch-steps", 1, 0, 0, (SCM p), - "Number of steps counted from middle C of the pitch @var{p}.") + "Number of steps counted from middle@tie{}C of the" + " pitch@tie{}@var{p}.") { + LY_ASSERT_SMOB (Pitch, p, 1); Pitch *pp = unsmob_pitch (p); - SCM_ASSERT_TYPE (pp, p, SCM_ARG1, __FUNCTION__, "Pitch"); return scm_from_int (pp->steps ()); } LY_DEFINE (ly_pitch_octave, "ly:pitch-octave", 1, 0, 0, (SCM pp), - "Extract the octave from pitch @var{p}.") + "Extract the octave from pitch@tie{}@var{pp}.") { + LY_ASSERT_SMOB (Pitch, pp, 1); Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); int q = p->get_octave (); return scm_from_int (q); } LY_DEFINE (ly_pitch_alteration, "ly:pitch-alteration", 1, 0, 0, (SCM pp), - "Extract the alteration from pitch @var{p}.") + "Extract the alteration from pitch@tie{}@var{pp}.") { + LY_ASSERT_SMOB (Pitch, pp, 1); Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); Rational q = p->get_alteration (); return ly_rational2scm (q); @@ -81,30 +94,32 @@ LY_DEFINE (ly_pitch_alteration, "ly:pitch-alteration", LY_DEFINE (pitch_notename, "ly:pitch-notename", 1, 0, 0, (SCM pp), - "Extract the note name from pitch @var{pp}.") + "Extract the note name from pitch @var{pp}.") { + LY_ASSERT_SMOB (Pitch, pp, 1); Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); int q = p->get_notename (); return scm_from_int (q); } LY_DEFINE (ly_pitch_quartertones, "ly:pitch-quartertones", 1, 0, 0, (SCM pp), - "Calculate the number of quarter tones of @var{p} from middle C.") + "Calculate the number of quarter tones of@tie{}@var{pp} from" + " middle@tie{}C.") { + LY_ASSERT_SMOB (Pitch, pp, 1); Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); int q = p->rounded_quartertone_pitch (); return scm_from_int (q); } LY_DEFINE (ly_pitch_semitones, "ly:pitch-semitones", 1, 0, 0, (SCM pp), - "calculate the number of semitones of @var{p} from middle C.") + "Calculate the number of semitones of@tie{}@var{pp} from" + " middle@tie{}C.") { + LY_ASSERT_SMOB (Pitch, pp, 1); Pitch *p = unsmob_pitch (pp); - SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch"); int q = p->rounded_semitone_pitch (); return scm_from_int (q); } @@ -113,12 +128,12 @@ LY_DEFINE (ly_pitch_less_p, "ly:pitchget_property ("middleCClefPosition"), 0); + int offset = robust_scm2int (c->get_property ("middleCOffset"), 0); + + c->set_property (ly_symbol2scm ("middleCPosition"), scm_from_int (clef_pos + offset)); + return SCM_UNDEFINED; +}