Nitpick run.

[lilypond.git] / lily / moment.cc

diff --git a/lily/moment.cc b/lily/moment.cc
index 4d81493f0ce14b3d8090f559e4a78d90e82570f8..90c3a2da2c47550f01f005a75c8285a3e1ebc6e1 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -1,5 +1,5 @@
-/*   
-  moment.cc --  implement Moment
+/*
+  moment.cc -- implement Moment
 
   source file of the GNU LilyPond music typesetter
 
@@ -17,7 +17,7 @@ Moment::Moment ()
 Moment::Moment (int m)
 {
   main_part_ = Rational (m);
-  grace_part_ = Rational ( 0);
+  grace_part_ = Rational (0);
 }
 
 Moment::Moment (Rational m, Rational g)
@@ -33,6 +33,7 @@ Moment::Moment (Rational m)
 }
 
 #include "ly-smobs.icc"
+
 IMPLEMENT_SIMPLE_SMOBS (Moment);
 IMPLEMENT_TYPE_P (Moment, "ly:moment?");
 
@@ -45,13 +46,13 @@ Moment::mark_smob (SCM)
 int
 Moment::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  Moment  *r = (Moment *) SCM_CELL_WORD_1 (s);
-     
+  Moment *r = (Moment *) SCM_CELL_WORD_1 (s);
+
   scm_puts ("#<Mom ", port);
   String str = r->to_string ();
   scm_puts ((char *)str.to_str0 (), port);
   scm_puts (">", port);
-  
+
   return 1;
 }
 
@@ -59,32 +60,31 @@ SCM
 Moment::as_scheme () const
 {
   return scm_list_5 (ly_symbol2scm ("ly:make-moment"),
-                    scm_from_int (main_part_.num()),
-                    scm_from_int (main_part_.den()),
-                    scm_from_int (grace_part_.num()),
-                    scm_from_int (grace_part_.den()));
+                    scm_from_int (main_part_.num ()),
+                    scm_from_int (main_part_.den ()),
+                    scm_from_int (grace_part_.num ()),
+                    scm_from_int (grace_part_.den ()));
 }
 
-
 SCM
 Moment::equal_p (SCM a, SCM b)
 {
   Moment *m1 = unsmob_moment (a);
   Moment *m2 = unsmob_moment (b);
-      
+
   return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
 int
 compare (Moment const &a, Moment const &b)
 {
-  return Moment::compare (a,b);
+  return Moment::compare (a, b);
 }
 
 int
 Moment::compare (Moment const &a, Moment const &b)
 {
-  int c = Rational::compare (a.main_part_,b.main_part_);
+  int c = Rational::compare (a.main_part_, b.main_part_);
   if (c)
     return c;
 
@@ -94,36 +94,41 @@ Moment::compare (Moment const &a, Moment const &b)
 void
 Moment::operator += (Moment const &src)
 {
-  main_part_ += src.main_part_ ;
+  main_part_ += src.main_part_;
   grace_part_ += src.grace_part_;
 }
+
 void
 Moment::operator -= (Moment const &src)
 {
-  main_part_ -= src.main_part_ ;
+  main_part_ -= src.main_part_;
   grace_part_ -= src.grace_part_;
 }
 
-/*
-  only take the main part of SRC for multiplication.
-*/
+/* Only take the main part of SRC for multiplication.  */
 void
 Moment::operator *= (Moment const &src)
 {
-  main_part_ *= src.main_part_ ;
+  main_part_ *= src.main_part_;
   grace_part_ *= src.main_part_;
 }
 
-/*
-  only take the main part of SRC for multiplication.
-*/
+/* Only take the main part of SRC for division.  */
 void
 Moment::operator /= (Moment const &src)
 {
-  main_part_ /= src.main_part_ ;
+  main_part_ /= src.main_part_;
   grace_part_ /= src.main_part_;
 }
 
+/* Only take the main part of SRC for division.  */
+void
+Moment::operator %= (Moment const &src)
+{
+  main_part_ %= src.main_part_;
+  grace_part_ %= src.main_part_;
+}
+
 int
 Moment::den () const
 {
@@ -151,11 +156,9 @@ Moment::set_infinite (int k)
 String
 Moment::to_string () const
 {
-  String s =  main_part_.to_string ();
+  String s = main_part_.to_string ();
   if (grace_part_)
-    {
-      s += "G" + grace_part_.to_string ();
-    }
+    s += "G" + grace_part_.to_string ();
   return s;
 }
 
@@ -163,12 +166,11 @@ Moment
 Moment::operator - () const
 {
   Moment m;
-  m.grace_part_ = - grace_part_;
-  m. main_part_ = - main_part_ ;
+  m.grace_part_ = -grace_part_;
+  m.main_part_ = -main_part_;
   return m;
 }
 
-
 #ifdef STREAM_SUPPORT
 std::ostream &
 operator << (std::ostream &os, Moment const &m)
@@ -188,7 +190,6 @@ robust_scm2moment (SCM m, Moment d)
     return *p;
 }
 
-
 bool
 moment_less (SCM a, SCM b)
 {