String
Duration::str () const
{
- String s = to_str (durlog_i_) + to_str ('.', dots_i_);
+ 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 ();
}
IMPLEMENT_SIMPLE_SMOBS (Duration);
-
-
int
Duration::print_smob (SCM s, SCM port, scm_print_state *)
{
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_c_define_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
{