X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-engraver.cc;h=97db20c1bb6eb739e2b7f721fde765eb3ab3cfb7;hb=36f6766b9de37adb09d2a27e3f925b356cbc0849;hp=ba462c16739e30e746a78f6dda43df3052db7d43;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index ba462c1673..97db20c1bb 100644
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -3,69 +3,127 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "translator-group.hh"
-#include "command-request.hh"
-#include "grob-info.hh"
+
+#include "context.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
-{   
+{
 protected:
+  /* Needed to know whether we're advancing in grace notes, or not. */
+  Moment last_moment_;
+  
   virtual void start_translation_timestep ();
+  virtual void initialize ();
+  virtual void process_music();
   virtual void stop_translation_timestep ();
-  virtual void process_music ();
+
 public:
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS (Timing_engraver);
 };
 
-ADD_THIS_TRANSLATOR (Timing_engraver);
+
+Timing_engraver::Timing_engraver ()
+{
+  last_moment_.main_part_ = Rational (-1);
+}
+
+
+void
+Timing_engraver::initialize ()
+{
+  Timing_translator::initialize ();
+  
+  SCM which = get_property ("whichBar");
+  Moment now = now_mom ();
+  
+  /* Set the first bar of the score? */
+  if (!scm_is_string (which))
+    which = (now.main_part_ || now.main_part_ == last_moment_.main_part_)
+      ? SCM_EOL : scm_makfrom0str ("|");
+
+  context ()->set_property ("whichBar", which);
+}
+
+void
+Timing_engraver::process_music()
+{
+  Timing_translator::process_music ();
+
+  bool start_of_measure = (last_moment_.main_part_ != now_mom().main_part_
+			   && !measure_position ().main_part_);
+
+  /*
+    We can't do this in start_translation_timestep(), since time sig
+    changes won't have happened by then.
+   */
+  if (start_of_measure)
+    {
+      Moment mlen = Moment (measure_length ());
+      unsmob_grob (get_property ("currentCommandColumn"))
+	->set_property ("measure-length", mlen.smobbed_copy ()); 
+    }
+}
+  
 
 void
 Timing_engraver::start_translation_timestep ()
 {
   Timing_translator::start_translation_timestep ();
 
-  SCM nonauto = get_property ("barNonAuto");
-
+  SCM automatic_bars = get_property ("automaticBars");
+  Moment now = now_mom ();
   SCM which = get_property ("whichBar");
-  if (!gh_string_p (which))
-    which = now_mom ()
-      ? SCM_EOL : ly_str02scm ("|");
-  
-  if (!gh_string_p (which) && !to_boolean (nonauto))
+
+  /* Set the first bar of the score? */
+  if (!scm_is_string (which))
+    which = SCM_EOL;
+
+  Moment mp = measure_position ();
+  bool start_of_measure = (last_moment_.main_part_ != now.main_part_
+			   && !mp.main_part_);
+
+  if (!scm_is_string (which) && to_boolean (automatic_bars))
     {
       SCM always = get_property ("barAlways");
-      if (!measure_position ()
-	  || (to_boolean (always)))
+
+      if ( start_of_measure || (to_boolean (always)))
 	{
 	  /* should this work, or be junked?  See input/bugs/no-bars.ly */
-	  which=get_property ("defaultBarType");
+	  which = get_property ("defaultBarType");
 	}
     }
 
-  daddy_trans_l_->set_property ("whichBar", which);
+  context ()->set_property ("whichBar", which);
 }
 
 void
 Timing_engraver::stop_translation_timestep ()
 {
   Timing_translator::stop_translation_timestep ();
-  daddy_trans_l_->set_property ("whichBar", SCM_EOL);  
+  context ()->set_property ("whichBar", SCM_EOL);
+  last_moment_ = now_mom ();
 }
 
 
-/*
-  ugh. Translator doesn't do process_music ().
- */
-void
-Timing_engraver::process_music ()
-{
-  Timing_translator::process_music ();
-}
+ADD_TRANSLATOR (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}. "
+"\n\nThis engraver adds the alias @code{Timing} to its containing context."
+
+		   ,
+/* creats*/       "",
+/* accepts */     "",
+/* acks  */      "",
+/* reads */       "automaticBars whichBar barAlways defaultBarType skipBars timing measureLength measurePosition currentBarNumber",
+/* write */       "");