From 6802aea5ad26c060c91cdff2c7b206347f58b88d Mon Sep 17 00:00:00 2001
From: Tristan Jelacic <Tristanjelacic@gmail.com>
Date: Mon, 12 Jan 2015 18:41:33 +0000
Subject: [PATCH] Articulate.ly: Fix trill timing

Issue 4190

Used a fixed duration for the twiddletime
instead of the broken heuristic that was
used before. This improves trill sound for
slow music, and doesn't interfere with fast music.
---
 ly/articulate.ly | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ly/articulate.ly b/ly/articulate.ly
index 6992c87ebd..e3056b4555 100644
--- a/ly/articulate.ly
+++ b/ly/articulate.ly
@@ -347,13 +347,11 @@
 	      (ly:music-property music 'elements)))
 	 (pre-t (if (pair? tr) (ly:music-property (car tr) 'twiddle)
 		 '()))
+	 (hemisemidur (ly:make-duration 5 0 1/1))
 	 (t (ac:targetTwiddleTime)))
    (if (ly:moment? pre-t)
     pre-t
-    (let loop ((len (ly:music-length music)))
-     (if (ly:moment<? t len)
-      (loop (ly:moment-mul len (ly:make-moment 1/2)))
-      len)))))
+    hemisemidur)))
 
 
 
@@ -367,7 +365,7 @@
 	 (t (ac:twiddletime music))
 	 (uppernote '())
 	 (note_moment (ly:moment-mul t (ly:make-moment 1/2)))
-	 (c1 (ly:moment-div orig-len note_moment))
+	 (c1 (ly:moment-div orig-len t))
 	 (c2 (inexact->exact
 	      (round (/ (ly:moment-main-numerator c1)
 		      (* 2 (ly:moment-main-denominator c1))))))
-- 
2.39.5