patch::: 1.3.130.jcn1

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

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index 7643a2cfa71018ca1bef21054533e7b54907a611..468dc0eb3b342d82c6c9165472da03a068e123ed 100644 (file)
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -5,11 +5,9 @@
 
   (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <iostream.h>
-
 #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"
@@ -20,8 +18,9 @@
 class Timing_engraver : public Timing_translator, public Engraver
 {   
 protected:
-  virtual void do_post_move_processing ();
-  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);
 };
@@ -29,15 +28,16 @@ public:
 ADD_THIS_TRANSLATOR(Timing_engraver);
 
 void
-Timing_engraver::do_post_move_processing( )
+Timing_engraver::start_translation_timestep( )
 {
-  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))
     {
@@ -45,6 +45,7 @@ Timing_engraver::do_post_move_processing( )
       if (!measure_position ()
          || (to_boolean (always)))
        {
+         /* should this work, or be junked?  See input/bugs/no-bars.ly */
          which=get_property ("defaultBarType" );
        }
     }
@@ -53,11 +54,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);  
 }
 
 
-
+/*
+  ugh. Translator doesn't do process_music ().
+ */
+void
+Timing_engraver::process_music ()
+{
+  Timing_translator::process_music ();
+}