X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmoment.hh;h=ed7c7b0741d34da984936e12f8c568708ce88ebf;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=2583bb56ab70feefda4595ec05ce88b5af4859ee;hpb=9651bafcd832c72a8f81ade4b602199583d61f37;p=lilypond.git

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index 2583bb56ab..ed7c7b0741 100644
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -1,11 +1,10 @@
-/*   
+/*
   moment.hh -- declare Moment
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef MOMENT_HH
 #define MOMENT_HH
@@ -14,35 +13,61 @@
 #include "rational.hh"
 
 /**
-   Rationals with glue for Guilification;
-
-   FIXME: remove self_scm_ and then remove this class */
-class Moment : public Rational
+   Musical timing (Main-timing, grace-timing) with glue for
+   Guilification;
+*/
+class Moment
 {
-  DECLARE_SIMPLE_SMOBS (Moment,);
+  DECLARE_SIMPLE_SMOBS (Moment);
 public:
-  Moment () { }
-  Moment (int m) : Rational (m) { }
-  Moment (int m, int n) : Rational (m,n) { }
-  Moment (Rational m) : Rational (m) { }
+  Moment ();
+  Moment (int m);
+
+  Moment (Rational, Rational);
+  Moment (Rational m);
+
+  Moment operator - () const;
+
+  void operator += (Moment const &m);
+  void operator -= (Moment const &m);
 
+  void operator *= (Moment const &m);
+  void operator /= (Moment const &m);
+  void operator %= (Moment const &m);
+
+  Rational main_part_;
+  Rational grace_part_;
+
+  void set_infinite (int k);
+
+  bool to_bool () const;
+  I64 den () const;
+  I64 num () const;
   /*
     Deliver a copy of THIS as a smobified SCM
-   */
-  SCM smobbed_copy () const; 
+  */
+  string to_string () const;
+  static int compare (Moment const &, Moment const &);
+  SCM as_scheme () const;
 };
 
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, +);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, -);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, /);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, *);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, %);
 
-Moment * unsmob_moment (SCM);
+DECLARE_UNSMOB (Moment, moment);
+int compare (Moment const &, Moment const &);
+INSTANTIATE_COMPARE (Moment const &, Moment::compare);
 
-#if 0
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, / );
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, * );
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, + );
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, - );
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, % );
-INSTANTIATE_COMPARE (Moment const&, Rational::compare);
+Moment robust_scm2moment (SCM, Moment);
+
+#ifdef STREAM_SUPPORT
+ostream &operator << (ostream &, Moment const &);
 #endif
 
+bool moment_less (SCM a, SCM b);
+
 #endif /* MOMENT_HH */