lilypond-0.0.58

diff --git a/lily/staff-walker.cc b/lily/staff-walker.cc
index 8dbc6f4a1a85edad69f3557863b87944bc6b27f6..97080b894904835d67e6826b4676ddd1c1b062d2 100644 (file)
--- a/lily/staff-walker.cc
+++ b/lily/staff-walker.cc
@@ -52,6 +52,7 @@ Staff_walker::when() const
 void
 Staff_walker::process_timing_reqs()
 {
+    // first all meter changes
     for (int i=0; i < ptr()->timing_req_l_arr_.size(); i++) {
        Timing_req * tr_l = ptr()->timing_req_l_arr_[i];
        if (tr_l->meterchange()) {
@@ -68,6 +69,7 @@ Staff_walker::process_timing_reqs()
        } 
     }
     
+    // then do the rest
     for (int i=0; i < ptr()->timing_req_l_arr_.size(); i++) {
        Timing_req * tr_l = ptr()->timing_req_l_arr_[i];
        if (tr_l->partial()) {

diff --git a/lily/time-description.cc b/lily/time-description.cc
index 44d9b3d5e930a2a2e9e26b23b5c271cb056b8a6f..e6945ba482b2942b97b420e82c951d6faa56b917 100644 (file)
--- a/lily/time-description.cc
+++ b/lily/time-description.cc
@@ -82,9 +82,8 @@ Time_description::set_meter(int l, int o)
     assert(o);
     one_beat_ = Rational(1)/Moment(o);
     whole_per_measure_ = Moment(l) * one_beat_;
-    if(whole_in_measure_)
-       error_t("Meterchange should be at start of measure", *this);
 }
+
 bool
 Time_description::allow_meter_change_b()
 {
@@ -99,8 +98,6 @@ Time_description::allow_meter_change_b()
 String
 Time_description::try_set_partial_str(Moment p)const
 {
-      if (when_)
-       return ("Partial measure only allowed at beginning.");
     if (p<Rational(0))
        return ("Partial must be non-negative");
     if (p > whole_per_measure_)