Support ornament accidentals

music21/_version.py

@@ -47,7 +47,7 @@
 '''
 from __future__ import annotations
 
-__version__ = '9.0.0a9'
+__version__ = '9.0.0a11'
 
 
 def get_version_tuple(vv):

music21/alpha/analysis/ornamentRecognizer.py

@@ -131,14 +131,19 @@ def recognize(self, busyNotes, simpleNotes=None) -> bool | expressions.Trill:
             else:
                 return False
 
-        # set up trill
-        trill = expressions.Trill()
-        trill.quarterLength = self.calculateOrnamentNoteQl(busyNotes, simpleNotes)
-        if isNachschlag:
-            trill.nachschlag = True
-
         if not simpleNotes:
-            trill.size = interval.Interval(noteStart=n1, noteEnd=n2)
+            # set up trill (goes up) or inverted trill (goes down)
+            if n1.pitch.midi <= n2.pitch.midi:
+                trill = expressions.Trill()
+            else:
+                trill = expressions.InvertedTrill()
+            trill.quarterLength = self.calculateOrnamentNoteQl(busyNotes, simpleNotes)
+            if isNachschlag:
+                trill.nachschlag = True
+
+            if n2.pitch.accidental is not None:
+                trill.accidentalName = n2.pitch.accidental.name
+            trill.resolveOrnamentalPitches(n1)
             return trill
 
         # currently ignore other notes in simpleNotes
@@ -153,8 +158,19 @@ def recognize(self, busyNotes, simpleNotes=None) -> bool | expressions.Trill:
         if simpleNote.pitch.midi == n2.pitch.midi:
             endNote = n1
             startNote = n2
-        distance = interval.Interval(noteStart=startNote, noteEnd=endNote)
-        trill.size = distance
+
+        # set up trill (goes up) or inverted trill (goes down)
+        if startNote.pitch.midi <= endNote.pitch.midi:
+            trill = expressions.Trill()
+        else:
+            trill = expressions.InvertedTrill()
+        trill.quarterLength = self.calculateOrnamentNoteQl(busyNotes, simpleNotes)
+        if isNachschlag:
+            trill.nachschlag = True
+
+        if endNote.pitch.accidental is not None:
+            trill.accidentalName = endNote.pitch.accidental.name
+        trill.resolveOrnamentalPitches(startNote)
         return trill
 
 class TurnRecognizer(OrnamentRecognizer):
@@ -619,7 +635,14 @@ def testRecognizeTrill(self):
                 # ensure trill is correct
                 self.assertEqual(trill.nachschlag, cond.isNachschlag, cond.name)
                 if cond.ornamentSize:
-                    self.assertEqual(trill.size, cond.ornamentSize, cond.name)
+                    if cond.simpleNotes:
+                        if cond.simpleNotes[0].pitch.midi == cond.busyNotes[1].pitch.midi:
+                            size = trill.getSize(cond.busyNotes[1])
+                        else:
+                            size = trill.getSize(cond.busyNotes[0])
+                    else:
+                        size = trill.getSize(cond.busyNotes[0])
+                    self.assertEqual(size, cond.ornamentSize, cond.name)
             else:
                 self.assertFalse(trill, cond.name)
 

music21/base.py

@@ -27,7 +27,7 @@
 <class 'music21.base.Music21Object'>
 
 >>> music21.VERSION_STR
-'9.0.0a9'
+'9.0.0a11'
 
 Alternatively, after doing a complete import, these classes are available
 under the module "base":