Merge with master

[lilypond.git] / lily / timing-translator.cc

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index a5cf4adb3f6441d6efe2f9572a330595359de2d4..ee609a4db0cfeba7cfb27bbb2c0485fd317f0d11 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -4,7 +4,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "timing-translator.hh"
@@ -25,13 +25,12 @@ Timing_translator::stop_translation_timestep ()
       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);
+       }
     }
 }
 
@@ -40,6 +39,7 @@ 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));
 
   context ()->set_property ("timeSignatureFraction",
                            scm_cons (scm_from_int (4), scm_from_int (4)));
@@ -102,10 +102,8 @@ Timing_translator::start_translation_timestep ()
 
   measposp += dt;
 
-  SCM barn = get_property ("currentBarNumber");
-  int b = 0;
-  if (scm_is_number (barn))
-    b = scm_to_int (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);
@@ -114,10 +112,12 @@ Timing_translator::start_translation_timestep ()
   while (c && measposp.main_part_ >= len)
     {
       measposp.main_part_ -= len;
-      b++;
+      current_barnumber ++;
+      internal_barnumber ++;
     }
 
-  context ()->set_property ("currentBarNumber", scm_from_int (b));
+  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 ());
 }
 
@@ -132,4 +132,14 @@ ADD_TRANSLATOR (Timing_translator,
                "@code{Staff}. "
                "\n\nThis engraver adds the alias @code{Timing} to its containing context.",
 
-               "", "", "", "");
+               "",
+
+               "internalBarNumber "
+               "currentBarNumber "
+               "measureLength "
+               "measurePosition ",
+
+               "internalBarNumber "
+               "currentBarNumber "
+               "measurePosition "
+               );