From 9d5259279b544d1e514b4973cdffb18989051446 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 2 Feb 2007 01:02:28 +0100
Subject: [PATCH] Fix #263.
Take min() of tupletSpannerDuration and tuplet length.
---
lily/time-scaled-music-iterator.cc | 10 +++-------
lily/tuplet-engraver.cc | 4 +++-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc
index ca33ea7867..5d5432132a 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 feb46f62b1..f35194cee8 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 ",
--
2.39.5