Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index a160d0e4440ec2dc44e216787965c460e4f39192..946fd1d80272e03d4266f024a8b7e25891d6acbd 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -6,12 +6,15 @@
   (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "tuplet-bracket.hh"
-#include "note-column.hh"
 #include "beam.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"
 
@@ -61,11 +64,13 @@ Tuplet_engraver::listen_tuplet_span (Stream_event *ev)
       d.event_ = ev;
       tuplets_.push_back (d);
     }
-  if (dir == STOP)
+  else if (dir == STOP && tuplets_.size ())
     {
       stopped_tuplets_.push_back (tuplets_.back ());
       tuplets_.pop_back ();
     }
+  else 
+    programming_error (_ ("invalid direction of tuplet-span-event"));
 }
 
 void
@@ -165,7 +170,10 @@ Tuplet_engraver::Tuplet_engraver ()
 ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
 ADD_TRANSLATOR (Tuplet_engraver,
                /* doc */ "Catch TupletSpannerEvent and generate appropriate bracket  ",
-               /* create */ "TupletBracket TupletNumber ",
-               /* accept */ "tuplet-span-event",
-               /* read */ "tupletFullLength ",
+               /* create */
+               "TupletBracket "
+               "TupletNumber ",
+               /* read */
+               "tupletFullLength "
+               "tupletFullLengthNote ",
                /* write */ "");