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 b681a693421ee7f4ac041afc89be6685c1899e4e..56e63ce311bbcdccb35108a4abd845c7c0f90a2b 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 17eed00f35c11bde96d043c9b1603cc5161e912f..dcb717728ffefd0d3ec693e9c34bcb7d741e41a3 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 ",