X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmoment.hh;h=b7f79a6b84b1e7c399aca4b5b7eb6504b8dcd55d;hb=99b6f3aa3558b01c9d4158b19a1f1794c534f89c;hp=4993b7691f84bebb64f30cb45571a5805ee6aeb7;hpb=8e300d9598c6f54cb18d8bc8cd0458fa1028d8b9;p=lilypond.git

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index 4993b7691f..b7f79a6b84 100644
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -1,11 +1,21 @@
-/*   
-  moment.hh -- declare Moment
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef MOMENT_HH
 #define MOMENT_HH
@@ -19,7 +29,7 @@
 */
 class Moment
 {
-  DECLARE_SIMPLE_SMOBS (Moment,);
+  DECLARE_SIMPLE_SMOBS (Moment);
 public:
   Moment ();
   Moment (int m);
@@ -28,12 +38,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,30 +52,33 @@ 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
-   */
-  SCM smobbed_copy () const;
-  String str () 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, % );
 
-ostream & operator << ( ostream &,Moment const &);
+DECLARE_UNSMOB (Moment, moment);
+int compare (Moment const &, Moment const &);
+INSTANTIATE_COMPARE (Moment const &, Moment::compare);
 
-Moment * unsmob_moment (SCM);
-int compare (Moment const&,Moment const&);
-INSTANTIATE_COMPARE (Moment const&, Moment::compare);
+Moment robust_scm2moment (SCM, Moment);
 
-#if 0
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, % );
+#ifdef STREAM_SUPPORT
+ostream &operator << (ostream &, Moment const &);
 #endif
 
+bool moment_less (SCM a, SCM b);
+
 #endif /* MOMENT_HH */