(Automatic staff changes):

[lilypond.git] / lily / duration.cc

diff --git a/lily/duration.cc b/lily/duration.cc
index 06149d48b6021f430686edc0f7dfb22b9d272040..82f5a506c29b4258a69b2fac5a4af898ad4adfdb 100644 (file)
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -128,7 +128,7 @@ Duration::less_p (SCM p1, SCM p2)
     return SCM_BOOL_F;
 }
 
-LY_DEFINE (duration_less, "ly:duration<?",
+LY_DEFINE (ly_duration_less_p, "ly:duration<?",
           2, 0, 0, (SCM p1, SCM p2),
          "Is @var{p1} shorter than @var{p2}?")
 {
@@ -144,12 +144,12 @@ LY_DEFINE (duration_less, "ly:duration<?",
     return SCM_BOOL_F;
 }
 
-LY_DEFINE (make_duration, "ly:make-duration",
-          2, 2, 0, (SCM length, SCM dotcount, SCM num, SCM den),
+LY_DEFINE (ly_make_duration, "ly:make-duration",
+          1, 3, 0, (SCM length, SCM dotcount, SCM num, SCM den),
           "@var{length} is the negative logarithm (base 2) of the duration:\n"
           "1 is a half note, 2 is a quarter note, 3 is an eighth\n"
           "note, etc.  The number of dots after the note is given by\n"
-          "@var{dotcount}.\n"
+          "the optional argument @var{dotcount}.\n"
           "\n"
           "The duration factor is optionally given by @var{num}\n"
           "and @var{den}.\n\n"
@@ -158,73 +158,73 @@ LY_DEFINE (make_duration, "ly:make-duration",
           "(whole, half, quarter, etc.) and a number of augmentation\n"
           "dots. \n")
 {
-  SCM_ASSERT_TYPE (gh_number_p (length), length, SCM_ARG1, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE (gh_number_p (dotcount), dotcount, SCM_ARG2, __FUNCTION__, "integer");
+  SCM_ASSERT_TYPE (scm_integer_p (length) == SCM_BOOL_T,
+                  length, SCM_ARG1, __FUNCTION__, "integer");
+
+  int dots = 0;
+  if (dotcount != SCM_UNDEFINED)
+    {
+      SCM_ASSERT_TYPE (scm_integer_p (dotcount) == SCM_BOOL_T,
+                      dotcount, SCM_ARG2, __FUNCTION__, "integer");
+      dots = ly_scm2int (dotcount);
+    }
 
   bool compress = false;
   if (num != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (gh_number_p (num), length, SCM_ARG3, __FUNCTION__, "integer");
+      SCM_ASSERT_TYPE (ly_c_number_p (num), length, SCM_ARG3, __FUNCTION__, "integer");
       compress = true;
     }
   else
-    num = gh_int2scm (1);
+    num = scm_int2num (1);
 
   if (den != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (gh_number_p (den), length, SCM_ARG4, __FUNCTION__, "integer");
+      SCM_ASSERT_TYPE (ly_c_number_p (den), length, SCM_ARG4, __FUNCTION__, "integer");
       compress = true;
     }
   else
-    den = gh_int2scm (1);
+    den = scm_int2num (1);
 
-  Duration p (gh_scm2int (length), gh_scm2int (dotcount));
+  Duration p (ly_scm2int (length), dots);
   if (compress)
-    p = p.compressed (Rational (gh_scm2int (num), gh_scm2int (den)));
+    p = p.compressed (Rational (ly_scm2int (num), ly_scm2int (den)));
 
   return p.smobbed_copy ();
 }
 
-LY_DEFINE (duration_log, "ly:duration-log",
+LY_DEFINE (ly_duration_log, "ly:duration-log",
           1, 0, 0, (SCM dur),
          "Extract the duration log from @var{dur}")
 {
   SCM_ASSERT_TYPE (unsmob_duration (dur), dur, SCM_ARG1, __FUNCTION__, "duration");
-  return gh_int2scm (unsmob_duration (dur)->duration_log ());
+  return scm_int2num (unsmob_duration (dur)->duration_log ());
 }
 
-LY_DEFINE (dot_count_log, "ly:duration-dot-count", 1, 0, 0, (SCM dur),
-         "Extract the dot count from @var{dur}"
-)
+LY_DEFINE (ly_duration_dot_count, "ly:duration-dot-count",
+          1, 0, 0, (SCM dur),
+         "Extract the dot count from @var{dur}")
 {
   SCM_ASSERT_TYPE (unsmob_duration (dur), dur, SCM_ARG1, __FUNCTION__, "duration");
-  return gh_int2scm (unsmob_duration (dur)->dot_count ());
+  return scm_int2num (unsmob_duration (dur)->dot_count ());
 }
 
-
 LY_DEFINE (ly_intlog2, "ly:intlog2",
           1, 0, 0, (SCM d),
          "The 2-logarithm of 1/@var{d}.")
 {
-  SCM_ASSERT_TYPE (gh_number_p (d), d, SCM_ARG1, __FUNCTION__, "integer");
-  int log = intlog2 (gh_scm2int (d));
-  return gh_int2scm (log);
+  SCM_ASSERT_TYPE (ly_c_number_p (d), d, SCM_ARG1, __FUNCTION__, "integer");
+  int log = intlog2 (ly_scm2int (d));
+  return scm_int2num (log);
 }
 
-LY_DEFINE (compression_factor, "ly:duration-factor",
+LY_DEFINE (ly_duration_factor, "ly:duration-factor",
           1, 0, 0, (SCM dur),
          "Extract the compression factor from @var{dur}. Return as a pair.")
 {
   SCM_ASSERT_TYPE (unsmob_duration (dur), dur, SCM_ARG1, __FUNCTION__, "duration");
   Rational r = unsmob_duration (dur)->factor ();
-  return gh_cons (gh_int2scm (r.num ()), gh_int2scm (r.den ()));
-}
-
-SCM
-Duration::smobbed_copy () const
-{
-  Duration *p = new Duration (*this);
-  return p->smobbed_self ();
+  return scm_cons (scm_int2num (r.num ()), scm_int2num (r.den ()));
 }
 
 int