patch::: 1.3.8.uu1

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

diff --git a/lily/time-description.cc b/lily/time-description.cc
index dd8c5616d9c795d88ead91a2dd0300d46b87f734..2874444da422707f7515c546e953f5cafbe1f870 100644 (file)
--- a/lily/time-description.cc
+++ b/lily/time-description.cc
@@ -1,142 +1,11 @@
 /*
-  time-description.cc -- implement Time_description
+  timing-translator.cc -- implement Timing_translator
 
   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 "timing-translator.hh"
+#include "translator-group.hh"
 #include "debug.hh"
-
-String
-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";
-    return s;
-}
-
-void
-Time_description::print() const
-{
-#ifndef NPRINT
-    DOUT << str();
-#endif
-}
-void
-Time_description::OK() const
-{
-#ifndef NDEBUG
-    if (!cadenza_b_)
-       assert (whole_in_measure_ < whole_per_measure_);
-    assert (Moment (0) <= whole_in_measure_);
-    assert (one_beat_);
-#endif
-}
-
-void
-Time_description::set_cadenza (bool b)
-{
-    if (cadenza_b_ && !b) {
-       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);
-    when_ = 0;
-    bars_i_ = 0;
-    cadenza_b_ = false;
-}
-
-void
-Time_description::add (Moment dt)
-{
-    assert (dt >= Rational (0));
-    when_ +=  dt;
-    whole_in_measure_ += dt;
-       
-    while ( !cadenza_b_ && whole_in_measure_ >= whole_per_measure_) {
-       whole_in_measure_ -= whole_per_measure_;
-       bars_i_ ++;
-    }
-}
-
-void
-Time_description::set_meter (int l, int o)
-{
-    assert (o);
-    one_beat_ = Rational (1)/Moment (o);
-    whole_per_measure_ = Moment (l) * one_beat_;
-}
-
-bool
-Time_description::allow_meter_change_b()
-{
-    return!(whole_in_measure_);
-}
-
-/**
-  retrieve error messages.
-  @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 > whole_per_measure_)
-       return ("Partial measure too large");
-    return "";
-}
-
-void
-Time_description::setpartial (Moment p)
-{
-    whole_in_measure_ = whole_per_measure_ - p;
-}
-
-Moment
-Time_description::barleft()const
-{
-    assert (!cadenza_b_);
-    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();
-}
-