release: 1.1.43

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

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index 6ab83a2ea9751912ef571f825c66beaef3cb3a02..800fab932bc1fd355a6c22345f9e7b631edf3a7f 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "timing-translator.hh"
@@ -18,33 +18,36 @@ Timing_translator::Timing_translator ()
 }
 
 bool
-Timing_translator::do_try_request(Request*r)
+Timing_translator::do_try_music (Music*r)
 {
-  Command_req * c = r->access_Command_req ();
-  if (!(c && c->access_Timing_req ()))
-    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 (String (classname (timing_req_l_arr_[i])) == classname (r))
+           {
+             r->warning (_ ("conflicting timing request"));
+             return false;
+           }
        }
+    
+      timing_req_l_arr_.push(t);
+      return true;
     }
-
-  timing_req_l_arr_.push(c->access_Timing_req ());
-  return true;
+  return false;
 }
 
+/*ugh.
+ */
 Time_signature_change_req*
 Timing_translator::time_signature_req_l() const
 {
   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]->access_Time_signature_change_req ();
+      m_l=dynamic_cast<Time_signature_change_req*> (timing_req_l_arr_[i]);
     }
   return m_l;
 }
@@ -55,8 +58,8 @@ 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];
-      Time_signature_change_req *m_l = tr_l->access_Time_signature_change_req ();
-      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_;
@@ -65,13 +68,15 @@ Timing_translator::do_process_requests()
          else
            {
              time_.set_time_signature (b_i, o_i);
+
              default_grouping_ =
-               Rhythmic_grouping (MInterval (0,Moment (b_i, o_i)), b_i);
+               Rhythmic_grouping (MInterval (0,Moment (b_i, o_i)),
+                                  b_i == 1 ? 2 : b_i);
            }
        }
-      else if (tr_l->access_Partial_measure_req ())
+      else if (Partial_measure_req *pm = dynamic_cast <Partial_measure_req *> (tr_l))
        {
-         Moment m = tr_l->access_Partial_measure_req ()->duration_;
+         Moment m = pm->length_mom_;
          String error = time_.try_set_partial_str (m);
          if (error.length_i ())
            {
@@ -80,7 +85,7 @@ Timing_translator::do_process_requests()
          else
            time_.setpartial (m);
        }
-      else if (tr_l->access_Barcheck_req())
+      else if (dynamic_cast <Barcheck_req *> (tr_l))
        {
          if (time_.whole_in_measure_)
            {
@@ -90,20 +95,30 @@ Timing_translator::do_process_requests()
              time_.whole_in_measure_ = 0; // resync
              time_.error_b_ = true;
            }
-
        }
-      else if (tr_l->access_Cadenza_req ())
+      else if (Cadenza_req *cr = dynamic_cast <Cadenza_req *> (tr_l))
        {
-         time_.set_cadenza (tr_l->access_Cadenza_req ()->on_b_);
+         time_.set_cadenza (cr->on_b_);
        }
-      else if (tr_l->access_Measure_grouping_req ())
+      else if (Measure_grouping_req *mg=dynamic_cast <Measure_grouping_req *> (tr_l))
        {
          default_grouping_ =
-           parse_grouping (tr_l->access_Measure_grouping_req ()->beat_i_arr_,
-                           tr_l->access_Measure_grouping_req ()->elt_length_arr_);
+           parse_grouping (mg->beat_i_arr_,
+                           mg->elt_length_arr_);
 
        }
     }
+
+  Translator_group * tr=0;
+
+  Scalar barn = get_property ("currentBarNumber", &tr);
+  if (!barn.empty_b () && barn.isnum_b ())
+    {
+      time_.bars_i_ = int(barn);
+      tr->set_property ("currentBarNumber", "");
+    }
+  
+
 }
 
 
@@ -112,27 +127,32 @@ 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.
 
 
-  bool allbars = ! get_property ("SkipBars").to_bool ();
+  /* allbars == ! skipbars */
+  bool allbars = ! get_property ("skipBars", 0).to_bool ();
+
+  // urg: multi bar rests: should always must process whole of first bar?
   if (!time_.cadenza_b_ && allbars)
     global_l->add_moment_to_process (time_.next_bar_moment ());
 }
 
-IMPLEMENT_IS_TYPE_B1(Timing_translator, Translator);
+
 ADD_THIS_TRANSLATOR(Timing_translator);
 
 void
 Timing_translator::do_creation_processing()
 {
-  time_.when_ = now_moment ();
+  time_.when_ = now_mom ();
 }
 
 void
 Timing_translator::do_post_move_processing()
 {
-  time_.add (now_moment ()  - time_.when_);
+  time_.add (now_mom ()  - time_.when_);
+
+
 }
 
 void