X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-engraver.cc;h=c0a7a431c3de664aa590d6cc4d16c5689a682722;hb=a82dc4a0cca57f285e818f6c227c8428a3c02a71;hp=478469a1e2e5e5dc62bcfd60a6cc5da88fe5904e;hpb=9e80da91309faff260dacdf2e25ed91d183ebc5d;p=lilypond.git

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 478469a1e2..c0a7a431c3 100644
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  tuplet-engraver.cc -- implement Tuplet_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "beam.hh"
@@ -93,7 +104,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 +144,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 neither left nor right bound");
+	    }	  
 	  // todo: scrap last_tuplets_, use stopped_tuplets_ only.
 	  // clear stopped_tuplets_ at start_translation_timestep
 	  last_tuplets_.push_back (bracket);