X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fduration.cc;h=4a836d5dd81bc530715616a1f8e3ec94b1a8e134;hb=a286e94740cef413b1460cda2ce9848ad089ca90;hp=3740b09f9a63149962110f66d5e9c5959489714d;hpb=08da6e274ea516076699e8e9bbdd48e5919cb526;p=lilypond.git

diff --git a/lily/duration.cc b/lily/duration.cc
index 3740b09f9a..4a836d5dd8 100644
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -8,15 +8,12 @@
 
 */
 
-#include <assert.h>
+#include "duration.hh"
 
 #include "misc.hh"
 #include "lily-proto.hh"
-#include "string.hh"
-#include "moment.hh"
-#include "duration.hh"
-#include "ly-smobs.icc"
 
+#include "ly-smobs.icc"
 
 int
 Duration::compare (Duration const &left, Duration const &right)
@@ -93,7 +90,7 @@ IMPLEMENT_SIMPLE_SMOBS (Duration);
 int
 Duration::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  Duration  *r = (Duration *) ly_cdr (s);
+  Duration  *r = (Duration *) SCM_CELL_WORD_1 (s);
 
   scm_puts ("#<Duration ", port);
   scm_display (scm_makfrom0str (r->to_string ().to_str0 ()), port);
@@ -105,8 +102,8 @@ Duration::print_smob (SCM s, SCM port, scm_print_state *)
 SCM
 Duration::equal_p (SCM a , SCM b)
 {
-  Duration  *p = (Duration *) ly_cdr (a);
-  Duration  *q = (Duration *) ly_cdr (b);
+  Duration  *p = (Duration *) SCM_CELL_WORD_1 (a);
+  Duration  *q = (Duration *) SCM_CELL_WORD_1 (b);
 
   bool eq = p->dots_ == q->dots_
     && p->durlog_ == q->durlog_
@@ -128,7 +125,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,7 +141,7 @@ LY_DEFINE (duration_less, "ly:duration<?",
     return SCM_BOOL_F;
 }
 
-LY_DEFINE (make_duration, "ly:make-duration",
+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"
@@ -166,13 +163,13 @@ LY_DEFINE (make_duration, "ly:make-duration",
     {
       SCM_ASSERT_TYPE (scm_integer_p (dotcount) == SCM_BOOL_T,
 		       dotcount, SCM_ARG2, __FUNCTION__, "integer");
-      dots = ly_scm2int (dotcount);
+      dots = scm_to_int (dotcount);
     }
 
   bool compress = false;
   if (num != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (ly_c_number_p (num), length, SCM_ARG3, __FUNCTION__, "integer");
+      SCM_ASSERT_TYPE (scm_is_number (num), length, SCM_ARG3, __FUNCTION__, "integer");
       compress = true;
     }
   else
@@ -180,20 +177,20 @@ LY_DEFINE (make_duration, "ly:make-duration",
 
   if (den != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (ly_c_number_p (den), length, SCM_ARG4, __FUNCTION__, "integer");
+      SCM_ASSERT_TYPE (scm_is_number (den), length, SCM_ARG4, __FUNCTION__, "integer");
       compress = true;
     }
   else
     den = scm_int2num (1);
 
-  Duration p (ly_scm2int (length), dots);
+  Duration p (scm_to_int (length), dots);
   if (compress)
-    p = p.compressed (Rational (ly_scm2int (num), ly_scm2int (den)));
+    p = p.compressed (Rational (scm_to_int (num), scm_to_int (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}")
 {
@@ -201,25 +198,24 @@ LY_DEFINE (duration_log, "ly: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 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 (ly_c_number_p (d), d, SCM_ARG1, __FUNCTION__, "integer");
-  int log = intlog2 (ly_scm2int (d));
+  SCM_ASSERT_TYPE (scm_is_number (d), d, SCM_ARG1, __FUNCTION__, "integer");
+  int log = intlog2 (scm_to_int (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.")
 {