release: 0.1.24

[lilypond.git] / lily / timing-translator.cc

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index 8bb57faf35faf7a7efdccf9a606dd494a730f13f..44a61739f37a8320346af15fd6966265b4b7b99d 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -23,17 +23,17 @@ Timing_translator::do_try_request(Request*r)
   Command_req * c = r->command();
   if (!(c && c->timing()))
     return false;
-  for (int i=0; i < timing_req_l_arr_.size (); i++) 
+  for (int i=0; i < timing_req_l_arr_.size (); i++)
     {
       if (timing_req_l_arr_[i]->equal_b(r))
        return true;
-      if (timing_req_l_arr_[i]->name() == r->name()) 
+      if (timing_req_l_arr_[i]->name() == r->name())
        {
-         r->warning ("conflicting timing request");
+         r->warning (_("conflicting timing request"));
          return false;
        }
     }
-  
+
   timing_req_l_arr_.push(c->timing());
   return true;
 }
@@ -42,63 +42,63 @@ Meter_change_req*
 Timing_translator::meter_req_l() const
 {
   Meter_change_req *m_l=0;
-  for (int i=0; !m_l && i < timing_req_l_arr_.size (); i++) 
+  for (int i=0; !m_l && i < timing_req_l_arr_.size (); i++)
     {
       m_l=timing_req_l_arr_[i]->meterchange();
     }
-  return m_l;  
+  return m_l;
 }
 
 void
 Timing_translator::do_process_requests()
 {
-  for (int i=0; i < timing_req_l_arr_.size (); i++) 
+  for (int i=0; i < timing_req_l_arr_.size (); i++)
     {
       Timing_req * tr_l = timing_req_l_arr_[i];
       Meter_change_req *m_l = tr_l->meterchange();
-      if (m_l) 
+      if (m_l)
        {
          int b_i= m_l->beats_i_;
          int o_i = m_l->one_beat_i_;
          if (! time_.allow_meter_change_b())
-           tr_l->warning ("Meter change not allowed here");
+           tr_l->warning (_("Meter change not allowed here"));
          else
            {
              time_.set_meter (b_i, o_i);
-             default_grouping_ = 
+             default_grouping_ =
                Rhythmic_grouping (MInterval (0,Moment (b_i, o_i)), b_i);
            }
        }
-      else if (tr_l->partial()) 
+      else if (tr_l->partial())
        {
          Moment m = tr_l->partial()->duration_;
          String error = time_.try_set_partial_str (m);
-         if (error.length_i ()) 
+         if (error.length_i ())
            {
              tr_l->warning (error);
            }
-         else 
+         else
            time_.setpartial (m);
        }
-      else if (tr_l->barcheck()) 
+      else if (tr_l->barcheck())
        {
-         if (time_.whole_in_measure_) 
+         if (time_.whole_in_measure_)
            {
-             tr_l ->warning ("Barcheck failed");
-           
+             tr_l ->warning (_("Barcheck failed"));
+
              time_.whole_in_measure_ = 0; // resync
              time_.error_b_ = true;
            }
 
        }
-      else if (tr_l->cadenza()) 
+      else if (tr_l->cadenza())
        {
          time_.set_cadenza (tr_l->cadenza()->on_b_);
 
        }
-      else if (tr_l->measuregrouping()) 
+      else if (tr_l->measuregrouping())
        {
-         default_grouping_ = 
+         default_grouping_ =
            parse_grouping (tr_l->measuregrouping()->beat_i_arr_,
                            tr_l->measuregrouping()->elt_length_arr_);
 
@@ -111,9 +111,9 @@ void
 Timing_translator::do_pre_move_processing()
 {
   timing_req_l_arr_.set_size (0);
-  Global_translator *global_l = 
+  Global_translator *global_l =
     daddy_trans_l_->ancestor_l (100)->global_l (); // ugh 100.
-  
+
   if (!time_.cadenza_b_)
     global_l->add_moment_to_process (time_.next_bar_moment ());
 }
@@ -132,4 +132,3 @@ Timing_translator::do_post_move_processing()
 {
   time_.add (now_moment ()  - time_.when_);
 }
-