X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-engraver.cc;h=441fdd7610783a45c8644aa662bf96fca5cb72aa;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=70378670ebc28cf85e08c359e2dfdf5053e0b377;hpb=a9633fe74f99535d9268886d4e57e6742af182dd;p=lilypond.git

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 70378670eb..441fdd7610 100644
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -1,21 +1,41 @@
-/*   
-  plet-engraver.cc --  implement Tuplet_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  tuplet-engraver.cc -- implement Tuplet_engraver
 
+  source file of the GNU LilyPond music typesetter
 
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-#include "tuplet-bracket.hh"
-#include "note-column.hh"
-#include "time-scaled-music.hh"
 #include "beam.hh"
-#include "music-list.hh"
 #include "engraver.hh"
+#include "international.hh"
+#include "note-column.hh"
 #include "spanner.hh"
+#include "stream-event.hh"
+#include "tuplet-bracket.hh"
+#include "warn.hh"
+#include "item.hh"
+
+#include "translator.icc"
+
+struct Tuplet_description
+{
+  Stream_event *event_;
+  Spanner *bracket_;
+  Spanner *number_;
+
+  bool full_length_;
+  bool full_length_note_;
+  
+  Tuplet_description ()
+  {
+    event_ = 0;
+    full_length_note_ = false;
+    full_length_ = false;
+    bracket_ = 0;
+    number_ = 0;
+  }
+};
 
 class Tuplet_engraver : public Engraver
 {
@@ -23,125 +43,141 @@ public:
   TRANSLATOR_DECLARATIONS (Tuplet_engraver);
 
 protected:
-  Link_array<Music> time_scaled_musics_;
-  /// when does the scaled music stop? Array order is synced with time_scaled_musics_
-  Array<Rational> stop_moments_;
-  /// when does the current spanner stop? Array order is synced with time_scaled_musics_
-  Array<Rational> span_stop_moments_;
+  vector<Tuplet_description> tuplets_;
+  vector<Tuplet_description> new_tuplets_;
+  vector<Tuplet_description> stopped_tuplets_;
+  vector<Spanner*> last_tuplets_;
   
-  /// The spanners. Array order is synced with time_scaled_musics_
-  Link_array<Spanner> started_spanners_;
-
-  virtual void acknowledge_grob (Grob_info);
-  virtual bool try_music (Music*r);
-  virtual void start_translation_timestep ();
-  virtual void process_acknowledged_grobs ();
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_TRANSLATOR_LISTENER (tuplet_span);
+  virtual void finalize ();
+  void start_translation_timestep ();
+  void process_music ();
 };
 
-bool
-Tuplet_engraver::try_music (Music *c)
+IMPLEMENT_TRANSLATOR_LISTENER (Tuplet_engraver, tuplet_span);
+void
+Tuplet_engraver::listen_tuplet_span (Stream_event *ev)
 {
-  if (c->is_mus_type ("time-scaled-music"))
+  Direction dir = to_dir (ev->get_property ("span-direction"));
+  if (dir == START)
     {
-      Music *el = unsmob_music (c->get_property ("element"));
-      if (el && !el->is_mus_type ("event-chord"))
-	{
-	  time_scaled_musics_.push (c);
-	  Rational m = now_mom ().main_part_ + c->get_length ().main_part_;
-	  stop_moments_.push (m);
-
-	  SCM s = get_property ("tupletSpannerDuration");
-	  if (unsmob_moment (s))
-	    m = m <? (now_mom () + *unsmob_moment (s)).main_part_;
-	  
-	  span_stop_moments_.push (m);
-	}
-      return true;
+      Tuplet_description d;
+      d.event_ = ev;
+      new_tuplets_.push_back (d);
+    }
+  else if (dir == STOP && tuplets_.size ())
+    {
+      stopped_tuplets_.push_back (tuplets_.back ());
+      tuplets_.pop_back ();
     }
-  return false;
+  else 
+    programming_error (_ ("invalid direction of tuplet-span-event"));
 }
 
 void
-Tuplet_engraver::process_acknowledged_grobs ()
+Tuplet_engraver::process_music ()
 {
-  for (int i= 0; i < time_scaled_musics_.size (); i++)
+  for (vsize i = 0; i < stopped_tuplets_.size (); i++)
     {
-      if (i < started_spanners_.size () && started_spanners_[i])
-	continue;
+      if (stopped_tuplets_[i].bracket_)
+	{
+	  if (stopped_tuplets_[i].full_length_)
+	    {
+	      Item *col =
+		unsmob_item (stopped_tuplets_[i].full_length_note_
+			     ? get_property ("currentMusicalColumn")
+			     : get_property ("currentCommandColumn"));
+	      
+	      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 ();
 
-      Spanner* glep = make_spanner ("TupletBracket", time_scaled_musics_ [i]->self_scm ());
+  concat (tuplets_, new_tuplets_);
+  new_tuplets_.clear ();
+  for (vsize j = tuplets_.size (); j > 0; j--)
+    {
+      /* i goes from size-1 downto 0, inclusively */
+      vsize i = j - 1;
 
