source file of the GNU LilyPond music typesetter
- (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "warn.hh"
#include "ly-smobs.icc"
-IMPLEMENT_UNSMOB (Moment,moment);
IMPLEMENT_SIMPLE_SMOBS (Moment);
-IMPLEMENT_TYPE_P (Moment, "moment?");
+IMPLEMENT_TYPE_P (Moment, "ly:moment?");
SCM
Moment::mark_smob (SCM)
}
-SCM
-Moment::smobbed_copy () const
-{
- Moment * m = new Moment (*this);
- return m->smobbed_self ();
-}
int
Moment::print_smob (SCM s, SCM port, scm_print_state *)
{
- Moment *r = (Moment *) gh_cdr (s);
+ Moment *r = (Moment *) ly_cdr (s);
scm_puts ("#<Mom ", port);
- String str (r->str ());
- scm_puts ((char *)str.ch_C (), port);
- scm_puts (" >", port);
+ String str = r->to_string ();
+ scm_puts ((char *)str.to_str0 (), port);
+ scm_puts (">", port);
return 1;
}
/*
TODO: add optional factor argument.
- */
-SCM
-make_rational (SCM n, SCM d)
+*/
+LY_DEFINE (make_moment,"ly:make-moment", 2,2,0, (SCM n, SCM d, SCM gn, SCM gd),
+ "Create the rational number with main timing @var{n}/@var{d}, "
+ "and optional grace timin @var{gn}/@var{gd}.\n"
+ "\n"
+ "\n"
+ "Moment is a point in musical time. It is consists of a pair of\n"
+ "rationals (@var{m},@var{g}), where @var{m} is the timing for the main\n"
+ "notes, and @var{g} the timing for grace notes. In absence of grace\n"
+ "notes, @var{g} is zero.\n"
+ )
{
- Moment m (1,1);
+ SCM_ASSERT_TYPE (SCM_INUMP (n), n, SCM_ARG1, __FUNCTION__, "integer");
+ SCM_ASSERT_TYPE (SCM_INUMP (d), d, SCM_ARG2, __FUNCTION__, "integer");
- if (SCM_INUMP (n) && SCM_INUMP (d))
+ int grace_num = 0;
+ if (gn != SCM_UNDEFINED)
{
- m = Moment (gh_scm2int (n), gh_scm2int (d));
+ SCM_ASSERT_TYPE (SCM_INUMP (gn), gn, SCM_ARG3, __FUNCTION__, "integer");
+ grace_num = gh_scm2int (gn);
}
- else
+
+ int grace_den = 1;
+ if (gd != SCM_UNDEFINED)
{
- ::error ("make-moment takes two integer arguments. Using 1/1");
+ SCM_ASSERT_TYPE (SCM_INUMP (gd), gd, SCM_ARG4, __FUNCTION__, "integer");
+ grace_den = gh_scm2int (gd);
}
- return m.smobbed_copy ();
+ return Moment (Rational (gh_scm2int (n), gh_scm2int (d)),
+ Rational (grace_num, grace_den)).smobbed_copy ();
}
+LY_DEFINE (add_moment,"ly:add-moment", 2,0,0, (SCM a, SCM b),
+ "Add two moments."
+ )
+{
+ Moment * ma = unsmob_moment (a);
+ Moment * mb = unsmob_moment (b);
+ SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
+ SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
-void
-init_moments ()
+ return (*ma + *mb).smobbed_copy ();
+}
+
+
+LY_DEFINE (mul_moment,"ly:mul-moment", 2,0,0, (SCM a, SCM b),
+ "Multiply two moments."
+ )
+{
+ Moment * ma = unsmob_moment (a);
+ Moment * mb = unsmob_moment (b);
+ SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
+ SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
+
+ return (*ma * *mb).smobbed_copy ();
+}
+
+
+
+LY_DEFINE (div_moment,"ly:div-moment", 2,0,0, (SCM a, SCM b),
+ "Divide two moments."
+ )
+{
+ Moment * ma = unsmob_moment (a);
+ Moment * mb = unsmob_moment (b);
+ SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
+ SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
+
+ return (*ma / *mb).smobbed_copy ();
+}
+
+LY_DEFINE (ly_moment_less_p,"ly:moment<?", 2,0,0, (SCM a, SCM b),
+ "Compare two moments.")
{
- scm_make_gsubr ("make-moment", 2 , 0, 0, (Scheme_function_unknown) make_rational);
+ Moment * ma = unsmob_moment (a);
+ Moment * mb = unsmob_moment (b);
+ SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
+ SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
+
+ return gh_bool2scm (*ma < *mb);
}
-ADD_SCM_INIT_FUNC (moms,init_moments);
+
SCM
Moment::equal_p (SCM a, SCM b)
if (c)
return c;
- return Rational::compare (a.grace_mom_, b.grace_mom_);
+ return Rational::compare (a.grace_part_, b.grace_part_);
}
Moment::Moment ()
Moment::Moment (int m)
{
- main_part_ = Rational(m);
- grace_mom_ = Rational( 0);
+ main_part_ = Rational (m);
+ grace_part_ = Rational ( 0);
}
-Moment::Moment (int m, int n)
+Moment::Moment (Rational m, Rational g)
{
- main_part_ = Rational (m,n);
- grace_mom_ = Rational (0);
+ main_part_ = m;
+ grace_part_ = g;
}
Moment::Moment (Rational m)
{
main_part_ = m;
- grace_mom_ = Rational (0);
+ grace_part_ = Rational (0);
}
void
Moment::operator += (Moment const &src)
{
main_part_ +=src.main_part_ ;
- grace_mom_ += src.grace_mom_;
+ grace_part_ += src.grace_part_;
}
void
Moment::operator -= (Moment const &src)
{
main_part_ -= src.main_part_ ;
- grace_mom_ -= src.grace_mom_;
+ grace_part_ -= src.grace_part_;
}
/*
only take the main part of SRC for multiplication.
- */
+*/
void
Moment::operator *= (Moment const &src)
{
main_part_ *= src.main_part_ ;
- grace_mom_ *= src.main_part_;
+ grace_part_ *= src.main_part_;
}
/*
only take the main part of SRC for multiplication.
- */
+*/
void
Moment::operator /= (Moment const &src)
{
main_part_ /= src.main_part_ ;
- grace_mom_ /= src.main_part_;
+ grace_part_ /= src.main_part_;
}
-#if 0
-Moment::operator Rational()
-{
- return main_part_;
-}
-#endif
int
Moment::den () const { return main_part_.den (); }
int
Moment::num () const { return main_part_.num (); }
-
-Moment::operator bool ()
+bool
+Moment::to_bool () const
{
- return main_part_ || grace_mom_;
+ return main_part_ || grace_part_;
}
void
String
-Moment::str () const
+Moment::to_string () const
{
- return main_part_.str ();
+ String s = main_part_.to_string ();
+ if (grace_part_)
+ {
+ s += "G" + grace_part_.to_string ();
+ }
+ return s;
+}
+
+Moment
+Moment::operator - () const
+{
+ Moment m;
+ m.grace_part_ = - grace_part_;
+ m. main_part_ = - main_part_ ;
+ return m;
}
+
+
+#ifdef STREAM_SUPPORT
+std::ostream &
+operator << (std::ostream &os, Moment const &m)
+{
+ os << m.to_string ();
+ return os;
+}
+#endif
projects / lilypond.git / blobdiff