* The grand 2005-2006 replace.

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

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 12b5db31d8a468df8744f9658211391823669e74..1bdda38c69a21c7a7a08a2ab21953f2cca0735f3 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "tuplet-bracket.hh"
@@ -19,11 +19,18 @@ struct Tuplet_description
   Music *music_;
   Rational stop_;
   Rational span_stop_;
-  Spanner *spanner_;
+  Rational length_;
+  Spanner *bracket_;
+  Spanner *number_;
   Tuplet_description ()
   {
     music_ = 0;
-    spanner_ = 0;
+    bracket_ = 0;
+    number_ = 0;
+  }
+  static int compare (Tuplet_description const &a, Tuplet_description const &b)
+  {
+    return ::compare (a.length_, b.length_);
   }
 };
 
@@ -34,11 +41,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 +59,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,31 +77,47 @@ 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_)
+      if (tuplets_[i].bracket_)
        continue;
 
-      Spanner *spanner = make_spanner ("TupletBracket",
-                                      tuplets_[i].music_->self_scm ());
-      tuplets_[i].spanner_ = spanner;
+      tuplets_[i].bracket_ = make_spanner ("TupletBracket",
+                                          tuplets_[i].music_->self_scm ());
+      tuplets_[i].number_ = make_spanner ("TupletNumber",
+                                         tuplets_[i].music_->self_scm ());
+      tuplets_[i].number_->set_object ("bracket", tuplets_[i].bracket_->self_scm ());
+      tuplets_[i].bracket_->set_object ("tuplet-number", tuplets_[i].number_->self_scm ());
+      
+      if (i > 0 && tuplets_[i - 1].bracket_)
+       Tuplet_bracket::add_tuplet_bracket (tuplets_[i].bracket_, tuplets_[i - 1].bracket_);
+
+      if (i < tuplets_.size () - 1 && tuplets_[i + 1].bracket_)
+       Tuplet_bracket::add_tuplet_bracket (tuplets_[i + 1].bracket_, tuplets_[i].bracket_);
 
       SCM proc = get_property ("tupletNumberFormatFunction");
       if (ly_is_procedure (proc))
        {
          SCM t = scm_apply_0 (proc, scm_list_1 (tuplets_[i].music_->self_scm ()));
-         spanner->set_property ("text", t);
+         tuplets_[i].number_->set_property ("text", t);
        }
     }
 }
 
 void
-Tuplet_engraver::acknowledge_note_column (Grob_info i)
+Tuplet_engraver::acknowledge_note_column (Grob_info inf)
 {
   for (int j = 0; j < tuplets_.size (); j++)
-    if (tuplets_[j].spanner_)
-      Tuplet_bracket::add_column (tuplets_[j].spanner_,
-                                 dynamic_cast<Item *> (i.grob ()));
+    if (tuplets_[j].bracket_)
+      {
+       Item *i = dynamic_cast<Item *> (inf.grob ());
+       Tuplet_bracket::add_column (tuplets_[j].bracket_, i);
+       add_bound_item (tuplets_[j].number_, i);
+      }
 }
 
 void
@@ -100,20 +125,40 @@ 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].bracket_)
            {
-             if (!sp->get_bound (RIGHT))
-               sp->set_bound (RIGHT, sp->get_bound (LEFT));
-
-             tuplets_[i].spanner_ = 0;
+             if (full_length)
+               {
+                 Item *col = unsmob_item (get_property ("currentMusicalColumn"));
+
+                 tuplets_[i].bracket_->set_bound (RIGHT, col);
+                 tuplets_[i].number_->set_bound (RIGHT, col);
+               }
+             else if (!tuplets_[i].bracket_->get_bound (RIGHT))
+               {
+                 tuplets_[i].bracket_->set_bound (RIGHT,
+                                                  tuplets_[i].bracket_->get_bound (LEFT));
+                 tuplets_[i].number_->set_bound (RIGHT,
+                                                 tuplets_[i].bracket_->get_bound (LEFT));
+               }
+             last_tuplets_.push (tuplets_[i].bracket_);
+             last_tuplets_.push (tuplets_[i].number_);
+             
+             tuplets_[i].bracket_ = 0;
+             tuplets_[i].number_ = 0;
            }
 
          if (tsd)
@@ -121,8 +166,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 +186,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 TupletNumber",
+               /* accept */ "time-scaled-music",
+               /* read */ "tupletNumberFormatFunction tupletSpannerDuration tupletFullLength",
                /* write */ "");