release: 1.1.0

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

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index c282d0c6088180a5274a381881bfcea28dda79bf..316f31d52363d3a00fac0cd6df8a1e0511a00aa7 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -1,106 +1,106 @@
-
 /*
   timing-translator.cc -- implement Timing_translator
 
   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 "timing-translator.hh"
 #include "command-request.hh"
 #include "translator-group.hh"
 #include "global-translator.hh"
+#include "multi-measure-rest.hh"
 
-Timing_translator::Timing_translator()
+Timing_translator::Timing_translator ()
 {
-  default_grouping_ = Rhythmic_grouping (MInterval (0,4),4); // ugh
+  default_grouping_ = Rhythmic_grouping (MInterval (0, 1), 4); // ugh
 }
 
 bool
 Timing_translator::do_try_request(Request*r)
 {
-  Command_req * c = r->command();
-  if (!(c && c->timing()))
+  Command_req * c = dynamic_cast <Command_req *> (r);
+  if (!(c && dynamic_cast <Timing_req *> (c)))
     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());
+
+  timing_req_l_arr_.push(dynamic_cast <Timing_req *> (c));
   return true;
 }
 
-Meter_change_req*
-Timing_translator::meter_req_l() const
+Time_signature_change_req*
+Timing_translator::time_signature_req_l() const
 {
-  Meter_change_req *m_l=0;
-  for (int i=0; !m_l && i < timing_req_l_arr_.size (); i++) 
+  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;  
+  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) 
+      Time_signature_change_req *m_l = dynamic_cast <Time_signature_change_req *> (tr_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");
+         if (! time_.allow_time_signature_change_b())
+           tr_l->warning (_ ("time signature change not allowed here"));
          else
            {
-             time_.set_meter (b_i, o_i);
-             default_grouping_ = 
+             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 (dynamic_cast <Partial_measure_req *> (tr_l))
        {
-         Moment m = tr_l->partial()->duration_;
+         Moment m = dynamic_cast <Partial_measure_req *> (tr_l)->duration_;
          String error = time_.try_set_partial_str (m);
-         if (error) 
+         if (error.length_i ())
            {
              tr_l->warning (error);
            }
-         else 
+         else
            time_.setpartial (m);
        }
-      else if (tr_l->barcheck()) 
+      else if (dynamic_cast <Barcheck_req *> (tr_l))
        {
-         if (time_.whole_in_measure_) 
+         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 (dynamic_cast <Cadenza_req *> (tr_l))
        {
-         time_.set_cadenza (tr_l->cadenza()->on_b_);
-
+         time_.set_cadenza (dynamic_cast <Cadenza_req *> (tr_l)->on_b_);
        }
-      else if (tr_l->measuregrouping()) 
+      else if (dynamic_cast <Measure_grouping_req *> (tr_l))
        {
-         default_grouping_ = 
-           parse_grouping (tr_l->measuregrouping()->beat_i_arr_,
-                           tr_l->measuregrouping()->elt_length_arr_);
+         default_grouping_ =
+           parse_grouping (dynamic_cast <Measure_grouping_req *> (tr_l)->beat_i_arr_,
+                           dynamic_cast <Measure_grouping_req *> (tr_l)->elt_length_arr_);
 
        }
     }
@@ -111,10 +111,15 @@ 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_)
+
+
+  /* allbars == ! skipbars */
+  bool allbars = ! get_property ("SkipBars").to_bool ();
+
+
+  if (!time_.cadenza_b_ && allbars)
     global_l->add_moment_to_process (time_.next_bar_moment ());
 }
 
@@ -133,3 +138,11 @@ Timing_translator::do_post_move_processing()
   time_.add (now_moment ()  - time_.when_);
 }
 
+void
+Timing_translator::do_print () const
+{
+#ifndef NPRINT
+  time_.print ();
+  default_grouping_.print ();
+#endif
+}