lilypond-0.0.64

diff --git a/lily/include/time-description.hh b/lily/include/time-description.hh
index 1bfd5820e6c2dffb6cad2fc1d54567a48b3f5871..c4edb172bf02764670c537ea253f665811141bd6 100644 (file)
--- a/lily/include/time-description.hh
+++ b/lily/include/time-description.hh
@@ -8,11 +8,16 @@
 #define tdes_HH
 
 #include "moment.hh"
+#include "lily-proto.hh"
+#include "varray.hh"
 
 /// full info on where we are
 struct Time_description {
     Moment when_;
 
+    /// found an error so far?
+    bool error_b_ ;
+
     /// if true, no bars needed, no reduction of whole_in_measure
     bool cadenza_b_;
     
@@ -38,7 +43,8 @@ struct Time_description {
     void print() const;
     void setpartial(Moment p);
     String try_set_partial_str(Moment)const;
-    Moment barleft();
+    Moment barleft()const;
+    Moment next_bar_moment()const;
     void set_meter(int,int);
     static int compare (const Time_description&, const Time_description&);
 };
@@ -48,5 +54,10 @@ struct Time_description {
 
 instantiate_compare(Time_description&,Time_description::compare);
 
+
+void
+process_timing_reqs(Time_description &time_, 
+                   Rhythmic_grouping *default_grouping,
+                   Array<Timing_req*> const& timing_req_l_arr);
 #endif // Time_description_HH
 

diff --git a/lily/request-column.cc b/lily/request-column.cc
index 9b896cf8f3f0e74bc72916a753815fe2a0875412..2913dae13b8166cbde2f2c9f7f87fb32053d2625 100644 (file)
--- a/lily/request-column.cc
+++ b/lily/request-column.cc
@@ -56,3 +56,8 @@ Request_column::used_b() const
        b |= command_column_l_->used_b();
     return b;
 }
+void
+Request_column::update_time(int idx, Time_description&t)
+{
+    staff_col_l_arr_[idx]->update_time(t, 0);
+}

diff --git a/lily/time-description.cc b/lily/time-description.cc
index e6945ba482b2942b97b420e82c951d6faa56b917..c56a0375d06fcf17ad202aac530f27bd4fe2406a 100644 (file)
--- a/lily/time-description.cc
+++ b/lily/time-description.cc
@@ -55,6 +55,7 @@ Time_description::set_cadenza(bool b)
 
 Time_description::Time_description()
 {
+    error_b_ =  false;
     whole_per_measure_ = 1;
     whole_in_measure_ =0;
     one_beat_ = Moment(1,4);
@@ -112,7 +113,7 @@ Time_description::setpartial(Moment p)
 }
 
 Moment
-Time_description::barleft()
+Time_description::barleft()const
 {
     assert(!cadenza_b_);
     return whole_per_measure_-whole_in_measure_;
@@ -132,3 +133,10 @@ Time_description::compare(Time_description const &t1,  Time_description const&t2
 
     return i;
 }
+
+Moment
+Time_description::next_bar_moment() const
+{
+    return when_ + barleft();
+}
+