From: David Kastrup <dak@gnu.org>
Date: Fri, 11 Jan 2013 08:44:06 +0000 (+0100)
Subject: If TimeScaledMusic carries a duration, let it override tupletSpannerDuration
X-Git-Tag: release/2.17.11-1~7^2~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c3d30cde5a4e1ba4d8e044fec7677629269b9443;p=lilypond.git

If TimeScaledMusic carries a duration, let it override tupletSpannerDuration
---

diff --git a/lily/tuplet-iterator.cc b/lily/tuplet-iterator.cc
index 872ccae48d..bf9a223684 100644
--- a/lily/tuplet-iterator.cc
+++ b/lily/tuplet-iterator.cc
@@ -126,12 +126,17 @@ Tuplet_iterator::process (Moment m)
 void
 Tuplet_iterator::construct_children ()
 {
-  spanner_duration_ = music_get_length ();
+  if (Duration *d = unsmob_duration (get_music ()->get_property ("duration")))
+    spanner_duration_ = d->get_length ();
+  else
+    {
+      spanner_duration_ = music_get_length ();
 
-  Moment *mp
-    = unsmob_moment (get_outlet ()->get_property ("tupletSpannerDuration"));
-  if (mp)
-    spanner_duration_ = min (mp->main_part_, spanner_duration_);
+      Moment *mp
+        = unsmob_moment (get_outlet ()->get_property ("tupletSpannerDuration"));
+      if (mp)
+        spanner_duration_ = min (mp->main_part_, spanner_duration_);
+    }
 
   Music_wrapper_iterator::construct_children ();