X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-engraver.cc;h=7660ba9a3e5166775b1456a1193ee6ee6b46d8ce;hb=9bea477a992947adbbba48bc479c3f551cde8225;hp=510f24b40c21b250a765441646511f26b7887c4f;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index 510f24b40c..7660ba9a3e 100644
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -1,23 +1,123 @@
 /*
-  timing-grav.cc -- implement Timing_engraver
+  timing-engraver.cc -- implement Timing_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "score-engraver.hh"
-#include "timing-engraver.hh"
-#include "command-request.hh"
-#include "score-element-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 ();
+
+public:
+  TRANSLATOR_DECLARATIONS (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::fill_staff_info (Staff_info &inf)
+Timing_engraver::start_translation_timestep ()
 {
-  inf.time_C_ = &time_;
-  inf.rhythmic_C_ = &default_grouping_;
+  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 (!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 (start_of_measure || (to_boolean (always)))
+	{
+	  /* should this work, or be junked?  See input/bugs/no-bars.ly */
+	  which = get_property ("defaultBarType");
+	}
+    }
+
+  context ()->set_property ("whichBar", which);
 }
 
+void
+Timing_engraver::stop_translation_timestep ()
+{
+  Timing_translator::stop_translation_timestep ();
+  context ()->set_property ("whichBar", SCM_EOL);
+  last_moment_ = now_mom ();
+}
 
-ADD_THIS_TRANSLATOR(Timing_engraver);
+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 */ "");