release: 0.0.41

[lilypond.git] / lily / staff-column.cc

diff --git a/lily/staff-column.cc b/lily/staff-column.cc
index 0dd969ab0a222f0e339b494a2d474e62a229bbcc..baca3a0a98f3cfb8e99cbbbda0e9573d610cf83d 100644 (file)
--- a/lily/staff-column.cc
+++ b/lily/staff-column.cc
@@ -12,13 +12,14 @@
 #include "time-description.hh"
 #include "score-column.hh"
 #include "staff-column.hh"
-#include "commandrequest.hh"
-#include "musicalrequest.hh"
+#include "command-request.hh"
+#include "musical-request.hh"
 #include "interval.hh"
-#include "pscore.hh"
+#include "p-score.hh"
 #include "item.hh"
-#include "pcol.hh"
+#include "p-col.hh"
 #include "voice-element.hh"
+#include "pqueue.hh"
 
 void
 Staff_column::OK() const
@@ -37,7 +38,8 @@ Staff_column::when() const
 }
 
 void
-Staff_column::add(Voice_element*ve)
+Staff_column::add(Voice_element*ve,
+                 PQueue<Subtle_req *, Moment> &subtle_req_pq )
 {
     for (iter_top(ve->reqs,j); j.ok(); j++) {
        if (j->command()) {
@@ -54,8 +56,17 @@ Staff_column::add(Voice_element*ve)
            if (j->rhythmic()) {
                musical_column_l_->add_duration(j->rhythmic()->duration());
            }
-           if (!j->musical()->skip())
-               setup_one_request(j);
+           if (j->musical()) {
+               Musical_req*m = j->musical();
+               if(m->skip())
+                   continue;
+               Subtle_req * s = m->subtle() ;
+               if (s&& s->subtime_) {
+                   subtle_req_pq.enter(s, s->subtime_ + when());
+                   continue ; 
+               }
+           }
+           setup_one_request(j);
        }
     }
 }