X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-engraver.cc;h=6ee50151d5cfc62bda458f3748728908e199148b;hb=485ea672ce8cc791a59ca713f3ea1d01b171f20c;hp=7d97443e1d3db2ffac3ce03ae60ce2fb602c606f;hpb=6c4ff307b7c836de9eeca5bbf643726ffd87d1ff;p=lilypond.git

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 7d97443e1d..6ee50151d5 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "beam.hh"
@@ -93,7 +93,7 @@ Tuplet_engraver::listen_tuplet_span (Stream_event *ev)
 	  tuplets_.pop_back ();
 	}
       else if (!to_boolean (get_property ("skipTypesetting"))) 
-	ev->origin ()->warning (_f ("No tuplet to end"));
+	ev->origin ()->warning (_ ("No tuplet to end"));
     }
   else 
     ev->origin ()->programming_error ("direction tuplet-span-event_ invalid.");
@@ -133,12 +133,16 @@ Tuplet_engraver::process_music ()
 	    }
 	  else if (!bracket->get_bound (RIGHT))
 	    {
-	      bracket->set_bound (RIGHT,
-				  bracket->get_bound (LEFT));
-	      number->set_bound (RIGHT,
-				 stopped_tuplets_[i].bracket_->get_bound (LEFT));
-	    }
-	  
+	      if (bracket->get_bound (LEFT))
+		{
+		  bracket->set_bound (RIGHT,
+				      bracket->get_bound (LEFT));
+		  number->set_bound (RIGHT,
+				     stopped_tuplets_[i].bracket_->get_bound (LEFT));
+		}
+	      else
+		programming_error ("stopped tuplet bracket has left nor right bound.");
+	    }	  
 	  // todo: scrap last_tuplets_, use stopped_tuplets_ only.
 	  // clear stopped_tuplets_ at start_translation_timestep
 	  last_tuplets_.push_back (bracket);
@@ -219,14 +223,17 @@ Tuplet_engraver::Tuplet_engraver ()
 
 ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
 ADD_TRANSLATOR (Tuplet_engraver,
-
 		/* doc */
 		"Catch tuplet events and generate appropriate bracket.",
 		
 		/* create */
 		"TupletBracket "
 		"TupletNumber ",
+
 		/* read */
 		"tupletFullLength "
 		"tupletFullLengthNote ",
-		/* write */ "");
+
+		/* write */
+		""
+		);