X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmoment.hh;h=2f53c9e2582429f671c8c487818188060b36723b;hb=9066eeede909ace56324c905217c5b585ba42f90;hp=615928a62cf7905b76df74737e1ee7a440c91238;hpb=462ddeacef82187d5b85eb92c167f08561ad311a;p=lilypond.git

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index 615928a62c..2f53c9e258 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--2000 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
@@ -14,43 +24,60 @@
 #include "rational.hh"
 
 /**
-   Rationals with glue for Guilification;
- */
-struct Moment : public Rational
+   Musical timing (Main-timing, grace-timing) with glue for
+   Guilification;
+*/
+class Moment
 {
-  Moment () { self_scm_ = SCM_EOL; }
-  Moment (int m) : Rational (m) {self_scm_ = SCM_EOL; }
-  Moment (int m, int n) : Rational (m,n) {self_scm_ = SCM_EOL; }
-  Moment (Rational m) : Rational (m) {self_scm_ = SCM_EOL; }
-  ~Moment ();
-  
-  DECLARE_SMOBS;
-};
+  DECLARE_SIMPLE_SMOBS (Moment);
+public:
+  Moment ();
+  Moment (int m);
 
+  Moment (Rational, Rational);
+  Moment (Rational m);
 
-Moment * unsmob_moment (SCM);
+  Moment operator - () const;
 
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, / );
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, + );
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, * );
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, - );
-IMPLEMENT_ARITHMETIC_OPERATOR (Moment, % );
+  void operator += (Moment const &m);
+  void operator -= (Moment const &m);
 
-INSTANTIATE_COMPARE (Moment const&, Rational::compare);
+  void operator *= (Moment const &m);
+  void operator /= (Moment const &m);
+  void operator %= (Moment const &m);
 
+  Rational main_part_;
+  Rational grace_part_;
 
-/**
-  A really big time-moment.
+  void set_infinite (int k);
+
+  bool to_bool () 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 &);
+  SCM as_scheme () const;
+};
+
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, +);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, -);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, / );
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, *);
+IMPLEMENT_ARITHMETIC_OPERATOR (Moment, % );
+
+int compare (Moment const &, Moment const &);
+INSTANTIATE_COMPARE (Moment const &, Moment::compare);
 
-  Windhoze-suck-suck-suck-suck-suck-thank-you-cygnus
+Moment robust_scm2moment (SCM, Moment);
 
-  I get tired of all these incompatibilities.  Let's just assume that
-  INT_MAX is really, really, really big.
+#ifdef STREAM_SUPPORT
+ostream &operator << (ostream &, Moment const &);
+#endif
 
-  Can't we name this Saint_jut_mom (Sintjuttemis ?)  */
-  
-/* URG ! WE HAVE TWO RATIONAL INFINITIES! */
-const Moment infinity_mom = INT_MAX;
+bool moment_less (SCM a, SCM b);
 
 #endif /* MOMENT_HH */