X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment.cc;h=d44af366e2c294c8b9401b625eedd12253d248dd;hb=71cc3b4a5adf79c361d2af39f1a361a36a03f273;hp=45002d8eed960afa0f791885a3d2f9632f1d3795;hpb=ffe548cfbb3c3b37c8969f49b5aba04ef998d080;p=lilypond.git

diff --git a/lily/moment.cc b/lily/moment.cc
index 45002d8eed..d44af366e2 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,6 +11,10 @@
 #include "lily-guile.hh"
 #include "moment.hh"
 #include "warn.hh"
+#include "ly-smobs.icc"
+
+IMPLEMENT_SIMPLE_SMOBS (Moment);
+IMPLEMENT_TYPE_P (Moment, "moment?");
 
 SCM
 Moment::mark_smob (SCM)
@@ -19,67 +23,190 @@ Moment::mark_smob (SCM)
 }
 
 
-Moment::~Moment()
+SCM
+Moment::smobbed_copy () const
 {
-  self_scm_ = SCM_EOL;
+  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);
+  String str (r->str ());
+  scm_puts ((char *)str.ch_C (), port);
   scm_puts (" >", port);
   
   return 1;
 }
 
-void
-Moment::do_smobify_self ()
-{
-}
+/*
+  TODO: add optional factor argument.
+ */
+LY_DEFINE (make_moment,"make-moment", 2,0,0, (SCM n, SCM d),
+	   "create the rational number with main timing @var{n}/@var{d}. 
 
-SCM
-make_rational (SCM n, SCM d)
+
+Moment is a point in musical time. It is consists of a pair of
+rationals (@var{m},@var{g}), where @var{m} is the timing for the  main
+notes, and @var{g} the timing for  grace notes. In absence of grace
+notes, @var{g} is zero.
+")
 {
-  Moment *r;
-  SCM retval = SCM_EOL;
-  if (SCM_INUMP (n) && SCM_INUMP(d))
+  Moment m (Rational (1,1));
+
+  if (SCM_INUMP (n) && SCM_INUMP (d))
     {
-      r= new Moment (gh_scm2int (n), gh_scm2int (d));
+      m =  Moment (Rational (gh_scm2int (n), gh_scm2int (d)));
     }
   else
     {
-      ::error ("make-moment takes two integer arguments.");
-      r = new Moment (1,1);
+      ::error ("make-moment takes two integer arguments. Using 1/1");
     }
 
-  retval = r->smobify_self ();
-  scm_unprotect_object (r->self_scm_);
-  return retval ;  
+  return m.smobbed_copy ();
 }
 
-#include "ly-smobs.icc"
+SCM
+Moment::equal_p (SCM a, SCM b)
+{
+  Moment *m1 = unsmob_moment (a);
+  Moment *m2 = unsmob_moment (b);
+      
+  return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
+}
 
-IMPLEMENT_UNSMOB(Moment,moment);
-IMPLEMENT_SMOBS(Moment);
+/****************************************************************/
+
+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
-init_moments ()
+Moment::operator += (Moment const &src)
 {
-  scm_make_gsubr ("make-moment", 2 , 0, 0,  (SCM(*)(...)) make_rational);
+  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_;
 }
 
-ADD_SCM_INIT_FUNC(moms,init_moments);
+/*
+  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_;
+}
 
-SCM
-Moment::equal_p (SCM a, SCM b)
+/*
+  only take the main part of SRC for multiplication.
+ */
+void
+Moment::operator /= (Moment const &src)
 {
-  Moment *m1 = SMOB_TO_TYPE(Moment, a);
-  Moment *m2 = SMOB_TO_TYPE(Moment, b);
-      
-  return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
+  main_part_ /= 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 (); }
+
+bool
+Moment::to_bool () const
+{
+  return main_part_ || grace_part_;
+}
+
+void
+Moment::set_infinite (int k)
+{
+  main_part_.set_infinite (k);
+}
+
+
+String
+Moment::str () const
+{
+  String s =  main_part_.str ();
+  if (grace_part_)
+    {
+      s += "G" + grace_part_.str ();
+    }
+  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.str ();
+  return os;
 }
+#endif