Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index ef54824044733febcb283094919e03dd9106080c..92b062f11687f370df88497e1d95d62054248a26 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -17,9 +17,6 @@
 struct Tuplet_description
 {
   Music *music_;
-  Rational stop_;
-  Rational span_stop_;
-  Rational length_;
   Spanner *bracket_;
   Spanner *number_;
   Tuplet_description ()
@@ -28,10 +25,6 @@ struct Tuplet_description
     bracket_ = 0;
     number_ = 0;
   }
-  static int compare (Tuplet_description const &a, Tuplet_description const &b)
-  {
-    return ::compare (a.length_, b.length_);
-  }
 };
 
 class Tuplet_engraver : public Engraver
@@ -40,8 +33,9 @@ public:
   TRANSLATOR_DECLARATIONS (Tuplet_engraver);
 
 protected:
-  std::vector<Tuplet_description> tuplets_;
-  Link_array<Spanner> last_tuplets_;
+  vector<Tuplet_description> tuplets_;
+  vector<Tuplet_description> stopped_tuplets_;
+  vector<Spanner*> last_tuplets_;
   DECLARE_ACKNOWLEDGER (note_column);
   virtual bool try_music (Music *r);
   virtual void finalize ();
@@ -52,23 +46,20 @@ protected:
 bool
 Tuplet_engraver::try_music (Music *music)
 {
-  if (music->is_mus_type ("time-scaled-music"))
+  if (music->is_mus_type ("tuplet-spanner-event"))
     {
-      Music *el = unsmob_music (music->get_property ("element"));
-      if (el && !el->is_mus_type ("event-chord"))
+      Direction dir = to_dir (music->get_property ("span-direction"));
+      if (dir == START)
        {
          Tuplet_description d;
          d.music_ = music;
-         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");
-         if (unsmob_moment (s))
-           d.span_stop_ = min (d.span_stop_, (now_mom () + *unsmob_moment (s)).main_part_);
-
          tuplets_.push_back (d);
        }
+      if (dir == STOP)
+       {
+         stopped_tuplets_.push_back (tuplets_.back ());
+         tuplets_.pop_back ();
+       }
       return true;
     }
   return false;
@@ -77,12 +68,38 @@ Tuplet_engraver::try_music (Music *music)
 void
 Tuplet_engraver::process_music ()
 {
-  if (!tuplets_.size ())
-    return;
+  for (vsize i = 0; i < stopped_tuplets_.size (); i++)
+    {
+      bool full_length = to_boolean (get_property ("tupletFullLength"));
+      if (stopped_tuplets_[i].bracket_)
+       {
+         if (full_length)
+           {
+             Item *col = unsmob_item (get_property ("currentMusicalColumn"));
+             
+             stopped_tuplets_[i].bracket_->set_bound (RIGHT, col);
+             stopped_tuplets_[i].number_->set_bound (RIGHT, col);
+           }
+         else if (!stopped_tuplets_[i].bracket_->get_bound (RIGHT))
+           {
+             stopped_tuplets_[i].bracket_->set_bound (RIGHT,
+                                                      stopped_tuplets_[i].bracket_->get_bound (LEFT));
+             stopped_tuplets_[i].number_->set_bound (RIGHT,
+                                                     stopped_tuplets_[i].bracket_->get_bound (LEFT));
+           }
+         // todo: scrap last_tuplets_, use stopped_tuplets_ only.
+         // clear stopped_tuplets_ at start_translation_timestep
+         last_tuplets_.push_back (tuplets_[i].bracket_);
+         last_tuplets_.push_back (tuplets_[i].number_);
+       }
+    }
+  stopped_tuplets_.clear ();
 
-  vector_sort (tuplets_, Tuplet_description::compare);
-  for (vsize i = 0; i < tuplets_.size (); i++)
+  for (vsize j = tuplets_.size (); j > 0; j--)
     {
+      /* i goes from size-1 downto 0, inclusively */
+      vsize i = j - 1;
+
       if (tuplets_[i].bracket_)
        continue;
 
@@ -93,11 +110,12 @@ Tuplet_engraver::process_music ()
       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 < tuplets_.size () - 1 && tuplets_[i + 1].bracket_)
+       Tuplet_bracket::add_tuplet_bracket (tuplets_[i].bracket_, tuplets_[i + 1].bracket_);
+      
       if (i > 0 && tuplets_[i - 1].bracket_)
-       Tuplet_bracket::add_tuplet_bracket (tuplets_[i].bracket_, tuplets_[i - 1].bracket_);
+       Tuplet_bracket::add_tuplet_bracket (tuplets_[i - 1].bracket_, tuplets_[i].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))
@@ -123,51 +141,7 @@ Tuplet_engraver::acknowledge_note_column (Grob_info inf)
 void
 Tuplet_engraver::start_translation_timestep ()
 {
-  Moment now = now_mom ();
-
   last_tuplets_.clear ();
-  if (tuplets_.empty ())
-    return;
-
-  Moment tsdmom = robust_scm2moment (get_property ("tupletSpannerDuration"), Moment (0));
-  bool full_length = to_boolean (get_property ("tupletFullLength"));
-
-  for (vsize i = tuplets_.size (); i--;)
-    {
-      Rational tsd = tsdmom.main_part_;
-
-      if (now.main_part_ >= tuplets_[i].span_stop_)
-       {
-         if (tuplets_[i].bracket_)
-           {
-             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_back (tuplets_[i].bracket_);
-             last_tuplets_.push_back (tuplets_[i].number_);
-             
-             tuplets_[i].bracket_ = 0;
-             tuplets_[i].number_ = 0;
-           }
-
-         if (tsd)
-           tuplets_[i].span_stop_ += tsd;
-       }
-
-      if (now.main_part_ >= tuplets_[i].stop_)
-       tuplets_.erase (tuplets_.begin () + i);
-    }
 }
 
 void
@@ -189,8 +163,8 @@ Tuplet_engraver::Tuplet_engraver ()
 
 ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
 ADD_TRANSLATOR (Tuplet_engraver,
-               /* doc */ "Catch Time_scaled_music and generate appropriate bracket  ",
-               /* create */ "TupletBracket TupletNumber",
-               /* accept */ "time-scaled-music",
-               /* read */ "tupletNumberFormatFunction tupletSpannerDuration tupletFullLength",
+               /* doc */ "Catch TupletSpannerEvent and generate appropriate bracket  ",
+               /* create */ "TupletBracket TupletNumber ",
+               /* accept */ "tuplet-spanner-event",
+               /* read */ "tupletNumberFormatFunction tupletSpannerDuration tupletFullLength ",
                /* write */ "");