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

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index aa5a4e6973..97db20c1bb 100644
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -3,84 +3,127 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 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);
+}
 
-ADD_THIS_TRANSLATOR(Timing_engraver);
 
 void
-Timing_engraver::do_post_move_processing( )
+Timing_engraver::initialize ()
 {
-  bar_req_l_ = 0;
-  Timing_translator::do_post_move_processing ();
+  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);
 }
 
-bool
-Timing_engraver::do_try_music (Music*m)
+void
+Timing_engraver::process_music()
 {
-  if (Bar_req  * b= dynamic_cast <Bar_req *> (m))
+  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)
     {
-      if (bar_req_l_ && bar_req_l_->equal_b (b)) // huh?
-	return false;
-      
-      bar_req_l_ = b;
-      return true;
+      Moment mlen = Moment (measure_length ());
+      unsmob_grob (get_property ("currentCommandColumn"))
+	->set_property ("measure-length", mlen.smobbed_copy ()); 
     }
-  
-  return Timing_translator::do_try_music (m);
 }
+  
 
-#if 0
-String
-Timing_engraver::do_process_music ()
+void
+Timing_engraver::start_translation_timestep ()
 {
-  if (gh_string_p (get_property  ("barType")))
-    ;
-  else if (!now_mom ())
-    {
-      daddy_trans_l_->set_property ("barType", ly_str02scm ("|"));
-    }
-  else
+  Timing_translator::start_translation_timestep ();
 
-  {
-  }
-}
-#endif
+  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;
 
-/*
-  TODO make properties of this.
- */
-String
-Timing_engraver::which_bar ()
-{
-  if (!bar_req_l_)
+  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))
     {
-      if (!now_mom ())
-	return "|";
+      SCM always = get_property ("barAlways");
 
-      SCM nonauto = get_property ("barNonAuto");
-      if (!to_boolean (nonauto))
+      if ( start_of_measure || (to_boolean (always)))
 	{
-	  SCM always = get_property ("barAlways");
-	  if (!measure_position ()
-	      || (to_boolean (always)))
-	    {
-	      SCM def=get_property ("defaultBarType" );
-	      return (gh_string_p (def))? ly_scm2string (def) : "";
-	    }
+	  /* should this work, or be junked?  See input/bugs/no-bars.ly */
+	  which = get_property ("defaultBarType");
 	}
-      return "";
-    }
-  else
-    {
-      return bar_req_l_->type_str_;
     }
+
+  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_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 */       "");