''

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

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index d3aa30bb961843a94001656155f535130fb1b7b7..9a381cede41a4ba24e50fd4183b3d144179ef014 100644 (file)
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -11,6 +11,7 @@
 #include "multi-measure-rest.hh"
 #include "timing-translator.hh"
 #include "engraver.hh"
+#include "grob.hh"
 
 /**
   Do time bookkeeping
@@ -54,14 +55,21 @@ Timing_engraver::start_translation_timestep ()
     which
       = (now.main_part_ || now.main_part_ == last_moment_.main_part_)
       ? SCM_EOL : ly_str02scm ("|");
+
+  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_grob_property ("measure-length", mlen.smobbed_copy()); 
+    }
   
   if (!gh_string_p (which) && !to_boolean (nonauto))
     {
       SCM always = get_property ("barAlways");
-      Moment mp = measure_position ();
-      if ( (last_moment_.main_part_ != now.main_part_
-           && !mp.main_part_)
-          || (to_boolean (always)))
+
+      if ( start_of_measure || (to_boolean (always)))
        {
          /* should this work, or be junked?  See input/bugs/no-bars.ly */
          which = get_property ("defaultBarType");
@@ -77,6 +85,7 @@ Timing_engraver::stop_translation_timestep ()
   Timing_translator::stop_translation_timestep ();
   daddy_trans_l_->set_property ("whichBar", SCM_EOL);
   last_moment_ = now_mom ();
+      
 }