Uniformize, internalize.

[lilypond.git] / lily / include / moment.hh

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index 3f69637f05b3d937b6b8ec0ee35f358ce4afa649..953a89a0083e549754b13e51317d634dbf7307af 100644 (file)
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,41 +14,59 @@
 #include "rational.hh"
 
 /**
-   Rationals with glue for Guilification;
- */
-struct Moment : public Rational
+   Musical timing (Main-timing, grace-timing) with glue for
+   Guilification;
+*/
+class Moment
 {
-  Moment () { self_scm_ = SCM_EOL; }
-  Moment (int m) : Rational (m) {self_scm_ = SCM_EOL; }
-  Moment (int m, int n) : Rational (m,n) {self_scm_ = SCM_EOL; }
-  Moment (Rational m) : Rational (m) {self_scm_ = SCM_EOL; }
-  ~Moment ();
+  DECLARE_SIMPLE_SMOBS (Moment, );
+public:
+  Moment ();
+  Moment (int m);
+
+  Moment (Rational, Rational);
+  Moment (Rational m);
+
+  Moment operator - () const;
   
-  DECLARE_SMOBS;
-};
+  void operator += (Moment const &m);
+  void operator -= (Moment const &m);  
 
+  void operator *= (Moment const &m);
+  void operator /= (Moment const &m);  
 
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, / );
+  Rational main_part_;
+  Rational grace_part_;
+
+  void set_infinite (int k);
+
+  bool to_bool () const;
+  int den () const;
+  int num () const;
+  /*
+    Deliver a copy of THIS as a smobified SCM
+   */
+  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, % );
-
-INSTANTIATE_COMPARE (Moment const&, Rational::compare);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, / );
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, * );
 
 
-/**
-  A really big time-moment.
+DECLARE_UNSMOB(Moment, moment);
+int compare (Moment const&, Moment const&);
+INSTANTIATE_COMPARE (Moment const&, Moment::compare);
 
-  Windhoze-suck-suck-suck-suck-suck-thank-you-cygnus
+Moment robust_scm2moment (SCM, Moment);
 
-  I get tired of all these incompatibilities.  Let's just assume that
-  INT_MAX is really, really, really big.
+#ifdef STREAM_SUPPORT
+std::ostream & operator << (std::ostream &, Moment const &);
+#endif
 
-  Can't we name this Saint_jut_mom (Sintjuttemis ?)  */
-  
-/* URG ! WE HAVE TWO RATIONAL INFINITIES! */
-const Moment infinity_mom = INT_MAX;
+bool moment_less (SCM a, SCM b);
 
 #endif /* MOMENT_HH */