release: 1.5.29

[lilypond.git] / lily / moment.cc

diff --git a/lily/moment.cc b/lily/moment.cc
index 8653e38514f2f3e761df2edb97038358288cfb34..c305c9edc48fb42641593538655d138654a9df81 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,7 +13,7 @@
 #include "warn.hh"
 #include "ly-smobs.icc"
 
-IMPLEMENT_UNSMOB (Moment,moment);
+
 IMPLEMENT_SIMPLE_SMOBS (Moment);
 IMPLEMENT_TYPE_P (Moment, "moment?");
 
@@ -35,7 +35,7 @@ Moment::smobbed_copy () const
 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 ());
@@ -51,11 +51,11 @@ Moment::print_smob (SCM s, SCM port, scm_print_state *)
 SCM
 make_rational (SCM n, SCM d)
 {
-  Moment m (1,1);
+  Moment m (Rational (1,1));
 
   if (SCM_INUMP (n) && SCM_INUMP (d))
     {
-      m =  Moment (gh_scm2int (n), gh_scm2int (d));
+      m =  Moment (Rational (gh_scm2int (n), gh_scm2int (d)));
     }
   else
     {
@@ -69,7 +69,7 @@ make_rational (SCM n, SCM d)
 void
 init_moments ()
 {
-  scm_make_gsubr ("make-moment", 2 , 0, 0, (Scheme_function_unknown) make_rational);
+  scm_c_define_gsubr ("make-moment", 2 , 0, 0, (Scheme_function_unknown) make_rational);
 }
 
 ADD_SCM_INIT_FUNC (moms,init_moments);
@@ -98,7 +98,7 @@ Moment::compare (Moment const &a, Moment const &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 ()
@@ -109,32 +109,32 @@ Moment::Moment ()
 Moment::Moment (int m)
 {
   main_part_ = Rational(m);
-  grace_mom_  = Rational( 0);
+  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_;
 }
 
 /*
@@ -144,7 +144,7 @@ void
 Moment::operator *= (Moment const &src)
 {
   main_part_ *= src.main_part_ ;
-  grace_mom_ *= src.main_part_;
+  grace_part_ *= src.main_part_;
 }
 
 /*
@@ -154,7 +154,7 @@ void
 Moment::operator /= (Moment const &src)
 {
   main_part_ /= src.main_part_ ;
-  grace_mom_ /= src.main_part_;
+  grace_part_ /= src.main_part_;
 }
 
 
@@ -171,10 +171,10 @@ 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
@@ -187,5 +187,26 @@ Moment::set_infinite (int k)
 String
 Moment::str () const
 {
-  return main_part_.str ();
+  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;
+}
+
+ostream &
+operator << (ostream &os, Moment const &m)
+{
+  os << m.str ();
+  return os;
 }