Fix #263.

Take min() of tupletSpannerDuration and tuplet length.

diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc
index ca33ea786767fb7664712c723def8b4f5f1995b9..5d5432132ac80a0435743671fcbd59e732a4dad3 100644 (file)
--- a/lily/time-scaled-music-iterator.cc
+++ b/lily/time-scaled-music-iterator.cc
@@ -120,15 +120,11 @@ Time_scaled_music_iterator::process (Moment m)
 void
 Time_scaled_music_iterator::construct_children ()
 {
+  spanner_duration_ = music_get_length ();
+
   Moment *mp = unsmob_moment (get_outlet ()->get_property ("tupletSpannerDuration"));
   if (mp)
-    {
-      spanner_duration_ = mp->main_part_;
-    }
-  else
-    {
-      spanner_duration_ = music_get_length ();
-    }
+    spanner_duration_ = min (mp->main_part_, spanner_duration_);
   
   Music_wrapper_iterator::construct_children ();
 

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index feb46f62b1eb157d0e8e7b313e633921db2cc3b2..f35194cee859225fc0860b5b3a71e66a0cf2b99d 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -215,7 +215,9 @@ Tuplet_engraver::Tuplet_engraver ()
 
 ADD_ACKNOWLEDGER (Tuplet_engraver, note_column);
 ADD_TRANSLATOR (Tuplet_engraver,
-               /* doc */ "Catch TupletSpannerEvent and generate appropriate bracket  ",
+               /* doc */
+               "Catch @ref{TupletSpannerEvent} and generate appropriate bracket.",
+               
                /* create */
                "TupletBracket "
                "TupletNumber ",