X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-engraver.cc;h=1c30fcd34f085bb5ba56a07d408e7d1f7648dd01;hb=428909a52eedefe201a8cd89876336f76e29fa28;hp=d366a7a088804def188c72fd9a36fabc35179710;hpb=28976d28a04cfb9abe97af7214d7dce11f732604;p=lilypond.git

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index d366a7a088..1c30fcd34f 100644
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -1,57 +1,75 @@
 /*
-  timing-grav.cc -- implement Timing_engraver
+  timing-engraver.cc -- implement Timing_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "context.hh"
-#include "grob-info.hh"
-#include "multi-measure-rest.hh"
+
 #include "timing-translator.hh"
 #include "engraver.hh"
+
+#include "context.hh"
+#include "multi-measure-rest.hh"
 #include "grob.hh"
+#include "warn.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. */
+  /* Need 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);
 };
 
+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 */ "");
+
 
 Timing_engraver::Timing_engraver ()
 {
   last_moment_.main_part_ = Rational (-1);
 }
 
-
 void
-Timing_engraver::initialize ()
+Timing_engraver::process_music ()
 {
-  Timing_translator::initialize ();
-  
-  SCM which = get_property ("whichBar");
-  Moment now = now_mom ();
-  
-  /* Set the first bar of the score? */
-  if (!is_string (which))
-    which = (now.main_part_ || now.main_part_ == last_moment_.main_part_)
-      ? SCM_EOL : scm_makfrom0str ("|");
+  Timing_translator::process_music ();
 
-  daddy_context_->set_property ("whichBar", which);
-}
+  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 ());
+      Grob * column = unsmob_grob (get_property ("currentCommandColumn"));
+      if (column)
+	column->set_property ("measure-length", mlen.smobbed_copy ());
+      else
+	programming_error("No command column?");
+    }
+}
 
 void
 Timing_engraver::start_translation_timestep ()
@@ -63,53 +81,32 @@ Timing_engraver::start_translation_timestep ()
   SCM which = get_property ("whichBar");
 
   /* Set the first bar of the score? */
-  if (!is_string (which))
+  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 (start_of_measure)
-    {
-      Moment mlen = Moment (measure_length ());
-      unsmob_grob (get_property ("currentCommandColumn"))
-	->set_property ("measure-length", mlen.smobbed_copy ()); 
-    }
-  
-  if (!is_string (which) && to_boolean (automatic_bars))
+  if (!scm_is_string (which) && to_boolean (automatic_bars))
     {
       SCM always = get_property ("barAlways");
 
-      if ( start_of_measure || (to_boolean (always)))
+      if ((start_of_measure && last_moment_.main_part_ >= Moment (0))
+	  || to_boolean (always))
 	{
 	  /* should this work, or be junked?  See input/bugs/no-bars.ly */
 	  which = get_property ("defaultBarType");
 	}
     }
 
-  daddy_context_->set_property ("whichBar", which);
+  context ()->set_property ("whichBar", which);
 }
 
 void
 Timing_engraver::stop_translation_timestep ()
 {
   Timing_translator::stop_translation_timestep ();
-  daddy_context_->set_property ("whichBar", SCM_EOL);
+  context ()->set_property ("whichBar", SCM_EOL);
   last_moment_ = now_mom ();
 }
-
-
-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}. "
-"\n\nThis engraver adds the alias @code{Timing} to its containing context."
-
-		   ,
-/* creats*/       "",
-/* accepts */     "",
-/* acks  */      "",
-/* reads */       "timeSignatureFraction automaticBars whichBar barAlways defaultBarType skipBars timing measureLength measurePosition currentBarNumber",
-/* write */       "");