source file of the GNU LilyPond music typesetter
- (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "moment.hh"
/* TODO: add optional factor argument. */
LY_DEFINE (ly_make_moment, "ly:make-moment",
2, 2, 0, (SCM n, SCM d, SCM gn, SCM gd),
- "Create the rational number with main timing @var{n}/@var{d}, "
- "and optional grace timin @var{gn}/@var{gd}.\n"
+ "Create the rational number with main timing @var{n}/@var{d},"
+ " and optional grace timing @var{gn}/@var{gd}.\n"
"\n"
- "\n"
- "Moment is a point in musical time. "
- "It is consists of a pair of rationals (@var{m}, @var{g}), "
- "where @var{m} is the timing for the main\n"
- "notes, and @var{g} the timing for grace notes. "
- "In absence of grace notes, @var{g} is zero.\n")
+ "A @dfn{moment} is a point in musical time. It consists of"
+ " a pair of rationals (@var{m},@tie{}@var{g}), where @var{m} is"
+ " the timing for the main notes, and @var{g} the timing for"
+ " grace notes. In absence of grace notes, @var{g}@tie{}is zero.")
{
LY_ASSERT_TYPE (scm_is_integer, n, 1);
- LY_ASSERT_TYPE(scm_is_integer,d, 2);
+ LY_ASSERT_TYPE (scm_is_integer, d, 2);
int grace_num = 0;
if (gn != SCM_UNDEFINED)
{
- LY_ASSERT_TYPE(scm_is_integer,gn, 3);
+ LY_ASSERT_TYPE (scm_is_integer, gn, 3);
grace_num = scm_to_int (gn);
}
int grace_den = 1;
if (gd != SCM_UNDEFINED)
{
- LY_ASSERT_TYPE(scm_is_integer,gd, 4);
+ LY_ASSERT_TYPE (scm_is_integer, gd, 4);
grace_den = scm_to_int (gd);
}
"Subtract two moments.")
{
LY_ASSERT_SMOB (Moment, a, 1);
- LY_ASSERT_SMOB (Moment,b, 2);
+ LY_ASSERT_SMOB (Moment, b, 2);
Moment *ma = unsmob_moment (a);
Moment *mb = unsmob_moment (b);
"Add two moments.")
{
LY_ASSERT_SMOB (Moment, a, 1);
- LY_ASSERT_SMOB(Moment,b, 2);
+ LY_ASSERT_SMOB (Moment, b, 2);
Moment *ma = unsmob_moment (a);
Moment *mb = unsmob_moment (b);
"Multiply two moments.")
{
LY_ASSERT_SMOB (Moment, a, 1);
- LY_ASSERT_SMOB(Moment, b, 2);
+ LY_ASSERT_SMOB (Moment, b, 2);
Moment *ma = unsmob_moment (a);
Moment *mb = unsmob_moment (b);
"Divide two moments.")
{
LY_ASSERT_SMOB (Moment, a, 1);
- LY_ASSERT_SMOB(Moment, b, 2);
+ LY_ASSERT_SMOB (Moment, b, 2);
Moment *ma = unsmob_moment (a);
Moment *mb = unsmob_moment (b);
"Modulo of two moments.")
{
LY_ASSERT_SMOB (Moment, a, 1);
- LY_ASSERT_SMOB(Moment, b, 2);
+ LY_ASSERT_SMOB (Moment, b, 2);
Moment *ma = unsmob_moment (a);
Moment *mb = unsmob_moment (b);
Moment *ma = unsmob_moment (mom);
- return scm_from_int (ma->grace_part_.numerator ());
+ return scm_from_int64 (ma->grace_part_.numerator ());
}
LY_DEFINE (ly_moment_grace_denominator, "ly:moment-grace-denominator",
LY_ASSERT_SMOB (Moment, mom, 1);
Moment *ma = unsmob_moment (mom);
- return scm_from_int (ma->grace_part_.denominator ());
+ return scm_from_int64 (ma->grace_part_.denominator ());
}
LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator",
1, 0, 0, (SCM mom),
LY_ASSERT_SMOB (Moment, mom, 1);
Moment *ma = unsmob_moment (mom);
- return scm_from_int (ma->main_part_.numerator ());
+ return scm_from_int64 (ma->main_part_.numerator ());
}
LY_DEFINE (ly_moment_main_denominator, "ly:moment-main-denominator",
LY_ASSERT_SMOB (Moment, mom, 1);
Moment *ma = unsmob_moment (mom);
- return scm_from_int (ma->main_part_.denominator ());
+ return scm_from_int64 (ma->main_part_.denominator ());
}
LY_DEFINE (ly_moment_less_p, "ly:moment<?",