source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--1998 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 () +":" +
+ (Rational (Rational (1)/one_beat_)).str ();
+ s += "\nposition " + to_str (bars_i_) + ":"+ whole_in_measure_.str () +"\n}\n";
return s;
}
Time_description::print() const
{
#ifndef NPRINT
- DOUT << str();
+ DOUT << str ();
#endif
}
void
void
Time_description::set_cadenza (bool b)
{
- if (cadenza_b_ && !b)
+ if (cadenza_b_ && !b)
{
- if (whole_in_measure_)
+ if (whole_in_measure_)
{
bars_i_ ++; // should do?
whole_in_measure_ = 0;
whole_in_measure_ =0;
one_beat_ = Moment (1,4);
when_ = 0;
- bars_i_ = 0;
+ bars_i_ = 1; // musician start counting at 1
cadenza_b_ = false;
}
assert (dt >= Rational (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_ ++;
}
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);
}
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
+Time_description::try_set_partial_str (Moment p) const
{
if (p<Rational (0))
- return ("Partial 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 "";
}
}
Moment
-Time_description::barleft()const
+Time_description::barleft() const
{
assert (!cadenza_b_);
return whole_per_measure_-whole_in_measure_;
{
int i = sign (t1.when_-t2.when_);
- if (!i)
+ if (!i)
{
assert (t1.bars_i_==t2.bars_i_);
assert (t1.one_beat_ == t2.one_beat_);
{
return when_ + barleft();
}
-