release: 1.2.0

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

diff --git a/lily/time-description.cc b/lily/time-description.cc
index 76e05b5f202d970f1187e565d629eb4e264816ed..d66eb403e1527cfb8f606f3c50dfc0998f999d2e 100644 (file)
--- a/lily/time-description.cc
+++ b/lily/time-description.cc
@@ -3,23 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "time-description.hh"
 #include "debug.hh"
 
 String
-Time_description::str() const
+Time_description::str () const
 {
   String s ("Time_description { ");
   if (cadenza_b_)
-       s+=String (" (cadenza) ");
-  s+= "at ";
-  s+=when_;
-  s+="\nmeter " + String (whole_per_measure_/one_beat_) +":" +
-       String (Rational (Rational (1)/one_beat_));
-  s+= "\nposition "+String (bars_i_) + ":"+ whole_in_measure_ +"\n}\n";
+    s += String ("(") + _("cadenza") + ")";
+  s += "at ";
+  s += when_.str ();
+  s +="\ntime_signature " + (whole_per_measure_/one_beat_).str () +":" +
+    (Moment (Moment (1)/one_beat_)).str ();
+  s += "\nposition " + to_str (bars_i_) + ":"+ whole_in_measure_.str () +"\n}\n";
   return s;
 }
 
@@ -27,15 +27,16 @@ void
 Time_description::print() const
 {
 #ifndef NPRINT
-  DOUT << str();
+  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
@@ -44,20 +45,19 @@ Time_description::OK() const
 void
 Time_description::set_cadenza (bool b)
 {
-  if (cadenza_b_ && !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 ;
 }
 
 Time_description::Time_description()
 {
-  error_b_ =  false;
   whole_per_measure_ = 1;
   whole_in_measure_ =0;
   one_beat_ = Moment (1,4);
@@ -69,43 +69,43 @@ Time_description::Time_description()
 void
 Time_description::add (Moment dt)
 {
-  assert (dt >= Rational (0));
+  assert (dt >= Moment (0));
   when_ +=  dt;
   whole_in_measure_ += dt;
-       
-  while (!cadenza_b_ && whole_in_measure_ >= whole_per_measure_) 
+
+  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_ ++;
     }
 }
 
 void
-Time_description::set_meter (int l, int o)
+Time_description::set_time_signature (int l, int o)
 {
   assert (o);
-  one_beat_ = Rational (1)/Moment (o);
+  one_beat_ = Moment (1)/Moment (o);
   whole_per_measure_ = Moment (l) * one_beat_;
 }
 
 bool
-Time_description::allow_meter_change_b()
+Time_description::allow_time_signature_change_b()
 {
   return!(whole_in_measure_);
 }
 
 /**
   retrieve error messages.
-  @return 
+  @return
   error messages if not possible, "" if possible
   */
 String
 Time_description::try_set_partial_str (Moment p) const
 {
-  if (p<Rational (0))
-       return ("Partial must be non-negative");
+  if (p<Moment (0))
+    return (_ ("partial measure must be non-negative"));
   if (p > whole_per_measure_)
-       return ("Partial measure too large");
+    return (_ ("partial measure too large"));
   return "";
 }
 
@@ -122,25 +122,8 @@ 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
 {
   return when_ + barleft();
 }
-