* flower

[lilypond.git] / lily / moment.cc

diff --git a/lily/moment.cc b/lily/moment.cc
index b2d1941a65f540d7ad442514cc21d5dbc735fb27..c892d5f459d4183dc579408b35530d64b2cdd8df 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -1,4 +1,4 @@
-/*   
+/*
   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)
@@ -45,13 +45,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,19 +59,18 @@ 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;
 }
 
@@ -92,15 +91,15 @@ Moment::compare (Moment const &a, Moment const &b)
 }
 
 void
-Moment::operator += (Moment const &src)
+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)
+Moment::operator-= (Moment const &src)
 {
-  main_part_ -= src.main_part_ ;
+  main_part_ -= src.main_part_;
   grace_part_ -= src.grace_part_;
 }
 
@@ -108,9 +107,9 @@ Moment::operator -= (Moment const &src)
   only take the main part of SRC for multiplication.
 */
 void
-Moment::operator *= (Moment const &src)
+Moment::operator*= (Moment const &src)
 {
-  main_part_ *= src.main_part_ ;
+  main_part_ *= src.main_part_;
   grace_part_ *= src.main_part_;
 }
 
@@ -118,9 +117,9 @@ Moment::operator *= (Moment const &src)
   only take the main part of SRC for multiplication.
 */
 void
-Moment::operator /= (Moment const &src)
+Moment::operator/= (Moment const &src)
 {
-  main_part_ /= src.main_part_ ;
+  main_part_ /= src.main_part_;
   grace_part_ /= src.main_part_;
 }
 
@@ -151,7 +150,7 @@ 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 ();
@@ -160,18 +159,17 @@ Moment::to_string () const
 }
 
 Moment
-Moment::operator - () const
+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)
+operator<< (std::ostream &os, Moment const &m)
 {
   os << m.to_string ();
   return os;
@@ -188,7 +186,6 @@ robust_scm2moment (SCM m, Moment d)
     return *p;
 }
 
-
 bool
 moment_less (SCM a, SCM b)
 {