Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index e7f5499646822e05278d124b3a58ca0022556b20..f0c6fbb21b79b418f11b65e0a74ac3c72c0bbf56 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MOMENT_HH
@@ -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_;
@@ -45,7 +46,7 @@ public:
   /*
     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;
 };
@@ -53,6 +54,7 @@ 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 +63,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);