X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Finclude%2Fmoment.hh;h=87bbdb9b31d7f8aeaa131b32a0a941da70b2b0b3;hb=05286945fcf2083341d94fd18cf66393183ef276;hp=7bd38e7a438bf200bf93d41832617bc1f56a718e;hpb=6d10791f358dc637ee7d8858fb61f959f1262b3c;p=lilypond.git

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index 7bd38e7a43..87bbdb9b31 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef MOMENT_HH
 #define MOMENT_HH
@@ -19,7 +18,7 @@
 */
 class Moment
 {
-  DECLARE_SIMPLE_SMOBS (Moment,);
+  DECLARE_SIMPLE_SMOBS (Moment);
 public:
   Moment ();
   Moment (int m);
@@ -28,12 +27,13 @@ public:
   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);  
+  void operator /= (Moment const &m);
+  void operator %= (Moment const &m);
 
   Rational main_part_;
   Rational grace_part_;
@@ -41,29 +41,30 @@ public:
   void set_infinite (int k);
 
   bool to_bool () const;
-  int den () const;
-  int num () const;
+  I64 den () const;
+  I64 num () const;
   /*
     Deliver a copy of THIS as a smobified SCM
-   */
-  String to_string () const;
-  static int compare (Moment const&, Moment 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, +);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, -);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, /);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, *);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, %);
 
-DECLARE_UNSMOB(Moment,moment);
-int compare (Moment const&,Moment const&);
-INSTANTIATE_COMPARE (Moment const&, Moment::compare);
+DECLARE_UNSMOB (Moment, moment);
+int compare (Moment const &, Moment const &);
+INSTANTIATE_COMPARE (Moment const &, Moment::compare);
 
 Moment robust_scm2moment (SCM, Moment);
 
 #ifdef STREAM_SUPPORT
-std::ostream & operator << (std::ostream &, Moment const &);
+ostream &operator << (ostream &, Moment const &);
 #endif
 
 bool moment_less (SCM a, SCM b);