use springs instead of fixed/distance pairs

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

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 727b41bf026e575db1127dc8452940abf01eebd2..7d97443e1d3db2ffac3ce03ae60ce2fb602c606f 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -78,7 +78,7 @@ Tuplet_engraver::listen_tuplet_span (Stream_event *ev)
        {
          /*
            discard duplicates.
-          */
+         */
          if (new_tuplets_[i].stop_moment_ == d.stop_moment_)
            return;
        }
@@ -87,13 +87,13 @@ Tuplet_engraver::listen_tuplet_span (Stream_event *ev)
     }
   else if (dir == STOP)
     {
-    if (tuplets_.size ())
-    {
-      stopped_tuplets_.push_back (tuplets_.back ());
-      tuplets_.pop_back ();
-    }
-    else
-      ev->origin ()->warning (_f ("No tuplet to end"));
+      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 
     ev->origin ()->programming_error ("direction tuplet-span-event_ invalid.");
@@ -196,6 +196,10 @@ void
 Tuplet_engraver::start_translation_timestep ()
 {
   last_tuplets_.clear ();
+  /*
+    May seem superfluous, but necessary for skipTypesetting.
+   */
+  new_tuplets_.clear ();       
 }
 
 void
@@ -215,8 +219,9 @@ Tuplet_engraver::Tuplet_engraver ()
 
 ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
 ADD_TRANSLATOR (Tuplet_engraver,
+
                /* doc */
-               "Catch @ref{TupletSpanEvent} and generate appropriate bracket.",
+               "Catch tuplet events and generate appropriate bracket.",
                
                /* create */
                "TupletBracket "