X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment.cc;h=edd24f8cd698b18128083d06e50b63c77afef365;hb=664070d837cc4855091455892cb942cdcedeef0c;hp=ff21fb5ebffbf6f5a3a9befe24a4da8bdcc6c41c;hpb=8ecd09ad7514d57630fb611d38c161f3c3c708db;p=lilypond.git

diff --git a/lily/moment.cc b/lily/moment.cc
index ff21fb5ebf..edd24f8cd6 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,9 +13,8 @@
 #include "warn.hh"
 #include "ly-smobs.icc"
 
-IMPLEMENT_UNSMOB(Moment,moment);
-IMPLEMENT_SIMPLE_SMOBS(Moment);
-IMPLEMENT_TYPE_P (Moment, "moment?");
+IMPLEMENT_SIMPLE_SMOBS (Moment);
+IMPLEMENT_TYPE_P (Moment, "ly:moment?");
 
 SCM
 Moment::mark_smob (SCM)
@@ -24,53 +23,107 @@ Moment::mark_smob (SCM)
 }
 
 
-SCM
-Moment::make_scm () 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;
 }
 
-SCM
-make_rational (SCM n, SCM d)
+/*
+  TODO: add optional factor argument.
+*/
+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 = ly_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 = ly_scm2int (gd);
     }
 
-  return m.make_scm ();
+  return Moment (Rational (ly_scm2int (n), ly_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."
+	   )
 {
-  scm_make_gsubr ("make-moment", 2 , 0, 0, (Scheme_function_unknown) make_rational);
-  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 (*ma /  *mb).smobbed_copy ();
 }
 
-ADD_SCM_INIT_FUNC(moms,init_moments);
+LY_DEFINE (ly_moment_less_p,"ly:moment<?", 2,0,0, (SCM a, SCM b),
+	   "Compare 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 ly_bool2scm (*ma <  *mb);
+}
+
+
 
 SCM
 Moment::equal_p (SCM a, SCM b)
@@ -81,3 +134,127 @@ Moment::equal_p (SCM a, SCM b)
   return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
+/****************************************************************/
+
+int
+compare (Moment const &a, Moment const &b)
+{
+  return Moment::compare (a,b);
+}
+
+int
+Moment::compare (Moment const &a, Moment const &b)
+{
+  int c = Rational::compare (a.main_part_,b.main_part_);
+  if (c)
+    return c;
+
+  return Rational::compare (a.grace_part_, b.grace_part_);
+}
+
+Moment::Moment ()
+{
+
+}
+
+Moment::Moment (int m)
+{
+  main_part_ = Rational (m);
+  grace_part_  = Rational ( 0);
+}
+
+Moment::Moment (Rational m, Rational g)
+{
+  main_part_ = m;
+  grace_part_  = g;
+}
+
+Moment::Moment (Rational m)
+{
+  main_part_ = m;
+  grace_part_  = Rational (0);
+}
+
+void
+Moment::operator += (Moment const &src)
+{
+  main_part_ +=src.main_part_ ;
+  grace_part_ += src.grace_part_;
+}
+void
+Moment::operator -= (Moment const &src)
+{
+  main_part_ -= src.main_part_ ;
+  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_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_part_ /= src.main_part_;
+}
+
+
+
+int
+Moment::den () const { return main_part_.den (); }
+
+int
+Moment::num () const { return main_part_.num (); }
+
+bool
+Moment::to_bool () const
+{
+  return main_part_ || grace_part_;
+}
+
+void
+Moment::set_infinite (int k)
+{
+  main_part_.set_infinite (k);
+}
+
+
+String
+Moment::to_string () const
+{
+  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