2003 -> 2004

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

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index fca85bb458be577be03c091af6bd018db67982fe..1cfd6a88ec937e16589b5ad3a58ed36663376415 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,7 +14,8 @@
 #include "rational.hh"
 
 /**
-   Rationals with glue for Guilification;
+   Musical timing (Main-timing, grace-timing) with glue for
+   Guilification;
 */
 class Moment
 {
@@ -22,11 +23,12 @@ class Moment
 public:
   Moment ();
   Moment (int m);
-  Moment (int m, int n);
 
+  Moment (Rational, Rational);
   Moment (Rational m);
 
-
+  Moment operator - () const;
+  
   void operator += (Moment const &m);
   void operator -= (Moment const &m);  
 
@@ -34,19 +36,20 @@ public:
   void operator /= (Moment const &m);  
 
   Rational main_part_;
-  Rational grace_mom_;
+  Rational grace_part_;
 
   void set_infinite (int k);
-  
-  operator bool ();
+
+  bool to_bool () const;
   int den () const;
   int num () const;
   /*
     Deliver a copy of THIS as a smobified SCM
    */
   SCM smobbed_copy () const;
-  String str () const;
+  String to_string () const;
   static int compare (Moment const&, Moment const&);
+  
 };
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, + );
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, - );
@@ -54,12 +57,13 @@ 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, % );
+
+#ifdef STREAM_SUPPORT
+std::ostream & operator << (std::ostream &, Moment const &);
 #endif
 
 #endif /* MOMENT_HH */