release: 1.1.1

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

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index b244db903c8de7e3fb14b079107c28f64c9e23ce..856525785b8b65cbc8dd8331ee864462dc6f0895 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -1,10 +1,9 @@
-
 /*
   timing-translator.cc -- implement Timing_translator
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "timing-translator.hh"
@@ -16,37 +15,39 @@
 Timing_translator::Timing_translator ()
 {
   default_grouping_ = Rhythmic_grouping (MInterval (0, 1), 4); // ugh
-  mmrest_b_ = false;
 }
 
 bool
 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++)
+  if (Timing_req *t =  dynamic_cast <Timing_req *> (r))
     {
-      if (timing_req_l_arr_[i]->equal_b(r))
-       return true;
-      if (timing_req_l_arr_[i]->name() == r->name())
+      for (int i=0; i < timing_req_l_arr_.size (); i++)
        {
-         r->warning (_("conflicting timing request"));
-         return false;
+         if (timing_req_l_arr_[i]->equal_b(t))
+           return true;
+         if (timing_req_l_arr_[i]->name() == r->name())
+           {
+             r->warning (_ ("conflicting timing request"));
+             return false;
+           }
        }
+    
+      timing_req_l_arr_.push(t);
+      return true;
     }
-
-  timing_req_l_arr_.push(c->timing());
-  return true;
+  return false;
 }
 
-Meter_change_req*
-Timing_translator::meter_req_l() const
+/*ugh.
+ */
+Time_signature_change_req*
+Timing_translator::time_signature_req_l() const
 {
-  Meter_change_req *m_l=0;
+  Time_signature_change_req *m_l=0;
   for (int i=0; !m_l && i < timing_req_l_arr_.size (); i++)
     {
-      m_l=timing_req_l_arr_[i]->meterchange();
+      m_l=dynamic_cast<Time_signature_change_req*> (timing_req_l_arr_[i]);
     }
   return m_l;
 }
@@ -57,23 +58,23 @@ Timing_translator::do_process_requests()
   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 (Time_signature_change_req *m_l = dynamic_cast <Time_signature_change_req *> (tr_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"));
+         if (! time_.allow_time_signature_change_b())
+           tr_l->warning (_ ("time signature change not allowed here"));
          else
            {
-             time_.set_meter (b_i, o_i);
+             time_.set_time_signature (b_i, o_i);
              default_grouping_ =
                Rhythmic_grouping (MInterval (0,Moment (b_i, o_i)), b_i);
            }
        }
-      else if (tr_l->partial())
+      else if (Partial_measure_req *pm = dynamic_cast <Partial_measure_req *> (tr_l))
        {
-         Moment m = tr_l->partial()->duration_;
+         Moment m = pm->duration_;
          String error = time_.try_set_partial_str (m);
          if (error.length_i ())
            {
@@ -82,26 +83,27 @@ Timing_translator::do_process_requests()
          else
            time_.setpartial (m);
        }
-      else if (tr_l->barcheck())
+      else if (dynamic_cast <Barcheck_req *> (tr_l))
        {
          if (time_.whole_in_measure_)
            {
-             tr_l ->warning (_("Barcheck failed"));
+             tr_l ->warning (_f ("barcheck failed by: %s", 
+               time_.whole_in_measure_.str ()));
 
              time_.whole_in_measure_ = 0; // resync
              time_.error_b_ = true;
            }
 
        }
-      else if (tr_l->cadenza())
+      else if (Cadenza_req *cr = dynamic_cast <Cadenza_req *> (tr_l))
        {
-         time_.set_cadenza (tr_l->cadenza()->on_b_);
+         time_.set_cadenza (cr->on_b_);
        }
-      else if (tr_l->measuregrouping())
+      else if (Measure_grouping_req *mg=dynamic_cast <Measure_grouping_req *> (tr_l))
        {
          default_grouping_ =
-           parse_grouping (tr_l->measuregrouping()->beat_i_arr_,
-                           tr_l->measuregrouping()->elt_length_arr_);
+           parse_grouping (mg->beat_i_arr_,
+                           mg->elt_length_arr_);
 
        }
     }
@@ -113,11 +115,15 @@ Timing_translator::do_pre_move_processing()
 {
   timing_req_l_arr_.set_size (0);
   Global_translator *global_l =
-    daddy_trans_l_->ancestor_l (100)->global_l (); // ugh 100.
+    dynamic_cast<Global_translator*> (daddy_trans_l_->ancestor_l (100)); // ugh 100.
+
+
+  /* allbars == ! skipbars */
+  bool allbars = ! get_property ("SkipBars").to_bool ();
+
 
-  if (!time_.cadenza_b_ && !mmrest_b_)
+  if (!time_.cadenza_b_ && allbars)
     global_l->add_moment_to_process (time_.next_bar_moment ());
-//  mmrest_b_ = false;
 }
 
 IMPLEMENT_IS_TYPE_B1(Timing_translator, Translator);