From: David Kastrup <dak@gnu.org>
Date: Sun, 9 Dec 2012 09:32:01 +0000 (+0100)
Subject: Issue 3008: articulate can't deal with <>
X-Git-Tag: release/2.17.9-1~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a82ac9d01633538b3ffe44cf24395931b200c83c;p=lilypond.git

Issue 3008: articulate can't deal with <>
---

diff --git a/ly/articulate.ly b/ly/articulate.ly
index 4f748f35b9..a11b55e60c 100644
--- a/ly/articulate.ly
+++ b/ly/articulate.ly
@@ -376,6 +376,9 @@
     (begin
      (set! (ly:music-property music 'elements) (reverse newelements))
      (cond
+      ((not (any (lambda (m) (music-is-of-type? m 'rhythmic-event))
+		 newelements))
+       actions)
       (ac:inTrill (cons 'trill actions))
       ((and (eq? factor ac:normalFactor) (or ac:inSlur ac:inPhrasingSlur))
        (append actions (list 'articulation  '(1 . 1)) ))
@@ -468,7 +471,7 @@
     ((eq? 'EventChord (ly:music-property music 'name))
      (let loop ((actions (ac:getactions music)))
       (if (null? actions)
-	(if (ly:moment> (ly:music-length music) (make-moment 1 4))
+	(if (ly:moment<? (ly:make-moment 1/4) (ly:music-length music))
 	 (ac:to128  music)
 	 music)