From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 2 Feb 2007 00:02:28 +0000 (+0100)
Subject: Fix #263.
X-Git-Tag: release/2.11.15-2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9b261bd9c0df46fa7bfec25314df7cf1c91b6452;p=lilypond.git

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 b681a69342..56e63ce311 100644
--- 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 17eed00f35..dcb717728f 100644
--- 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 ",