* lily/output-def-scheme.cc: new file.

[lilypond.git] / lily / moment.cc

diff --git a/lily/moment.cc b/lily/moment.cc
index 815f3f95297fd4ecb1837a403665b90a45708b16..bfbd06c88336f3897ee23a091e702abc0d5c1811 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -65,103 +65,6 @@ Moment::as_scheme () const
                     scm_from_int (grace_part_.den()));
 }
 
-/* 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"
-          "\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")
-{
-  SCM_ASSERT_TYPE (scm_is_integer (n), n, SCM_ARG1, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE (scm_is_integer (d), d, SCM_ARG2, __FUNCTION__, "integer");
-
-  int grace_num = 0;
-  if (gn != SCM_UNDEFINED)
-    {
-      SCM_ASSERT_TYPE (scm_is_integer (gn), gn, SCM_ARG3, __FUNCTION__, "integer");
-      grace_num = scm_to_int (gn);
-    }
-
-  int grace_den = 1;
-  if (gd != SCM_UNDEFINED)
-    {
-      SCM_ASSERT_TYPE (scm_is_integer (gd), gd, SCM_ARG4, __FUNCTION__, "integer");
-      grace_den = scm_to_int (gd);
-    }
-
-  return Moment (Rational (scm_to_int (n), scm_to_int (d)),
-                Rational (grace_num, grace_den)).smobbed_copy ();
-}
-
-LY_DEFINE (ly_add_moment, "ly:add-moment",
-          2, 0, 0, (SCM a, SCM b),
-          "Add two moments.")
-{
-  Moment *ma = unsmob_moment (a);
-  Moment *mb = unsmob_moment (b);
-  SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
-  SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
-  return (*ma + *mb).smobbed_copy ();
-}
-
-LY_DEFINE (ly_mul_moment,"ly:mul-moment",
-          2, 0, 0, (SCM a, SCM b),
-          "Multiply two moments.")
-{
-  Moment *ma = unsmob_moment (a);
-  Moment *mb = unsmob_moment (b);
-  SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
-  SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
-  return (*ma * *mb).smobbed_copy ();
-}
-
-LY_DEFINE (ly_div_moment,"ly:div-moment",
-          2, 0, 0, (SCM a, SCM b),
-          "Divide two moments.")
-{
-  Moment *ma = unsmob_moment (a);
-  Moment *mb = unsmob_moment (b);
-  SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
-  SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
-  return (*ma / *mb).smobbed_copy ();
-}
-
-LY_DEFINE (ly_moment_main_numerator,"ly:moment-main-numerator",
-          1, 0, 0, (SCM mom),
-          "Extract numerator from main timing.")
-{
-  Moment *ma = unsmob_moment (mom);
-  SCM_ASSERT_TYPE (ma, mom, SCM_ARG1, __FUNCTION__, "moment");
-
-  return scm_from_int (ma->main_part_.numerator ()); 
-}
-
-LY_DEFINE (ly_moment_main_denominator,"ly:moment-main-denominator",
-          1, 0, 0, (SCM mom),
-          "Extract denominator from main timing.")
-{
-  Moment *ma = unsmob_moment (mom);
-  SCM_ASSERT_TYPE (ma, mom, SCM_ARG1, __FUNCTION__, "moment");
-
-  return scm_from_int (ma->main_part_.denominator ()); 
-}
-
-LY_DEFINE (ly_moment_less_p,"ly:moment<?",
-          2, 0, 0, (SCM a, SCM b),
-          "Compare two moments.")
-{
-  Moment *ma = unsmob_moment (a);
-  Moment *mb = unsmob_moment (b);
-  SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
-  SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
-  return ly_bool2scm (*ma <  *mb);
-}
 
 SCM
 Moment::equal_p (SCM a, SCM b)
@@ -172,8 +75,6 @@ Moment::equal_p (SCM a, SCM b)
   return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
-/****************************************************************/
-
 int
 compare (Moment const &a, Moment const &b)
 {