X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fduration-scheme.cc;h=f0a1b140fe41ed7cc210a17e9fa7f20d48f72247;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=6c29c62917b915d1209b953e426cef931cea85bf;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/duration-scheme.cc b/lily/duration-scheme.cc
index 6c29c62917..f0a1b140fe 100644
--- a/lily/duration-scheme.cc
+++ b/lily/duration-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2014 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -25,8 +25,8 @@ MAKE_SCHEME_CALLBACK (Duration, less_p, 2);
 SCM
 Duration::less_p (SCM p1, SCM p2)
 {
-  Duration *a = unsmob_duration (p1);
-  Duration *b = unsmob_duration (p2);
+  Duration *a = Duration::unsmob (p1);
+  Duration *b = Duration::unsmob (p2);
 
   if (compare (*a, *b) < 0)
     return SCM_BOOL_T;
@@ -35,14 +35,14 @@ Duration::less_p (SCM p1, SCM p2)
 }
 
 LY_DEFINE (ly_duration_less_p, "ly:duration<?",
-	   2, 0, 0, (SCM p1, SCM p2),
-	   "Is @var{p1} shorter than @var{p2}?")
+           2, 0, 0, (SCM p1, SCM p2),
+           "Is @var{p1} shorter than @var{p2}?")
 {
   LY_ASSERT_SMOB (Duration, p1, 1);
   LY_ASSERT_SMOB (Duration, p2, 2);
 
-  Duration *a = unsmob_duration (p1);
-  Duration *b = unsmob_duration (p2);
+  Duration *a = Duration::unsmob (p1);
+  Duration *b = Duration::unsmob (p2);
 
   if (Duration::compare (*a, *b) < 0)
     return SCM_BOOL_T;
@@ -51,18 +51,18 @@ LY_DEFINE (ly_duration_less_p, "ly: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:"
-	   " 1@tie{}is a half note, 2@tie{}is a quarter note, 3@tie{}is an"
-	   " eighth note, etc.  The number of dots after the note is given by"
-	   " the optional argument @var{dotcount}.\n"
-	   "\n"
-	   "The duration factor is optionally given by @var{num} and"
-	   " @var{den}.\n"
-	   "\n"
-	   "A duration is a musical duration, i.e., a length of time"
-	   " described by a power of two (whole, half, quarter, etc.) and a"
-	   " number of augmentation dots.")
+           1, 3, 0, (SCM length, SCM dotcount, SCM num, SCM den),
+           "@var{length} is the negative logarithm (base 2) of the duration:"
+           " 1@tie{}is a half note, 2@tie{}is a quarter note, 3@tie{}is an"
+           " eighth note, etc.  The number of dots after the note is given by"
+           " the optional argument @var{dotcount}.\n"
+           "\n"
+           "The duration factor is optionally given by integers @var{num} and"
+           " @var{den}, alternatively by a single rational number.\n"
+           "\n"
+           "A duration is a musical duration, i.e., a length of time"
+           " described by a power of two (whole, half, quarter, etc.) and a"
+           " number of augmentation dots.")
 {
   LY_ASSERT_TYPE (scm_is_integer, length, 1);
 
@@ -74,17 +74,17 @@ LY_DEFINE (ly_make_duration, "ly:make-duration",
     }
 
   bool compress = false;
-  if (num != SCM_UNDEFINED)
+  if (!SCM_UNBNDP (num))
     {
-      LY_ASSERT_TYPE (scm_is_number, num, 3);
+      LY_ASSERT_TYPE (ly_is_rational, num, 3);
       compress = true;
     }
   else
     num = scm_from_int (1);
 
-  if (den != SCM_UNDEFINED)
+  if (!SCM_UNBNDP (den))
     {
-      LY_ASSERT_TYPE (scm_is_number, den, 4);
+      LY_ASSERT_TYPE (scm_is_integer, den, 4);
       compress = true;
     }
   else
@@ -92,30 +92,30 @@ LY_DEFINE (ly_make_duration, "ly:make-duration",
 
   Duration p (scm_to_int (length), dots);
   if (compress)
-    p = p.compressed (Rational (scm_to_int (num), scm_to_int (den)));
+    p = p.compressed (ly_scm2rational (scm_divide (num, den)));
 
   return p.smobbed_copy ();
 }
 
 LY_DEFINE (ly_duration_log, "ly:duration-log",
-	   1, 0, 0, (SCM dur),
-	   "Extract the duration log from @var{dur}.")
+           1, 0, 0, (SCM dur),
+           "Extract the duration log from @var{dur}.")
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
-  return scm_from_int (unsmob_duration (dur)->duration_log ());
+  return scm_from_int (Duration::unsmob (dur)->duration_log ());
 }
 
 LY_DEFINE (ly_duration_dot_count, "ly:duration-dot-count",
-	   1, 0, 0, (SCM dur),
-	   "Extract the dot count from @var{dur}.")
+           1, 0, 0, (SCM dur),
+           "Extract the dot count from @var{dur}.")
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
-  return scm_from_int (unsmob_duration (dur)->dot_count ());
+  return scm_from_int (Duration::unsmob (dur)->dot_count ());
 }
 
 LY_DEFINE (ly_intlog2, "ly:intlog2",
-	   1, 0, 0, (SCM d),
-	   "The 2-logarithm of 1/@var{d}.")
+           1, 0, 0, (SCM d),
+           "The 2-logarithm of 1/@var{d}.")
 {
   LY_ASSERT_TYPE (scm_is_number, d, 1);
   int log = intlog2 (scm_to_int (d));
@@ -123,27 +123,40 @@ LY_DEFINE (ly_intlog2, "ly:intlog2",
 }
 
 LY_DEFINE (ly_duration_length, "ly:duration-length",
-	   1, 0, 0, (SCM dur),
-	   "The length of the duration as a @code{moment}.")
+           1, 0, 0, (SCM dur),
+           "The length of the duration as a @code{moment}.")
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
-  return Moment (unsmob_duration (dur)->get_length ()).smobbed_copy ();
+  return Moment (Duration::unsmob (dur)->get_length ()).smobbed_copy ();
 }
 
 LY_DEFINE (ly_duration_2_string, "ly:duration->string",
-	   1, 0, 0, (SCM dur),
-	   "Convert @var{dur} to a string.")
+           1, 0, 0, (SCM dur),
+           "Convert @var{dur} to a string.")
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
-  return ly_string2scm (unsmob_duration (dur)->to_string ());
+  return ly_string2scm (Duration::unsmob (dur)->to_string ());
 }
 
 LY_DEFINE (ly_duration_factor, "ly:duration-factor",
-	   1, 0, 0, (SCM dur),
-	   "Extract the compression factor from @var{dur}."
-	   "  Return it as a pair.")
+           1, 0, 0, (SCM dur),
+           "Extract the compression factor from @var{dur}."
+           "  Return it as a pair.")
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
-  Rational r = unsmob_duration (dur)->factor ();
+  Rational r = Duration::unsmob (dur)->factor ();
   return scm_cons (scm_from_int64 (r.num ()), scm_from_int64 (r.den ()));
 }
+
+// This is likely what ly:duration-factor should have been in the
+// first place.
+LY_DEFINE (ly_duration_scale, "ly:duration-scale",
+           1, 0, 0, (SCM dur),
+           "Extract the compression factor from @var{dur}."
+           "  Return it as a rational.")
+{
+  LY_ASSERT_SMOB (Duration, dur, 1);
+  Rational r = Duration::unsmob (dur)->factor ();
+
+  return ly_rational2scm (r);
+}