patch::: 1.3.115.jcn2

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

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index 05b4fbfc207768b58ae774c5e2c3e1d643736af0..d246f08f0db4f2a191ad0f16a571d601095e63ce 100644 (file)
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -9,7 +9,7 @@
 
 #include "translator-group.hh"
 #include "command-request.hh"
-#include "score-element-info.hh"
+#include "grob-info.hh"
 #include "multi-measure-rest.hh"
 #include "timing-translator.hh"
 #include "engraver.hh"
@@ -19,12 +19,10 @@
  */
 class Timing_engraver : public Timing_translator, public Engraver
 {   
-  Bar_req * bar_req_l_;
 protected:
-  virtual bool do_try_music (Music * );
-  virtual void do_post_move_processing ();
-  virtual void do_process_music ();
-  virtual void do_pre_move_processing ();
+  virtual void start_translation_timestep ();
+  virtual void stop_translation_timestep ();
+  virtual void process_music ();
 public:
   VIRTUAL_COPY_CONS(Translator);
 };
@@ -32,16 +30,16 @@ public:
 ADD_THIS_TRANSLATOR(Timing_engraver);
 
 void
-Timing_engraver::do_post_move_processing( )
+Timing_engraver::start_translation_timestep( )
 {
-  bar_req_l_ = 0;
-  Timing_translator::do_post_move_processing ();
+  Timing_translator::start_translation_timestep ();
 
   SCM nonauto = get_property ("barNonAuto");
 
   SCM which = get_property ("whichBar");
   if (!gh_string_p (which))
-    which = now_mom () ? SCM_EOL : ly_str02scm ("|");
+    which = now_mom ()
+      ? SCM_EOL : ly_str02scm ("|");
   
   if (!gh_string_p (which) && !to_boolean (nonauto))
     {
@@ -57,29 +55,18 @@ Timing_engraver::do_post_move_processing( )
 }
 
 void
-Timing_engraver::do_pre_move_processing ()
+Timing_engraver::stop_translation_timestep ()
 {
-  Timing_translator::do_pre_move_processing ();
+  Timing_translator::stop_translation_timestep ();
   daddy_trans_l_->set_property ("whichBar", SCM_EOL);  
 }
 
-bool
-Timing_engraver::do_try_music (Music*m)
-{
-  if (0) // 
-    {
-      Bar_req  * b= dynamic_cast <Bar_req *> (m);
-      if (bar_req_l_ && !bar_req_l_->equal_b (b)) 
-       return false;
-      
-      bar_req_l_ = b;
-      return true;
-    }
-  
-  return Timing_translator::do_try_music (m);
-}
 
+/*
+  ugh. Translator doesn't do process_music ().
+ */
 void
-Timing_engraver::do_process_music ()
+Timing_engraver::process_music ()
 {
+  Timing_translator::process_music ();
 }