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

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index e7f5499646..ed7c7b0741 100644
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MOMENT_HH
@@ -18,7 +18,7 @@
 */
 class Moment
 {
-  DECLARE_SIMPLE_SMOBS (Moment,);
+  DECLARE_SIMPLE_SMOBS (Moment);
 public:
   Moment ();
   Moment (int m);
@@ -26,13 +26,14 @@ public:
   Moment (Rational, Rational);
   Moment (Rational m);
 
-  Moment operator- () const;
+  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);
+  void operator /= (Moment const &m);
+  void operator %= (Moment const &m);
 
   Rational main_part_;
   Rational grace_part_;
@@ -40,19 +41,21 @@ 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;
+  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, %);
 
 DECLARE_UNSMOB (Moment, moment);
 int compare (Moment const &, Moment const &);
@@ -61,7 +64,7 @@ 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);