* lily/mensural-ligature.cc (internal_brew_primitive): Bugfix:

[lilypond.git] / lily / time-scaled-music-iterator.cc

diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc
index d07c979e3b3c2628ed7f5001b5b1a1da90d93317..9ab2673eeb86a23a7694700e886f5b0a13242086 100644 (file)
--- a/lily/time-scaled-music-iterator.cc
+++ b/lily/time-scaled-music-iterator.cc
@@ -14,7 +14,7 @@
 #include "sequential-iterator.hh"
 
 /*
-  Iterates \times, by sending TupletEvents at the start/end of each
+  Iterates \times, by sending TupletSpanEvents at the start/end of each
   tuplet bracket. Extra stop/start events are sent at regular
   intervals if tupletSpannerDuration is set.
 */
@@ -32,10 +32,13 @@ protected:
   virtual void derived_mark () const;
   virtual Moment pending_moment () const;
 private:
+
   /* tupletSpannerDuration */
   Moment spanner_duration_;
+
   /* next time to add a stop/start pair */
   Moment next_split_mom_;
+  
   /* Recycle start/stop events if tupletSpannerDuration is set. */
   Music *start_;
   Music *stop_;
@@ -70,6 +73,7 @@ Time_scaled_music_iterator::process (Moment m)
     {
       report_event (stop_);
       report_event (start_);
+      
       next_split_mom_ += spanner_duration_;
       /* avoid sending events twice at the end */
       if (next_split_mom_ == get_music ()->get_length ().main_part_)
@@ -92,12 +96,14 @@ Time_scaled_music_iterator::construct_children ()
   Music *mus = get_music ();
   Input *origin = mus->origin ();
 
-  SCM tuplet_symbol = ly_symbol2scm ("TupletEvent");
+  SCM tuplet_symbol = ly_symbol2scm ("TupletSpanEvent");
   SCM start_scm = scm_call_2 (ly_lily_module_constant ("make-span-event"), tuplet_symbol, scm_from_int (START));
   start_ = unsmob_music (start_scm);
   start_->set_spot (*origin);
   start_->set_property ("numerator", mus->get_property ("numerator"));
   start_->set_property ("denominator", mus->get_property ("denominator"));
+  start_->set_property ("tweaks", mus->get_property ("tweaks"));
+  
 
   SCM stop_scm = scm_call_2 (ly_lily_module_constant ("make-span-event"), tuplet_symbol, scm_from_int (STOP));
   stop_ = unsmob_music (stop_scm);