-      if (i >= started_spanners_.size ())
-	started_spanners_.push (glep);
-      else
-	started_spanners_[i] = glep;
-      
+            
+      if (tuplets_[i].bracket_)
+	continue;
 
-      SCM proc = get_property ("tupletNumberFormatFunction");
-      if (ly_c_procedure_p (proc))
-	{
-	  SCM t = scm_apply_0 (proc, scm_list_n (time_scaled_musics_[i]->self_scm (), SCM_UNDEFINED));
-	  glep->set_property ("text", t);
-	}
+      tuplets_[i].full_length_ = to_boolean (get_property ("tupletFullLength"));
+      tuplets_[i].full_length_note_
+	= to_boolean (get_property ("tupletFullLengthNote"));
+      
+      tuplets_[i].bracket_ = make_spanner ("TupletBracket",
+					   tuplets_[i].event_->self_scm ());
+      tuplets_[i].number_ = make_spanner ("TupletNumber",
+					  tuplets_[i].event_->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 < 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 - 1].bracket_, tuplets_[i].bracket_);
+
     }
 }
 
 void
-Tuplet_engraver::acknowledge_grob (Grob_info i)
+Tuplet_engraver::acknowledge_note_column (Grob_info inf)
 {
-  if (Note_column::has_interface (i.grob_))
-    {
-      for (int j =0; j < started_spanners_.size (); j++)
-	if (started_spanners_[j]) 
-	  Tuplet_bracket::add_column (started_spanners_[j], dynamic_cast<Item*> (i.grob_));
-    }
+  for (vsize j = 0; j < tuplets_.size (); j++)
+    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
 Tuplet_engraver::start_translation_timestep ()
 {
-  Moment now = now_mom ();
-
-  Moment tsd;
-  SCM s = get_property ("tupletSpannerDuration");
-  if (unsmob_moment (s))
-    tsd = unsmob_moment (s)->main_part_;
-
-  for (int i= started_spanners_.size (); i--;)
-    {
-      if (now.main_part_ >= span_stop_moments_[i])
-	{
-	  if (Spanner *sp = started_spanners_[i])
-	    {
-	      if (!sp->get_bound (RIGHT))
-		sp->set_bound (RIGHT, sp->get_bound (LEFT));
-	      
-	      started_spanners_[i] =0;
-	    }
-	  
-	  if (tsd.to_bool ())
-	    span_stop_moments_[i] += tsd.main_part_;
-	}
+  last_tuplets_.clear ();
+}
 
-      if (now.main_part_ >= stop_moments_[i])
-	{
-	  started_spanners_.del (i);
-	  stop_moments_.del (i);
-	  span_stop_moments_.del (i);
-	  time_scaled_musics_.del (i);
-	}
-    }
+void
+Tuplet_engraver::finalize ()
+{
+  if (to_boolean (get_property ("tupletFullLength")))
+    for (vsize i = 0; i < last_tuplets_.size (); i++)
+      {
+	Item *col = unsmob_item (get_property ("currentCommandColumn"));
+	last_tuplets_[i]->set_bound (RIGHT, col);
+      }
 }
 
 Tuplet_engraver::Tuplet_engraver ()
 {
 }
 
-ENTER_DESCRIPTION (Tuplet_engraver,
-/* descr */       "Catch Time_scaled_music and generate appropriate bracket  ",
-/* creats*/       "TupletBracket",
-/* accepts */     "time-scaled-music",
-/* acks  */      "note-column-interface",
-/* reads */       "tupletNumberFormatFunction tupletSpannerDuration",
-/* write */       "");
+ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
+ADD_TRANSLATOR (Tuplet_engraver,
+		/* doc */ "Catch TupletSpannerEvent and generate appropriate bracket  ",
+		/* create */
+		"TupletBracket "
+		"TupletNumber ",
+		/* read */
+		"tupletFullLength "
+		"tupletFullLengthNote ",
+		/* write */ "");