2003 -> 2004

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

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index 05b4fbfc207768b58ae774c5e2c3e1d643736af0..c9139b95bb1b56c636e5ed16939d7cdd0e55841e 100644 (file)
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -3,83 +3,96 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 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"
+#include "grob.hh"
 
 /**
   Do time bookkeeping
  */
 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 ();
+  /* Needed to know whether we're advancing in grace notes, or not. */
+  Moment last_moment_;
+  
+  virtual void start_translation_timestep ();
+  virtual void stop_translation_timestep ();
+
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS (Timing_engraver);
 };
 
-ADD_THIS_TRANSLATOR(Timing_engraver);
 
-void
-Timing_engraver::do_post_move_processing( )
+Timing_engraver::Timing_engraver ()
 {
-  bar_req_l_ = 0;
-  Timing_translator::do_post_move_processing ();
+  last_moment_.main_part_ = Rational (-1);
+}
 
-  SCM nonauto = get_property ("barNonAuto");
 
+
+void
+Timing_engraver::start_translation_timestep ()
+{
+  Timing_translator::start_translation_timestep ();
+
+  SCM automatic_bars = get_property ("automaticBars");
+  Moment now = now_mom ();
   SCM which = get_property ("whichBar");
+
+  /* Set the first bar of the score? */
   if (!gh_string_p (which))
-    which = now_mom () ? SCM_EOL : ly_str02scm ("|");
+    which
+      = (now.main_part_ || now.main_part_ == last_moment_.main_part_)
+      ? SCM_EOL : scm_makfrom0str ("|");
+
+  Moment mp = measure_position ();
+  bool start_of_measure = (last_moment_.main_part_ != now.main_part_
+                          && !mp.main_part_);
+
+  if (start_of_measure)
+    {
+      Moment mlen = Moment (measure_length ());
+      unsmob_grob (get_property ("currentCommandColumn"))
+       ->set_grob_property ("measure-length", mlen.smobbed_copy ()); 
+    }
   
-  if (!gh_string_p (which) && !to_boolean (nonauto))
+  if (!gh_string_p (which) && to_boolean (automatic_bars))
     {
       SCM always = get_property ("barAlways");
-      if (!measure_position ()
-         || (to_boolean (always)))
+
+      if ( start_of_measure || (to_boolean (always)))
        {
-         which=get_property ("defaultBarType" );
+         /* should this work, or be junked?  See input/bugs/no-bars.ly */
+         which = get_property ("defaultBarType");
        }
     }
 
-  daddy_trans_l_->set_property ("whichBar", which);
+  daddy_trans_->set_property ("whichBar", which);
 }
 
 void
-Timing_engraver::do_pre_move_processing ()
+Timing_engraver::stop_translation_timestep ()
 {
-  Timing_translator::do_pre_move_processing ();
-  daddy_trans_l_->set_property ("whichBar", SCM_EOL);  
+  Timing_translator::stop_translation_timestep ();
+  daddy_trans_->set_property ("whichBar", SCM_EOL);
+  last_moment_ = now_mom ();
 }
 
-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);
-}
 
-void
-Timing_engraver::do_process_music ()
-{
-}
+ENTER_DESCRIPTION (Timing_engraver,
+/* descr */       " Responsible for synchronizing timing information from staves.  "
+"Normally in @code{Score}.  In order to create polyrhythmic music, "
+"this engraver should be removed from @code{Score} and placed in "
+"@code{Staff}.",
+/* creats*/       "",
+/* accepts */     "",
+/* acks  */      "",
+/* reads */       "timeSignatureFraction automaticBars whichBar barAlways defaultBarType skipBars timing measureLength measurePosition currentBarNumber",
+/* write */       "");