X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment-scheme.cc;h=740b6ee2c9075789ee2dee31d16fee22bd1e4e2e;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=cc43ea40bff4a02133631409b12e89bce1502769;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git diff --git a/lily/moment-scheme.cc b/lily/moment-scheme.cc index cc43ea40bf..740b6ee2c9 100644 --- a/lily/moment-scheme.cc +++ b/lily/moment-scheme.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2011 Han-Wen Nienhuys + Copyright (C) 1999--2015 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 @@ -21,33 +21,53 @@ /* 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 timing @var{gn}/@var{gd}.\n" + 1, 3, 0, (SCM m, SCM g, SCM gn, SCM gd), + "Create the moment with rational main timing @var{m}," + " and optional grace timing @var{g}.\n" "\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.") + " grace notes. In absence of grace notes, @var{g}@tie{}is zero.\n" + "\n" + "For compatibility reasons, it is possible to write two" + " numbers specifying numerator and denominator instead of" + " the rationals. These forms cannot be mixed, and the two-" + "argument form is disambiguated by the sign of the second" + " argument: if it is positive, it can only be a denominator" + " and not a grace timing." + ) { - LY_ASSERT_TYPE (scm_is_integer, n, 1); - LY_ASSERT_TYPE (scm_is_integer, d, 2); + LY_ASSERT_TYPE (ly_is_rational, m, 1); + if (SCM_UNBNDP (g)) + return Moment (ly_scm2rational (m)).smobbed_copy (); - int grace_num = 0; - if (gn != SCM_UNDEFINED) + if (SCM_UNBNDP (gn)) { - LY_ASSERT_TYPE (scm_is_integer, gn, 3); - grace_num = scm_to_int (gn); + LY_ASSERT_TYPE (ly_is_rational, g, 2); + if (scm_is_true (scm_positive_p (g))) + { + LY_ASSERT_TYPE (scm_is_integer, m, 1); + LY_ASSERT_TYPE (scm_is_integer, g, 2); + return Moment (Rational (scm_to_int64 (m), + scm_to_int64 (g))).smobbed_copy (); + } + return Moment (ly_scm2rational (m), + ly_scm2rational (g)).smobbed_copy (); } - int grace_den = 1; - if (gd != SCM_UNDEFINED) + LY_ASSERT_TYPE (scm_is_integer, m, 1); + LY_ASSERT_TYPE (scm_is_integer, g, 2); + LY_ASSERT_TYPE (scm_is_integer, gn, 3); + I64 grace_num = scm_to_int64 (gn); + I64 grace_den = 1; + if (!SCM_UNBNDP (gd)) { LY_ASSERT_TYPE (scm_is_integer, gd, 4); - grace_den = scm_to_int (gd); + grace_den = scm_to_int64 (gd); } - return Moment (Rational (scm_to_int (n), scm_to_int (d)), + return Moment (Rational (scm_to_int64 (m), scm_to_int64 (g)), Rational (grace_num, grace_den)).smobbed_copy (); } @@ -58,8 +78,8 @@ LY_DEFINE (ly_moment_sub, "ly:moment-sub", LY_ASSERT_SMOB (Moment, a, 1); LY_ASSERT_SMOB (Moment, b, 2); - Moment *ma = unsmob_moment (a); - Moment *mb = unsmob_moment (b); + Moment *ma = unsmob (a); + Moment *mb = unsmob (b); return (*ma - *mb).smobbed_copy (); } @@ -71,8 +91,8 @@ LY_DEFINE (ly_moment_add, "ly:moment-add", LY_ASSERT_SMOB (Moment, a, 1); LY_ASSERT_SMOB (Moment, b, 2); - Moment *ma = unsmob_moment (a); - Moment *mb = unsmob_moment (b); + Moment *ma = unsmob (a); + Moment *mb = unsmob (b); return (*ma + *mb).smobbed_copy (); } @@ -84,8 +104,8 @@ LY_DEFINE (ly_moment_mul, "ly:moment-mul", LY_ASSERT_SMOB (Moment, a, 1); LY_ASSERT_SMOB (Moment, b, 2); - Moment *ma = unsmob_moment (a); - Moment *mb = unsmob_moment (b); + Moment *ma = unsmob (a); + Moment *mb = unsmob (b); return (*ma * * mb).smobbed_copy (); } @@ -96,8 +116,8 @@ LY_DEFINE (ly_moment_div, "ly:moment-div", LY_ASSERT_SMOB (Moment, a, 1); LY_ASSERT_SMOB (Moment, b, 2); - Moment *ma = unsmob_moment (a); - Moment *mb = unsmob_moment (b); + Moment *ma = unsmob (a); + Moment *mb = unsmob (b); return (*ma / * mb).smobbed_copy (); } @@ -109,18 +129,27 @@ LY_DEFINE (ly_moment_mod, "ly:moment-mod", LY_ASSERT_SMOB (Moment, a, 1); LY_ASSERT_SMOB (Moment, b, 2); - Moment *ma = unsmob_moment (a); - Moment *mb = unsmob_moment (b); + Moment *ma = unsmob (a); + Moment *mb = unsmob (b); return (*ma % * mb).smobbed_copy (); } +LY_DEFINE (ly_moment_grace, "ly:moment-grace", + 1, 0, 0, (SCM mom), + "Extract grace timing as a rational number from @var{mom}.") +{ + LY_ASSERT_SMOB (Moment, mom, 1); + + return ly_rational2scm (unsmob (mom)->grace_part_); +} + LY_DEFINE (ly_moment_grace_numerator, "ly:moment-grace-numerator", 1, 0, 0, (SCM mom), "Extract numerator from grace timing.") { LY_ASSERT_SMOB (Moment, mom, 1); - Moment *ma = unsmob_moment (mom); + Moment *ma = unsmob (mom); return scm_from_int64 (ma->grace_part_.numerator ()); } @@ -130,16 +159,26 @@ LY_DEFINE (ly_moment_grace_denominator, "ly:moment-grace-denominator", "Extract denominator from grace timing.") { LY_ASSERT_SMOB (Moment, mom, 1); - Moment *ma = unsmob_moment (mom); + Moment *ma = unsmob (mom); return scm_from_int64 (ma->grace_part_.denominator ()); } + +LY_DEFINE (ly_moment_main, "ly:moment-main", + 1, 0, 0, (SCM mom), + "Extract main timing as a rational number from @var{mom}.") +{ + LY_ASSERT_SMOB (Moment, mom, 1); + + return ly_rational2scm (unsmob (mom)->main_part_); +} + LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator", 1, 0, 0, (SCM mom), "Extract numerator from main timing.") { LY_ASSERT_SMOB (Moment, mom, 1); - Moment *ma = unsmob_moment (mom); + Moment *ma = unsmob (mom); return scm_from_int64 (ma->main_part_.numerator ()); } @@ -149,7 +188,7 @@ LY_DEFINE (ly_moment_main_denominator, "ly:moment-main-denominator", "Extract denominator from main timing.") { LY_ASSERT_SMOB (Moment, mom, 1); - Moment *ma = unsmob_moment (mom); + Moment *ma = unsmob (mom); return scm_from_int64 (ma->main_part_.denominator ()); } @@ -161,8 +200,8 @@ LY_DEFINE (ly_moment_less_p, "ly:moment (a); + Moment *mb = unsmob (b); return ly_bool2scm (*ma < *mb); }