/*
- pitch-scheme.cc -- implement scheme functions for Pitch
+ pitch-scheme.cc -- implement scheme functions for Pitch
source file of the GNU LilyPond music typesetter
- (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+ (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "pitch.hh"
"Transpose @var{p} by the amount @var{delta}, "
"where @var{delta} is relative to middle C.")
{
- Pitch* t = unsmob_pitch (p);
+ 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");
/* Should add optional args. */
LY_DEFINE (ly_make_pitch, "ly:make-pitch",
- 3, 0, 0, (SCM octave, SCM note, SCM alter),
+ 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 zero for a natural, negative for "
- "flats, or positive for sharps. ")
+ "The @var{alter} is a rational number of whole tones for alteration.")
{
- SCM_ASSERT_TYPE (scm_integer_p (octave)== SCM_BOOL_T , octave, SCM_ARG1, __FUNCTION__, "integer");
- SCM_ASSERT_TYPE (scm_integer_p (note)== SCM_BOOL_T, note, SCM_ARG2, __FUNCTION__, "integer");
- SCM_ASSERT_TYPE (scm_integer_p (alter)== SCM_BOOL_T, alter, SCM_ARG3, __FUNCTION__, "integer");
-
- Pitch p (scm_to_int (octave), scm_to_int (note), scm_to_int (alter));
+ 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");
+
+ Pitch p (scm_to_int (octave), scm_to_int (note),
+ ly_scm2rational (alter));
+
return p.smobbed_copy ();
}
+LY_DEFINE (ly_pitch_negate, "ly:pitch-negate", 1, 0, 0,
+ (SCM p),
+ "Negate @var{p}.")
+{
+ 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}.")
{
Pitch *pp = unsmob_pitch (p);
SCM_ASSERT_TYPE (pp, p, SCM_ARG1, __FUNCTION__, "Pitch");
- return scm_int2num (pp->steps ());
+ return scm_from_int (pp->steps ());
}
LY_DEFINE (ly_pitch_octave, "ly:pitch-octave",
Pitch *p = unsmob_pitch (pp);
SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
int q = p->get_octave ();
- return scm_int2num (q);
+ return scm_from_int (q);
}
LY_DEFINE (ly_pitch_alteration, "ly:pitch-alteration",
{
Pitch *p = unsmob_pitch (pp);
SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
- int q = p->get_alteration ();
+ Rational q = p->get_alteration ();
- return scm_int2num (q);
+ return ly_rational2scm (q);
}
LY_DEFINE (pitch_notename, "ly:pitch-notename",
Pitch *p = unsmob_pitch (pp);
SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
int q = p->get_notename ();
- return scm_int2num (q);
+ return scm_from_int (q);
}
LY_DEFINE (ly_pitch_quartertones, "ly:pitch-quartertones",
{
Pitch *p = unsmob_pitch (pp);
SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
- int q = p->quartertone_pitch ();
- return scm_int2num (q);
+ int q = p->rounded_quartertone_pitch ();
+ return scm_from_int (q);
}
LY_DEFINE (ly_pitch_semitones, "ly:pitch-semitones",
{
Pitch *p = unsmob_pitch (pp);
SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
- int q = p->semitone_pitch ();
- return scm_int2num (q);
+ int q = p->rounded_semitone_pitch ();
+ return scm_from_int (q);
}
LY_DEFINE (ly_pitch_less_p, "ly:pitch<?",
}
LY_DEFINE (ly_pitch_diff, "ly:pitch-diff",
- 2 ,0, 0, (SCM pitch, SCM root),
+ 2, 0, 0, (SCM pitch, SCM root),
"Return pitch @var{delta} such that @code{pitch} transposed by "
- "@var{delta} equals @var{root}" )
+ "@var{delta} equals @var{root}")
{
Pitch *p = unsmob_pitch (pitch);
Pitch *r = unsmob_pitch (root);