source file of the LilyPond music typesetter
- (c) 1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "string.hh"
#include "moment.hh"
#include "duration.hh"
+#include "ly-smobs.icc"
+
+
+
+int
+Duration::compare (Duration const &left, Duration const &right)
+{
+ return Rational::compare (left.length_mom (), right.length_mom ());
+}
Duration::Duration ()
{
durlog_i_ = 0;
dots_i_ = 0;
- tuplet_iso_i_ = 1;
- tuplet_type_i_ = 1;
+ factor_ = Rational (1,1);
}
-void
-Duration::compress (Rational m)
+Duration::Duration (int l, int d)
{
- tuplet_iso_i_ *= m.num_i ();
- tuplet_type_i_ *= m.den_i ();
+ durlog_i_ = l;
+ dots_i_ = d;
+ factor_ = Rational (1,1);
+}
+
+Duration
+Duration::compressed (Rational m) const
+{
+ Duration d (*this);
+ d.factor_ *= m;
+ return d;
}
Rational
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 /= 2.0;
+ delta /= Rational (2);
mom += delta;
}
- return mom * Moment (tuplet_iso_i_, tuplet_type_i_);
+ return mom * factor_;
}
-void
-Duration::set_plet (int i, int t)
-{
- tuplet_iso_i_ = i;
- tuplet_type_i_ = t;
-}
String
Duration::str () const
{
- return to_str (durlog_i_) + to_str ('.', dots_i_);
+ String s = to_str (durlog_i_) + to_str ('.', dots_i_);
+ if (factor_ != Moment (Rational (1,1)))
+ {
+ s += "*" + factor_.str ();
+ }
+ return s;
+}
+
+
+IMPLEMENT_TYPE_P (Duration, "duration?");
+
+SCM
+Duration::mark_smob (SCM)
+{
+ return SCM_EOL;
}
+IMPLEMENT_SIMPLE_SMOBS (Duration);
+
-bool
-Duration::plet_b ()
+int
+Duration::print_smob (SCM s, SCM port, scm_print_state *)
{
- return tuplet_iso_i_ != 1 || tuplet_type_i_ != 1;
+ Duration *r = (Duration *) ly_cdr (s);
+
+ scm_puts ("#<Duration ", port);
+ scm_display (ly_str02scm (r->str ().ch_C ()), port);
+ scm_puts (" >", port);
+
+ return 1;
}
+SCM
+Duration::equal_p (SCM a , SCM 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_
+ && p->factor_ == q->factor_;
+
+ return eq ? SCM_BOOL_T : SCM_BOOL_F;
+}
+
+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);
+
+ if (compare (*a, *b) < 0)
+ return SCM_BOOL_T;
+ else
+ 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 ()
+{
+ scm_c_define_gsubr ("make-duration", 2, 0, 0,
+ (Scheme_function_unknown)make_duration);
+}
+
+ADD_SCM_INIT_FUNC (duration, add_funcs);
+
+SCM
+Duration::smobbed_copy ()const
+{
+ Duration * p = new Duration (*this);
+ return p->smobbed_self ();
+}
+
+int
+Duration::duration_log () const
+{
+ return durlog_i_;
+}
+
+int
+Duration::dot_count () const
+{
+ return dots_i_;
+}