move from abe.ly

[lilypond.git] / lily / duration.cc

diff --git a/lily/duration.cc b/lily/duration.cc
index a036c55f5247a1728e8a15dc6a0b2a9331dea16d..3847353d2678cf09ad68b8a9b4acea301ec02a7a 100644 (file)
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -3,7 +3,7 @@
   
   source file of the LilyPond music typesetter
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
            Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 */
@@ -22,7 +22,7 @@
 int
 Duration::compare (Duration const &left, Duration const &right)
 {
-  return Rational::compare (left.length_mom (), right.length_mom ());
+  return Rational::compare (left.get_length (), right.get_length ());
 }
 
 Duration::Duration ()
@@ -48,7 +48,7 @@ Duration::compressed (Rational m) const
 }
 
 Rational
-Duration::length_mom () const
+Duration::get_length () const
 {
   Rational mom (1 << abs (durlog_));
 
@@ -69,25 +69,25 @@ Duration::length_mom () const
 
 
 String
-Duration::string () const
+Duration::to_string () const
 {
   String s;
 
   if (durlog_ < 0  )
-    s = "log = "  + to_string (durlog_);
+    s = "log = "  + ::to_string (durlog_);
   else
-    s = to_string (1 << durlog_);
+    s = ::to_string (1 << durlog_);
   
-  s += to_string ('.', dots_);
+  s += ::to_string ('.', dots_);
   if (factor_ != Moment (Rational (1,1)))
     {
-      s += "*" + factor_.string ();
+      s += "*" + factor_.to_string ();
     }
   return s;
 }
 
 
-IMPLEMENT_TYPE_P (Duration, "duration?");
+IMPLEMENT_TYPE_P (Duration, "ly:duration?");
 
 SCM
 Duration::mark_smob (SCM)
@@ -102,7 +102,7 @@ Duration::print_smob (SCM s, SCM port, scm_print_state *)
   Duration  *r = (Duration *) ly_cdr (s);
      
   scm_puts ("#<Duration ", port);
-  scm_display (scm_makfrom0str (r->string ().to_str0 ()), port);
+  scm_display (scm_makfrom0str (r->to_string ().to_str0 ()), port);
   scm_puts (" >", port);
   
   return 1;
@@ -134,22 +134,38 @@ Duration::less_p (SCM p1, SCM p2)
     return SCM_BOOL_F;
 }
 
-LY_DEFINE(make_duration,
-         "make-duration", 2, 2, 0, (SCM length, SCM dotcount,
-                                    SCM num, SCM den),
-         "
-@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}.
+LY_DEFINE(duration_less, "ly:duration<?", 2,0,0, (SCM p1, SCM p2),
+         "Is @var{p1} shorter than @var{p2}?")
+{
+  Duration *a = unsmob_duration (p1);
+  Duration *b = unsmob_duration (p2);
+
+  SCM_ASSERT_TYPE(a, p1, SCM_ARG1, __FUNCTION__, "Duration");
+  SCM_ASSERT_TYPE(b, p2, SCM_ARG2, __FUNCTION__, "Duration");
 
-The duration factor is optionally given by @var{num} and @var{den}.
+  if (Duration::compare (*a, *b) < 0)
+    return SCM_BOOL_T;
+  else
+    return SCM_BOOL_F;
+}
 
-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_DEFINE(make_duration,
+         "ly:make-duration", 2, 2, 0, (SCM length, SCM dotcount,
+                                    SCM num, SCM den),
+"        \n"
+"@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"
+"\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\n"
+"power of two (whole, half, quarter, etc.) and a number of augmentation\n"
+"dots. \n"
+"\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");
@@ -178,9 +194,8 @@ dots.
 
 
 LY_DEFINE(duration_log,
-         "duration-log", 1, 0, 0, (SCM dur),
-         "
-Extract the duration log from @var{dur}"
+         "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");
@@ -190,9 +205,8 @@ Extract the duration log from @var{dur}"
 
 
 LY_DEFINE(dot_count_log,
-         "duration-dot-count", 1, 0, 0, (SCM dur),
-         "
-Extract the dot count from @var{dur}"
+         "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");
@@ -202,9 +216,8 @@ Extract the dot count from @var{dur}"
 
 
 LY_DEFINE(ly_intlog2,
-         "intlog2", 1, 0, 0, (SCM d),
-         "
-Extract the dot count from @var{dur}"
+         "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");
@@ -215,9 +228,8 @@ Extract the dot count from @var{dur}"
 }
 
 LY_DEFINE(compression_factor,
-         "duration-factor", 1, 0, 0, (SCM dur),
-         "
-Extract the compression factor from @var{dur}. Return as a pair."
+         "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");