release: 1.1.56

[lilypond.git] / lily / time-description.cc

diff --git a/lily/time-description.cc b/lily/time-description.cc
index 6fecdb99d89ef1f34c9dab19ee565e50ad1dc627..d66eb403e1527cfb8f606f3c50dfc0998f999d2e 100644 (file)
--- a/lily/time-description.cc
+++ b/lily/time-description.cc
@@ -14,11 +14,11 @@ Time_description::str () const
 {
   String s ("Time_description { ");
   if (cadenza_b_)
-       s += String ("(") + _("cadenza") + ")";
+    s += String ("(") + _("cadenza") + ")";
   s += "at ";
   s += when_.str ();
   s +="\ntime_signature " + (whole_per_measure_/one_beat_).str () +":" +
-        (Moment (Moment (1)/one_beat_)).str ();
+    (Moment (Moment (1)/one_beat_)).str ();
   s += "\nposition " + to_str (bars_i_) + ":"+ whole_in_measure_.str () +"\n}\n";
   return s;
 }
@@ -30,12 +30,13 @@ Time_description::print() const
   DOUT << str ();
 #endif
 }
+
 void
 Time_description::OK() const
 {
 #ifndef NDEBUG
   if (!cadenza_b_)
-       assert (whole_in_measure_ < whole_per_measure_);
+    assert (whole_in_measure_ < whole_per_measure_);
   assert (Moment (0) <= whole_in_measure_);
   assert (one_beat_);
 #endif
@@ -46,11 +47,11 @@ Time_description::set_cadenza (bool b)
 {
   if (cadenza_b_ && !b)
     {
-       if (whole_in_measure_)
-         {
-           bars_i_ ++;         // should do?
-           whole_in_measure_ = 0;
-         }
+      if (whole_in_measure_)
+       {
+         bars_i_ ++;           // should do?
+         whole_in_measure_ = 0;
+       }
     }
   cadenza_b_ = b ;
 }
@@ -74,8 +75,8 @@ Time_description::add (Moment dt)
 
   while (!cadenza_b_ && whole_in_measure_ >= whole_per_measure_)
     {
-       whole_in_measure_ -= whole_per_measure_;
-       bars_i_ ++;
+      whole_in_measure_ -= whole_per_measure_;
+      bars_i_ ++;
     }
 }
 
@@ -102,9 +103,9 @@ String
 Time_description::try_set_partial_str (Moment p) const
 {
   if (p<Moment (0))
-       return (_ ("partial measure must be non-negative"));
+    return (_ ("partial measure must be non-negative"));
   if (p > whole_per_measure_)
-       return (_ ("partial measure too large"));
+    return (_ ("partial measure too large"));
   return "";
 }
 
@@ -121,22 +122,6 @@ Time_description::barleft() const
   return whole_per_measure_-whole_in_measure_;
 }
 
-int
-Time_description::compare (Time_description const &t1,  Time_description const&t2)
-{
-  int i = sign (t1.when_-t2.when_);
-
-  if (!i)
-    {
-       assert (t1.bars_i_==t2.bars_i_);
-       assert (t1.one_beat_ == t2.one_beat_);
-       assert (t1.whole_in_measure_ == t2.whole_in_measure_);
-       assert (t1.whole_per_measure_ == t2.whole_per_measure_);
-    }
-
-  return i;
-}
-
 Moment
 Time_description::next_bar_moment() const
 {