source file of the GNU LilyPond music typesetter
- (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2003 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)
Moment *r = (Moment *) ly_cdr (s);
scm_puts ("#<Mom ", port);
- String str (r->str ());
- scm_puts ((char *)str.ch_C (), port);
+ String str = r->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,0,0, (SCM n, SCM d),
+ "create the rational number with main timing @var{n}/@var{d}. \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 (Rational (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))
- {
- m = Moment (Rational (gh_scm2int (n), gh_scm2int (d)));
- }
- else
- {
- ::error ("make-moment takes two integer arguments. Using 1/1");
- }
+ return Moment (Rational (gh_scm2int (n), gh_scm2int (d))).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");
- return m.smobbed_copy ();
+ return (*ma + *mb).smobbed_copy();
}
-void
-init_moments ()
+LY_DEFINE (mul_moment,"ly:mul-moment", 2,0,0, (SCM a, SCM b),
+ "Multiply two moments."
+)
{
- scm_c_define_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 (*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();
}
-ADD_SCM_INIT_FUNC (moms,init_moments);
SCM
Moment::equal_p (SCM a, SCM b)
String
-Moment::str () const
+Moment::string () const
{
- String s = main_part_.str ();
+ String s = main_part_.string ();
if (grace_part_)
{
- s += "G" + grace_part_.str ();
+ s += "G" + grace_part_.string ();
}
return s;
}
Moment::operator - () const
{
Moment m;
- m.grace_part_ = -grace_part_;
- m.main_part_ = -main_part_;
+ m.grace_part_ = - grace_part_;
+ m. main_part_ = - main_part_ ;
return m;
}
-ostream &
-operator << (ostream &os, Moment const &m)
+
+#ifdef STREAM_SUPPORT
+std::ostream &
+operator << (std::ostream &os, Moment const &m)
{
- os << m.str ();
+ os << m.string ();
return os;
}
+#endif