* input/regression/tie-chord.ly (testLong): add a chord in 4ths

[lilypond.git] / lily / tuplet-engraver.cc

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 12b5db31d8a468df8744f9658211391823669e74..49bfc8bc3a204322c70fad8b73ae10a784450d2d 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -19,12 +19,17 @@ struct Tuplet_description
   Music *music_;
   Rational stop_;
   Rational span_stop_;
+  Rational length_;
   Spanner *spanner_;
   Tuplet_description ()
   {
     music_ = 0;
     spanner_ = 0;
   }
+  static int compare (Tuplet_description const &a, Tuplet_description const &b)
+  {
+    return ::compare (a.length_, b.length_);
+  }
 };
 
 class Tuplet_engraver : public Engraver
@@ -34,11 +39,12 @@ public:
 
 protected:
   Array<Tuplet_description> tuplets_;
-
-  DECLARE_ACKNOWLEDGER(note_column);
+  Link_array<Spanner> last_tuplets_;
+  DECLARE_ACKNOWLEDGER (note_column);
   virtual bool try_music (Music *r);
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
+  virtual void finalize ();
+  void start_translation_timestep ();
+  void process_music ();
 };
 
 bool
@@ -51,7 +57,8 @@ Tuplet_engraver::try_music (Music *music)
        {
          Tuplet_description d;
          d.music_ = music;
-         d.stop_ = now_mom ().main_part_ + music->get_length ().main_part_;
+         d.length_ = music->get_length ().main_part_;
+         d.stop_ = now_mom ().main_part_ + d.length_;
          d.span_stop_ = d.stop_;
 
          SCM s = get_property ("tupletSpannerDuration");
@@ -68,6 +75,10 @@ Tuplet_engraver::try_music (Music *music)
 void
 Tuplet_engraver::process_music ()
 {
+  if (!tuplets_.size ())
+    return;
+
+  tuplets_.sort (&Tuplet_description::compare);
   for (int i = 0; i < tuplets_.size (); i++)
     {
       if (tuplets_[i].spanner_)
@@ -77,6 +88,11 @@ Tuplet_engraver::process_music ()
                                       tuplets_[i].music_->self_scm ());
       tuplets_[i].spanner_ = spanner;
 
+      if (i > 0 && tuplets_[i - 1].spanner_)
+       Tuplet_bracket::add_tuplet_bracket (tuplets_[i].spanner_, tuplets_[i - 1].spanner_);
+      if (i < tuplets_.size () - 1 && tuplets_[i + 1].spanner_)
+       Tuplet_bracket::add_tuplet_bracket (tuplets_[i + 1].spanner_, tuplets_[i].spanner_);
+
       SCM proc = get_property ("tupletNumberFormatFunction");
       if (ly_is_procedure (proc))
        {
@@ -100,19 +116,32 @@ Tuplet_engraver::start_translation_timestep ()
 {
   Moment now = now_mom ();
 
+  last_tuplets_.clear ();
+  if (tuplets_.is_empty ())
+    return;
+
+  Moment tsdmom = robust_scm2moment (get_property ("tupletSpannerDuration"), Moment (0));
+  bool full_length = to_boolean (get_property ("tupletFullLength"));
+
   for (int i = tuplets_.size (); i--;)
     {
-      Moment tsdmom = robust_scm2moment (get_property ("tupletSpannerDuration"), Moment (0));
-
       Rational tsd = tsdmom.main_part_;
 
       if (now.main_part_ >= tuplets_[i].span_stop_)
        {
-         if (Spanner *sp = tuplets_[i].spanner_)
+         if (tuplets_[i].spanner_)
            {
-             if (!sp->get_bound (RIGHT))
-               sp->set_bound (RIGHT, sp->get_bound (LEFT));
+             if (full_length)
+               {
+                 Item *col = unsmob_item (get_property ("currentMusicalColumn"));
 
+                 tuplets_[i].spanner_->set_bound (RIGHT, col);
+               }
+             else if (!tuplets_[i].spanner_->get_bound (RIGHT))
+               tuplets_[i].spanner_->set_bound (RIGHT,
+                                                tuplets_[i].spanner_->get_bound (LEFT));
+
+             last_tuplets_.push (tuplets_[i].spanner_);
              tuplets_[i].spanner_ = 0;
            }
 
@@ -121,8 +150,19 @@ Tuplet_engraver::start_translation_timestep ()
        }
 
       if (now.main_part_ >= tuplets_[i].stop_)
+       tuplets_.del (i);
+    }
+}
+
+void
+Tuplet_engraver::finalize ()
+{
+  if (to_boolean (get_property ("tupletFullLength")))
+    {
+      for (int i = 0; i < last_tuplets_.size (); i++)
        {
-         tuplets_.del (i);
+         Item *col = unsmob_item (get_property ("currentCommandColumn"));
+         last_tuplets_[i]->set_bound (RIGHT, col);
        }
     }
 }
@@ -130,10 +170,11 @@ Tuplet_engraver::start_translation_timestep ()
 Tuplet_engraver::Tuplet_engraver ()
 {
 }
-ADD_ACKNOWLEDGER(Tuplet_engraver,note_column);
+
+ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
 ADD_TRANSLATOR (Tuplet_engraver,
-               /* descr */ "Catch Time_scaled_music and generate appropriate bracket  ",
-               /* creats*/ "TupletBracket",
-               /* accepts */ "time-scaled-music",
-               /* reads */ "tupletNumberFormatFunction tupletSpannerDuration",
+               /* doc */ "Catch Time_scaled_music and generate appropriate bracket  ",
+               /* create */ "TupletBracket",
+               /* accept */ "time-scaled-music",
+               /* read */ "tupletNumberFormatFunction tupletSpannerDuration tupletFullLength",
                /* write */ "");