(process_acknowledged): don't create

accidental for trill span event. This fixes spurious accidentals
on trills.

diff --git a/ChangeLog b/ChangeLog
index b85acbb67a7cf296dfe537d65619a15a0b6e097f..9077c550debfa377e43b313a946f108a1dfda938 100644 (file)
--- 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 05990a6853dcd6b38396376996c16be53d16566d..39a66ba95374e842d4d6cadb5839cf172b2a4ad6 100644 (file)
--- 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);
        }
     }