X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-engraver.cc;h=7d97443e1d3db2ffac3ce03ae60ce2fb602c606f;hb=5b808a72fcc28dcd2f391c52d82a7e4384e4db12;hp=7a3cf534fdbd3717a0a514f9171833fd6640fa31;hpb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;p=lilypond.git

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 7a3cf534fd..7d97443e1d 100644
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "beam.hh"
@@ -14,6 +14,8 @@
 #include "stream-event.hh"
 #include "tuplet-bracket.hh"
 #include "warn.hh"
+#include "item.hh"
+#include "moment.hh"
 
 #include "translator.icc"
 
@@ -25,6 +27,9 @@ struct Tuplet_description
 
   bool full_length_;
   bool full_length_note_;
+  Moment stop_moment_;
+  Moment start_moment_;
+  Moment length_;
   
   Tuplet_description ()
   {
@@ -43,8 +48,10 @@ public:
 
 protected:
   vector<Tuplet_description> tuplets_;
+  vector<Tuplet_description> new_tuplets_;
   vector<Tuplet_description> stopped_tuplets_;
   vector<Spanner*> last_tuplets_;
+  
   DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_TRANSLATOR_LISTENER (tuplet_span);
   virtual void finalize ();
@@ -61,23 +68,58 @@ Tuplet_engraver::listen_tuplet_span (Stream_event *ev)
     {
       Tuplet_description d;
       d.event_ = ev;
-      tuplets_.push_back (d);
+
+      d.length_ = robust_scm2moment (d.event_->get_property ("length"),
+				     Moment (0));
+      d.start_moment_ = now_mom ();
+      d.stop_moment_ = now_mom () + d.length_;
+
+      for (vsize i=0; i < new_tuplets_.size (); i++)
+	{
+	  /*
+	    discard duplicates.
+	  */
+	  if (new_tuplets_[i].stop_moment_ == d.stop_moment_)
+	    return;
+	}
+      
+      new_tuplets_.push_back (d);
     }
-  else if (dir == STOP && tuplets_.size ())
+  else if (dir == STOP)
     {
-      stopped_tuplets_.push_back (tuplets_.back ());
-      tuplets_.pop_back ();
+      if (tuplets_.size ())
+	{
+	  stopped_tuplets_.push_back (tuplets_.back ());
+	  tuplets_.pop_back ();
+	}
+      else if (!to_boolean (get_property ("skipTypesetting"))) 
+	ev->origin ()->warning (_f ("No tuplet to end"));
     }
   else 
-    programming_error (_ ("invalid direction of tuplet-span-event"));
+    ev->origin ()->programming_error ("direction tuplet-span-event_ invalid.");
 }
 
 void
 Tuplet_engraver::process_music ()
 {
+  /*
+    This may happen if the end of a tuplet is part of a quoted voice.
+   */
+  Moment now = now_mom ();
+  for (vsize i = tuplets_.size (); i --; )
+    {
+      if (tuplets_[i].stop_moment_ == now)
+	{
+	  stopped_tuplets_.push_back (tuplets_[i]);
+	  tuplets_.erase (tuplets_.begin () + i);
+	}
+    }
+  
   for (vsize i = 0; i < stopped_tuplets_.size (); i++)
     {
-      if (stopped_tuplets_[i].bracket_)
+      Spanner *bracket = stopped_tuplets_[i].bracket_;
+      Spanner *number = stopped_tuplets_[i].number_;
+      if (bracket)
 	{
 	  if (stopped_tuplets_[i].full_length_)
 	    {
@@ -86,24 +128,27 @@ Tuplet_engraver::process_music ()
 			     ? get_property ("currentMusicalColumn")
 			     : get_property ("currentCommandColumn"));
 	      
-	      stopped_tuplets_[i].bracket_->set_bound (RIGHT, col);
-	      stopped_tuplets_[i].number_->set_bound (RIGHT, col);
+	      bracket->set_bound (RIGHT, col);
+	      number->set_bound (RIGHT, col);
 	    }
-	  else if (!stopped_tuplets_[i].bracket_->get_bound (RIGHT))
+	  else if (!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));
+	      bracket->set_bound (RIGHT,
+				  bracket->get_bound (LEFT));
+	      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_);
+	  last_tuplets_.push_back (bracket);
+	  last_tuplets_.push_back (number);
 	}
     }
   stopped_tuplets_.clear ();
 
+  concat (tuplets_, new_tuplets_);
+  new_tuplets_.clear ();
   for (vsize j = tuplets_.size (); j > 0; j--)
     {
       /* i goes from size-1 downto 0, inclusively */
@@ -123,8 +168,10 @@ Tuplet_engraver::process_music ()
 					  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 ());
+      tuplets_[i].stop_moment_.grace_part_ = 0;
+      
       
-      if (i < tuplets_.size () - 1 && tuplets_[i + 1].bracket_)
+      if (i + 1 < tuplets_.size () && tuplets_[i + 1].bracket_)
 	Tuplet_bracket::add_tuplet_bracket (tuplets_[i].bracket_, tuplets_[i + 1].bracket_);
       
       if (i > 0 && tuplets_[i - 1].bracket_)
@@ -149,6 +196,10 @@ void
 Tuplet_engraver::start_translation_timestep ()
 {
   last_tuplets_.clear ();
+  /*
+    May seem superfluous, but necessary for skipTypesetting.
+   */
+  new_tuplets_.clear ();	
 }
 
 void
@@ -168,7 +219,10 @@ Tuplet_engraver::Tuplet_engraver ()
 
 ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
 ADD_TRANSLATOR (Tuplet_engraver,
-		/* doc */ "Catch TupletSpannerEvent and generate appropriate bracket  ",
+
+		/* doc */
+		"Catch tuplet events and generate appropriate bracket.",
+		
 		/* create */
 		"TupletBracket "
 		"TupletNumber ",