Ottava transposition fixes

music21/_version.py

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

music21/base.py

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

music21/dynamics.py

@@ -348,6 +348,9 @@ class DynamicWedge(spanner.Spanner):
     def __init__(self, *spannedElements, **keywords):
         super().__init__(*spannedElements, **keywords)
 
+        # from music21 import note
+        # self.fillElementTypes = [note.GeneralNote]
+
         self.type = None  # crescendo or diminuendo
         self.placement = 'below'  # can above or below, after musicxml
         self.spread = 15  # this unit is in tenths

music21/expressions.py

@@ -1437,6 +1437,10 @@ class TrillExtension(spanner.Spanner):
     # N.B. this extension always includes a trill symbol
     def __init__(self, *spannedElements, **keywords):
         super().__init__(*spannedElements, **keywords)
+
+        # from music21 import note
+        # self.fillElementTypes = [note.NotRest]
+
         self._placement = None  # can above or below or None, after musicxml
 
     def _getPlacement(self):
@@ -1484,6 +1488,7 @@ class TremoloSpanner(spanner.Spanner):
 
     def __init__(self, *spannedElements, **keywords):
         super().__init__(*spannedElements, **keywords)
+
         self.placement = None
         self.measured = True
         self._numberOfMarks = 3
@@ -1565,6 +1570,7 @@ def __init__(self,
                  arpeggioType: str = 'normal',
                  **keywords):
         super().__init__(*spannedElements, **keywords)
+
         if arpeggioType not in ('normal', 'up', 'down', 'non-arpeggio'):
             raise ValueError(
                 'Arpeggio type must be "normal", "up", "down", or "non-arpeggio", '

music21/interval.py

@@ -2832,6 +2832,11 @@ class Interval(IntervalBase):
     >>> aInterval.semiSimpleName
     'P8'
 
+    Check if transposition would change pitch class:
+
+    >>> aInterval.transpositionChangesPitchClass
+    False
+
     An interval can also be specified directly:
 
     >>> aInterval = interval.Interval('m3')
@@ -2850,6 +2855,8 @@ class Interval(IntervalBase):
     False
     >>> aInterval.isStep
     False
+    >>> aInterval.transpositionChangesPitchClass
+    True
 
     Some ways of creating half-steps.
 
@@ -2956,6 +2963,8 @@ class Interval(IntervalBase):
     >>> iInterval = interval.Interval(gPitch, hPitch)
     >>> iInterval
     <music21.interval.Interval AAAA1>
+    >>> iInterval.transpositionChangesPitchClass
+    True
 
     >>> interval.Interval(pitch.Pitch('e##4'), pitch.Pitch('f--5'))
     <music21.interval.Interval dddd9>
@@ -3232,6 +3241,12 @@ def isStep(self) -> bool:
     def isSkip(self) -> bool:
         return self.diatonic.isSkip
 
+    @property
+    def transpositionChangesPitchClass(self) -> bool:
+        if self.simpleName == 'P1' and float(self.semitones) == float(int(self.semitones)):
+            return False
+        return True
+
     # -------------------------------------
     # methods
     def isConsonant(self) -> bool:
@@ -3443,6 +3458,12 @@ def _diatonicTransposePitch(self,
         PRIVATE METHOD: Return p even if inPlace is True
         '''
         # NOTE: this is a performance critical method
+
+        inheritAccidentalDisplayStatus: bool = False
+        if not self.transpositionChangesPitchClass:
+            # unison and any multiple of octave
+            inheritAccidentalDisplayStatus = True
+
         if p.octave is None:
             useImplicitOctave = True
         else:
@@ -3459,6 +3480,7 @@ def _diatonicTransposePitch(self,
         newStep, newOctave = convertDiatonicNumberToStep(newDiatonicNumber)
         pitch2.step = newStep
         pitch2.octave = newOctave
+        oldPitch2Accidental = pitch2.accidental
         pitch2.accidental = None
         # if this is not set to None then terrible things happen
         pitch2.microtone = None  # type: ignore
@@ -3487,13 +3509,35 @@ def _diatonicTransposePitch(self,
                 # pitch2 = pitchAlt
                 pitch2.ps = pitch2.ps + halfStepsToFix
             else:
-                # cannot import Accidental here.
                 pitch2.accidental = halfStepsToFix  # type:ignore
 
-            # inherit accidental display type etc. but not current status
-            if pitch2.accidental is not None and pitch1.accidental is not None:
-                pitch2.accidental.inheritDisplay(pitch1.accidental)
-                pitch2.accidental.displayStatus = None  # set accidental display to None
+            if not inheritAccidentalDisplayStatus:
+                # inherit accidental display type etc. but not current status
+                if pitch2.accidental is not None and pitch1.accidental is not None:
+                    pitch2.accidental.inheritDisplay(pitch1.accidental)
+                    pitch2.accidental.displayStatus = None  # set accidental display to None
+            else:
+                # inherit all accidental display options (including status)
+                if pitch2.accidental is None:
+                    if pitch1.accidental is not None:
+                        pitch2.accidental = 0  # type:ignore
+                        if t.TYPE_CHECKING:
+                            assert pitch2.accidental is not None
+                        pitch2.accidental.inheritDisplay(pitch1.accidental)
+                else:
+                    if pitch1.accidental is not None:
+                        pitch2.accidental.inheritDisplay(pitch1.accidental)
+                    else:
+                        pitch2.accidental.displayStatus = False
+
+        else:
+            # no halfStepsToFix, so pitch2 is fine as is, but...
+            if inheritAccidentalDisplayStatus:
+                # We have set pitch2.accidental to None, so we might have lost some
+                # display options. So we restore oldPitch2Accidental if that makes sense.
+                if (oldPitch2Accidental is not None
+                        and oldPitch2Accidental.name == 'natural'):
+                    pitch2.accidental = oldPitch2Accidental
 
         if useImplicitOctave is True:
             pitch2.octave = None

music21/musicxml/m21ToXml.py

@@ -1517,9 +1517,8 @@ def parse(self):
         if not s:
             return self.emptyObject()
 
-        if s.atSoundingPitch is True:
-            # A copy was already made or elected NOT to be made.
-            s.toWrittenPitch(inPlace=True)
+        # A copy was already made or elected NOT to be made.
+        s.toWrittenPitch(inPlace=True, ottavasToSounding=True)
 
         self.scorePreliminaries()
 
@@ -2730,8 +2729,7 @@ def parse(self):
         # unless makeNotation=False, but the user
         # should have called toWrittenPitch() first
         # and is explicitly asking for no further copies to be made
-        if self.stream.atSoundingPitch is True:
-            self.stream.toWrittenPitch(inPlace=True)
+        self.stream.toWrittenPitch(inPlace=True, ottavasToSounding=True)
 
         # Suppose that everything below this is a measure
         if self.makeNotation: