2002-07-13 Han-Wen <hanwen@cs.uu.nl>

[lilypond.git] / lily / duration.cc

diff --git a/lily/duration.cc b/lily/duration.cc
index 37e75ac8d1e7f1bf9ba8c1c349b83cf92500ff12..28b41a021068bd7d4cb60ac965d5ca6bacdf399f 100644 (file)
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
            Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 */
@@ -28,14 +28,14 @@ Duration::Duration ()
 {
   durlog_i_ = 0;
   dots_i_ = 0;
-  factor_ = Moment (1,1);
+  factor_ = Rational (1,1);
 }
 
 Duration::Duration (int l, int d)
 {
   durlog_i_ = l;
   dots_i_ = d;
-  factor_ = Moment (1,1);
+  factor_ = Rational (1,1);
 }
 
 Duration
@@ -52,13 +52,13 @@ Duration::length_mom () const
   Rational mom (1 << abs (durlog_i_));
 
   if (durlog_i_> 0)
-    mom = Moment (1)/mom;
+    mom = Rational (1)/mom;
 
   Rational delta = mom;
 
   for (int d = dots_i_; d; d--)
     {
-      delta /= Moment (2);
+      delta /= Rational (2);
       mom += delta;
     }
 
@@ -70,8 +70,15 @@ Duration::length_mom () const
 String
 Duration::str () const
 {
-  String s =  to_str (durlog_i_) + to_str ('.', dots_i_);
-  if (factor_ != Moment (1,1))
+  String s;
+
+  if (durlog_i_ < 0  )
+    s = "log = "  + to_str (durlog_i_);
+  else
+    s = to_str (1 << durlog_i_);
+  
+  s += to_str ('.', dots_i_);
+  if (factor_ != Moment (Rational (1,1)))
     {
       s += "*" + factor_.str ();
     }
@@ -80,7 +87,6 @@ Duration::str () const
 
 
 IMPLEMENT_TYPE_P (Duration, "duration?");
-IMPLEMENT_UNSMOB (Duration, duration);
 
 SCM
 Duration::mark_smob (SCM)
@@ -89,12 +95,10 @@ Duration::mark_smob (SCM)
 }
 
 IMPLEMENT_SIMPLE_SMOBS (Duration);
-
-
 int
 Duration::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  Duration  *r = (Duration *) gh_cdr (s);
+  Duration  *r = (Duration *) ly_cdr (s);
      
   scm_puts ("#<Duration ", port);
   scm_display (ly_str02scm (r->str ().ch_C ()), port);
@@ -106,8 +110,8 @@ Duration::print_smob (SCM s, SCM port, scm_print_state *)
 SCM
 Duration::equal_p (SCM a , SCM b)
 {
-  Duration  *p = (Duration *) gh_cdr (a);
-  Duration  *q = (Duration *) gh_cdr (b);  
+  Duration  *p = (Duration *) ly_cdr (a);
+  Duration  *q = (Duration *) ly_cdr (b);  
 
   bool eq = p->dots_i_ == q->dots_i_
     && p->durlog_i_ == q->durlog_i_
@@ -129,21 +133,29 @@ Duration::less_p (SCM p1, SCM p2)
     return SCM_BOOL_F;
 }
 
-static SCM
-make_duration (SCM l, SCM d)
-{
-  Duration p (gh_scm2int (l), gh_scm2int (d));
-  return p.smobbed_copy ();
-}
 
-static void
-add_funcs ()
+LY_DEFINE(make_duration,
+         "make-duration", 2, 0, 0, (SCM length, SCM dotcount),
+         "
+@var{length} is the negative logarithm (base 2) of the duration:
+1 is a half note, 2 is a quarter note, 3 is an eighth
+note, etc.  The number of dots after the note is given by
+@var{dotcount}.
+
+
+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. 
+
+")
 {
-  scm_make_gsubr ("make-duration", 2, 0, 0, (Scheme_function_unknown)make_duration);
+  SCM_ASSERT_TYPE(gh_number_p(length), length, SCM_ARG1, __FUNCTION__, "integer");
+  SCM_ASSERT_TYPE(gh_number_p(dotcount), dotcount, SCM_ARG2, __FUNCTION__, "integer");
+  
+  Duration p (gh_scm2int (length), gh_scm2int (dotcount));
+  return p.smobbed_copy ();
 }
 
-ADD_SCM_INIT_FUNC (duration, add_funcs);
-
 SCM
 Duration::smobbed_copy ()const
 {