release: 1.3.5

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

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index 29ee1d6d8c508f29f03e69e1f2c4e30a432a0e76..ac2373da6a0c39d8a0d23cb41bae1185e15d022b 100644 (file)
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -12,11 +12,6 @@
 #include "score-element-info.hh"
 #include "multi-measure-rest.hh"
 
-void
-Timing_engraver::fill_staff_info (Staff_info &inf)
-{
-  inf.time_C_ = &time_;
-}
 
 
 ADD_THIS_TRANSLATOR(Timing_engraver);
@@ -57,7 +52,8 @@ Timing_engraver::which_bar ()
       if (!gh_boolean_p (nonauto) && gh_scm2bool (nonauto))
        {
          SCM always = get_property ("barAlways", 0);
-         if (!time_.whole_in_measure_ || gh_boolean_p (always) && gh_scm2bool (always))
+         if (!measure_position ()
+             || (gh_boolean_p (always) && gh_scm2bool (always)))
            {
              SCM def=get_property ("defaultBarType" ,0);
              return (gh_string_p (def))? ly_scm2string (def) : "";