X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=749aa18e47b3e80d5ea0aa16384f72e69130a76c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=cc96ec066d3a0fd640ce464bbe64d44d92fc79b9;hpb=08da6e274ea516076699e8e9bbdd48e5919cb526;p=lilypond.git

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index cc96ec066d..749aa18e47 100644
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -4,63 +4,53 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "warn.hh"
 #include "timing-translator.hh"
 
+#include "warn.hh"
 #include "translator-group.hh"
 #include "global-context.hh"
 #include "multi-measure-rest.hh"
 
-
 void
 Timing_translator::stop_translation_timestep ()
 {
   Global_context *global = get_global_context ();
 
-  /* allbars == ! skipbars */
-  SCM sb = get_property ("skipBars");
-  bool allbars = !to_boolean (sb);
-
-  // urg: multi bar rests: should always process whole of first bar?
-  SCM tim = get_property ("timing");
-  bool timb = to_boolean (tim);
-  if (timb && allbars)
+  if (to_boolean (get_property ("timing"))
+      && !to_boolean (get_property ("skipBars")))
     {
-      Moment barleft = (measure_length () - measure_position ());
+      Moment barleft = (measure_length () - measure_position (context ()));
       Moment now = now_mom ();
 
-      if (barleft > Moment (0)
-	  /*
-	    Hmm. We insert the bar moment every time we process a
-	    moment.  A waste of cpu?
-	   */
-	  && !now.grace_part_)
-	global->add_moment_to_process (now + barleft);
+      if (barleft > Moment (0))
+	{
+	  Moment nextmom = now + barleft;
+	  nextmom.grace_part_ = Rational (0);
+	  global->add_moment_to_process (nextmom);
+	}
     }
 }
 
 void
 Timing_translator::initialize ()
 {
+  context ()->add_alias (ly_symbol2scm ("Timing"));
+  context ()->set_property ("currentBarNumber", scm_from_int (1));
+  context ()->set_property ("internalBarNumber", scm_from_int (1));
 
-  /*
-    move this to engraver-init.ly? 
-   */
-  get_parent_context ()->add_alias (ly_symbol2scm ("Timing"));
-  get_parent_context ()->set_property ("timing" , SCM_BOOL_T);  
-  get_parent_context ()->set_property ("currentBarNumber" , scm_int2num (1));
-
-  get_parent_context ()->set_property ("timeSignatureFraction",
-				scm_cons (scm_int2num (4), scm_int2num (4)));
+  context ()->set_property ("timeSignatureFraction",
+			    scm_cons (scm_from_int (4), scm_from_int (4)));
   /*
     Do not init measurePosition; this should be done from global
     context.
-   */
-  get_parent_context ()->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ());
-  get_parent_context ()->set_property ("beatLength", Moment (Rational (1,4)).smobbed_copy ());
+  */
+  context ()->set_property ("measureLength",
+			    Moment (Rational (1)).smobbed_copy ());
+  context ()->set_property ("beatLength",
+			    Moment (Rational (1, 4)).smobbed_copy ());
 }
 
 Rational
@@ -75,43 +65,26 @@ Timing_translator::measure_length () const
 
 Timing_translator::Timing_translator ()
 {
-
-}
-
-Moment
-Timing_translator::measure_position () const
-{
-  SCM sm = get_property ("measurePosition");
-  
-  Moment m   =0;
-  if (unsmob_moment (sm))
-    {
-      m = *unsmob_moment (sm);
-      while (m.main_part_ < Rational (0))
-	m.main_part_ += measure_length ();
-    }
-  
-  return m;
 }
 
 void
 Timing_translator::start_translation_timestep ()
 {
-  Global_context *global =get_global_context ();
+  Global_context *global = get_global_context ();
 
   Moment now = global->now_mom ();
-  Moment dt = now  - global->previous_moment ();
+  Moment dt = now - global->previous_moment ();
   if (dt < Moment (0))
     {
-      programming_error ("Moving backwards in time");
+      programming_error ("moving backwards in time");
       dt = 0;
     }
   else if (dt.main_part_.is_infinity ())
     {
-      programming_error ("Moving infinitely to future");
+      programming_error ("moving infinitely to future");
       dt = 0;
     }
-  
+
   if (!dt.to_bool ())
     return;
 
@@ -119,42 +92,56 @@ Timing_translator::start_translation_timestep ()
 
   SCM s = get_property ("measurePosition");
   if (unsmob_moment (s))
-    {
-      measposp = *unsmob_moment (s);
-    }
+    measposp = *unsmob_moment (s);
   else
     {
       measposp = now;
-      get_parent_context ()->set_property ("measurePosition",
-				    measposp.smobbed_copy ());
+      context ()->set_property ("measurePosition",
+				measposp.smobbed_copy ());
     }
-  
+
   measposp += dt;
-  
-  SCM barn = get_property ("currentBarNumber");
-  int b = 0;
-  if (ly_c_number_p (barn))
-    {
-      b = ly_scm2int (barn);
-    }
+
+  int current_barnumber = robust_scm2int (get_property ("currentBarNumber"), 0);
+  int internal_barnumber = robust_scm2int (get_property ("internalBarNumber"), 0);
 
   SCM cad = get_property ("timing");
-  bool c= to_boolean (cad);
+  bool c = to_boolean (cad);
 
   Rational len = measure_length ();
   while (c && measposp.main_part_ >= len)
     {
       measposp.main_part_ -= len;
-      b ++;
+      current_barnumber ++;
+      internal_barnumber ++;
     }
 
-  get_parent_context ()->set_property ("currentBarNumber", scm_int2num (b));
-  get_parent_context ()->set_property ("measurePosition", measposp.smobbed_copy ());
+  context ()->set_property ("currentBarNumber", scm_from_int (current_barnumber));
+  context ()->set_property ("internalBarNumber", scm_from_int (internal_barnumber));
+  context ()->set_property ("measurePosition", measposp.smobbed_copy ());
 }
 
-ENTER_DESCRIPTION (Timing_translator,
-		   "This engraver adds the alias "
-		   "@code{Timing} to its containing context."
-		   ,
-
-		   "","","","","");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Timing_translator,
+		/* doc */
+		"This engraver adds the alias @code{Timing} to its containing"
+		" context.  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}.",
+
+		/* create */
+		"",
+
+		/* read */
+		"internalBarNumber "
+		"currentBarNumber "
+		"measureLength "
+		"measurePosition ",
+
+		/* write */
+		"internalBarNumber "
+		"currentBarNumber "
+		"measurePosition "
+		);