X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment-scheme.cc;h=f4c5a91e2777bf733f4367fbd82b0a8bb2f3f410;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=4eb3086adf1331f816cf66659d4c86f9846fd15f;hpb=ade2bb7da653fbd9d670590afd67376fe69c59dd;p=lilypond.git diff --git a/lily/moment-scheme.cc b/lily/moment-scheme.cc index 4eb3086adf..f4c5a91e27 100644 --- a/lily/moment-scheme.cc +++ b/lily/moment-scheme.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2007 Han-Wen Nienhuys + (c) 1999--2008 Han-Wen Nienhuys */ #include "moment.hh" @@ -11,15 +11,13 @@ /* 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); @@ -113,7 +111,7 @@ LY_DEFINE (ly_moment_grace_numerator, "ly:moment-grace-numerator", 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", @@ -123,7 +121,7 @@ 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), @@ -132,7 +130,7 @@ LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator", 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", @@ -142,7 +140,7 @@ 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