release: 1.1.43

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

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index 0d29fa5ce14e1085a5f8a2d11f89cba54f9c68c2..800fab932bc1fd355a6c22345f9e7b631edf3a7f 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -68,8 +68,10 @@ Timing_translator::do_process_requests()
          else
            {
              time_.set_time_signature (b_i, o_i);
+
              default_grouping_ =
-               Rhythmic_grouping (MInterval (0,Moment (b_i, o_i)), b_i);
+               Rhythmic_grouping (MInterval (0,Moment (b_i, o_i)),
+                                  b_i == 1 ? 2 : b_i);
            }
        }
       else if (Partial_measure_req *pm = dynamic_cast <Partial_measure_req *> (tr_l))
@@ -106,6 +108,17 @@ Timing_translator::do_process_requests()
 
        }
     }
+
+  Translator_group * tr=0;
+
+  Scalar barn = get_property ("currentBarNumber", &tr);
+  if (!barn.empty_b () && barn.isnum_b ())
+    {
+      time_.bars_i_ = int(barn);
+      tr->set_property ("currentBarNumber", "");
+    }
+  
+
 }
 
 
@@ -118,7 +131,7 @@ Timing_translator::do_pre_move_processing()
 
 
   /* allbars == ! skipbars */
-  bool allbars = ! get_property ("SkipBars", 0).to_bool ();
+  bool allbars = ! get_property ("skipBars", 0).to_bool ();
 
   // urg: multi bar rests: should always must process whole of first bar?
   if (!time_.cadenza_b_ && allbars)
@@ -138,6 +151,8 @@ void
 Timing_translator::do_post_move_processing()
 {
   time_.add (now_mom ()  - time_.when_);
+
+
 }
 
 void