From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 4 Aug 2006 12:12:30 +0000 (+0000)
Subject: (process_acknowledged): don't create
X-Git-Tag: release/2.10.0-2~408
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=63179d1f16581b4993455c726cab4873c7f0dbc0;p=lilypond.git

(process_acknowledged): don't create
accidental for trill span event. This fixes spurious accidentals
on trills.
---

diff --git a/ChangeLog b/ChangeLog
index b85acbb67a..9077c550de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-04  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+	* lily/accidental-engraver.cc (process_acknowledged): don't create
+	accidental for trill span event. This fixes spurious accidentals
+	on trills.
+
 2006-08-04  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
 	* scm/define-grob-properties.scm (all-user-grob-properties):
diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 05990a6853..39a66ba953 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -347,7 +347,8 @@ Accidental_engraver::process_acknowledged ()
 
 	  /* Cannot look for ties: it's not guaranteed that they reach
 	     us before the notes. */
-	  if (num)
+	  if (num
+	      && !note->is_mus_type ("trill-span-event"))
 	    create_accidental (&accidentals_[i], num > 1, cautionary);
 	}
     }