gregchapman-dev
diff --git a/‎LICENSE‎
Lines changed: 1 addition & 1 deletion b/‎LICENSE‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎ReleaseNotes_3.1.0.txt‎
Lines changed: 62 additions & 0 deletions b/‎ReleaseNotes_3.1.0.txt‎
Lines changed: 62 additions & 0 deletions
diff --git a/‎converter21/humdrum/convert.py‎
Lines changed: 17 additions & 18 deletions b/‎converter21/humdrum/convert.py‎
Lines changed: 17 additions & 18 deletions
diff --git a/‎converter21/humdrum/gridcommon.py‎
Lines changed: 1 addition & 3 deletions b/‎converter21/humdrum/gridcommon.py‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎converter21/humdrum/gridmeasure.py‎
Lines changed: 118 additions & 23 deletions b/‎converter21/humdrum/gridmeasure.py‎
Lines changed: 118 additions & 23 deletions
@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2021-2023 Greg Chapman
+Copyright (c) 2021-2024 Greg Chapman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 
@@ -39,7 +39,7 @@ Call converter21.register() to get music21 to use converter21's alternate Humdru
 
 ## License
 The MIT License (MIT)
-Copyright (c) 2021-2023 Greg Chapman
+Copyright (c) 2021-2024 Greg Chapman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 
@@ -0,0 +1,62 @@
+Changes since 3.0.1:
+
+All importers/exporters:
+    - Regularize invisible vs regular vs missing m21 Barlines.
+
+All importers:
+    - Fix handling of 'title' vs. 'movementName'.
+
+All exporters:
+    - Fix handling of "play only" MetronomeMarks.
+    - Regularize treatment of absoluteY and placement.
+    - Handle Grace vs Appoggiatura more carefully.
+    - Handle gaps by exporting invisible rests.
+    - Obey chordSymbol.writeAsChord during export (ChordSymbol is not yet supported, but
+        if .writeAsChord is true, we'll emit the <chord> itself).
+    - Fix handling of staves not in any staffGroup.
+
+MEI importer/exporter:
+    - Support lyric placement
+    - DatePrimitive range edge that is also a range needs to be
+        "[date1..date2]", not "date1/date2".
+        We can now import both, but export always produces "[date1..date2]".
+    - Fix handling of tuplet.bracket and visibility.
+
+MEI importer:
+    - Fix timestamp computation (notice meter changes inside layers before computing
+        any timestamps in that measure).
+    - Allow <space> to be used as a @startid or @endid in a staff item (e.g. <hairpin>).
+
+MEI exporter:
+    - MetronomeMark implicit text no longer emitted in <tempo>.
+    - Fix duplicated clefs/keySigs/meterSigs; if you emit in staffdef, don't emit
+        again later at start of layer.
+    - Actually emit clef/key/timesig changes that aren't at start of measure.
+    - @midi.bpm must be exported as a string (fixes an MEI export crash).
+    - If @tstamp2 is going to be in a previous measure, don't crash, just put it at the beginning
+        of this measure.
+    - Add missing @isodate for "datePublished".
+    - Fix handling of spanners that start and end in different Parts (we were crashing).
+    - Emit ornament accidentals only if visible (there is no @accid.ges on
+        ornamentals, unfortunately, or we would use that for invisible accidentals).
+    - MEI hairpins end at start of @endid.  Unfortunately, music21 DynamicWedges
+        end at _end_ of dw.getLast().  So we can't use dw.getLast() as @endid.  Instead
+        we now emit a @tstamp2 at the ending offset of dw.getLast().
+
+Humdrum importer/exporter:
+    - Fix handling of OMD that is not Tempo (picked up !LO:TX:omd: import support from
+        Verovio, then started emitting that in Humdrum export).
+    - Support export of non-note-associated (i.e. timestamped) dynamics/directions/tempos
+        by adding a voice full of invisible rests, one of which lands at the desired offset.
+        This was a Humdrum export feature, but it exposed several Humdrum import bugs that
+        got fixed as well.
+
+Humdrum importer:
+    - Fix handling of transposing instruments.
+    - Fix handling of preferred vs forced placement of dynamics and hairpins.
+
+Tests:
+    - Modify all diffall and showdiff tests to report mismatched number of parts before
+        diffing to avoid musicdiff exception.
+    - Visualize note offset differences (new musicdiff v3.1 feature) in diffall tests.
+    - Print out exception information in diffall tests.
@@ -544,7 +544,7 @@ def getTempoText(text: str) -> str:
         output += first
 
         # Add the musical symbols (notes and dots), adding a space between them
-        dotChar: str = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metAugmentationDot', '')
+        dotChar: str = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metAugmentationDot', '')
         counter: int = 0
         for i, char in enumerate(second):
             if i > 0:
@@ -598,33 +598,33 @@ def humdrumTempoNoteNameToSmuflText(text: str) -> str:
             finaltext = re.sub(r'\.+$', '', finaltext)
 
         if finaltext in ('quarter', '4'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNoteQuarterUp', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNoteQuarterUp', '')
         elif finaltext in ('half', '2'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNoteHalfUp', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNoteHalfUp', '')
         elif finaltext in ('whole', '1'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNoteWhole', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNoteWhole', '')
         elif finaltext in ('breve', 'double-whole', '0'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNoteDoubleWhole', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNoteDoubleWhole', '')
         elif finaltext in ('eighth', '8', '8th'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNote8thUp', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNote8thUp', '')
         elif finaltext in ('sixteenth', '16', '16th'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNote16thUp', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNote16thUp', '')
         elif finaltext in ('32', '32nd'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNote32ndUp', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNote32ndUp', '')
         elif finaltext in ('64', '64th'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNote64thUp', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNote64thUp', '')
         elif finaltext in ('128', '128th'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNote128thUp', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNote128thUp', '')
         elif finaltext in ('256', '256th'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNote256thUp', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNote256thUp', '')
         elif finaltext in ('512', '512th'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNote512thUp', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNote512thUp', '')
         elif finaltext in ('1024', '1024th'):
-            output = SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metNote1024thUp', '')
+            output = SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metNote1024thUp', '')
 
         if dots > 0:
             output += (
-                SharedConstants._SMUFL_NAME_TO_UNICODE_CHAR.get('metAugmentationDot', '')
+                SharedConstants.SMUFL_NAME_TO_UNICODE_CHAR.get('metAugmentationDot', '')
                 * dots
             )
 
@@ -1395,7 +1395,7 @@ def transToDiatonicChromatic(trans: str) -> tuple[int | None, int | None]:
     def diatonicChromaticToTrans(d: int, c: int) -> str:
         return 'd' + str(d) + 'c' + str(c)
 
-    _humdrumBarlineStyleFromMeasureStyle: dict[MeasureStyle, str | None] = {
+    _humdrumBarlineStyleFromMeasureStyle: dict[MeasureStyle, str] = {
         MeasureStyle.Double: '||',
         MeasureStyle.HeavyHeavy: '!!',
         MeasureStyle.HeavyLight: '!|',
@@ -1407,7 +1407,6 @@ def diatonicChromaticToTrans(d: int, c: int) -> str:
         MeasureStyle.Invisible: '-',
         MeasureStyle.Regular: '',
         MeasureStyle.Heavy: '!',
-        MeasureStyle.NoBarline: None,
         MeasureStyle.RepeatBackwardRegular: ':|',
         MeasureStyle.RepeatBackwardHeavy: ':!',
         MeasureStyle.RepeatBackwardHeavyLight: ':!|',
@@ -1431,8 +1430,8 @@ def diatonicChromaticToTrans(d: int, c: int) -> str:
     }
 
     @staticmethod
-    def measureStyleToHumdrumBarlineStyleStr(measureStyle: MeasureStyle) -> str | None:
-        output: str | None = Convert._humdrumBarlineStyleFromMeasureStyle[measureStyle]
+    def measureStyleToHumdrumBarlineStyleStr(measureStyle: MeasureStyle) -> str:
+        output: str = Convert._humdrumBarlineStyleFromMeasureStyle[measureStyle]
         return output
 
     _humdrumFermataStyleFromFermataStyle: dict[FermataStyle, str] = {
 
@@ -93,7 +93,6 @@ class SliceType(IntEnum):
 class MeasureVisualStyle(IntEnum):
     # this enum is sorted so that we can use max() to pick between
     # previous right barline and current left barline visual style
-    NoBarline = auto()
     Regular = auto()
     Double = auto()
     HeavyHeavy = auto()
@@ -131,7 +130,6 @@ class MeasureStyle(Enum):
     Invisible = (MeasureVisualStyle.Invisible, MeasureType.NotRepeat)
     Regular = (MeasureVisualStyle.Regular, MeasureType.NotRepeat)
     Heavy = (MeasureVisualStyle.Heavy, MeasureType.NotRepeat)
-    NoBarline = (MeasureVisualStyle.NoBarline, MeasureType.NotRepeat)
 
     RepeatBackwardRegular = (MeasureVisualStyle.Regular, MeasureType.RepeatBackward)
     RepeatBackwardHeavy = (MeasureVisualStyle.Heavy, MeasureType.RepeatBackward)
@@ -157,7 +155,7 @@ class MeasureStyle(Enum):
     RepeatBothHeavyLightHeavy = (MeasureVisualStyle.HeavyLightHeavy, MeasureType.RepeatBoth)
     RepeatBothLightHeavyLight = (MeasureVisualStyle.LightHeavyLight, MeasureType.RepeatBoth)
 
-    # This is just here so clients can do blah.measureType and blah.measureVisualType instead
+    # This is just here so clients can do blah.vStyle and blah.mType instead
     # of having to know the layout of the tuple.
     def __init__(self, vStyle: MeasureVisualStyle, mType: MeasureType) -> None:
         self.vStyle = vStyle
 
@@ -281,8 +281,10 @@ def addTokenOfSliceType(
         part: int,
         staff: int,
         voice: int,
-        staffCounts: list[int]
+        staffCounts: list[int],
+        beforeAnyLayouts: bool = False
     ) -> GridSlice:
+        # beforeAnyLayouts == True only works if the timestamp lands us exactly on a data slice
         ts: HumNum = opFrac(timestamp)
         gs: GridSlice
 
@@ -303,12 +305,15 @@ def addTokenOfSliceType(
 
             if gridSlice.timestamp == ts and gridSlice.isDataSlice:
                 # found the correct timestamp, but no slice of the right type at the
-                # timestamp, so add the new slice before the data slice (eventually
-                # keeping track of the order in which the other non-data slices should
-                # be placed).
+                # timestamp, so add the new slice before the data slice (and, if
+                # requested, before any layouts preceding this data slice).
+                insertPoint: int = idx
+                if beforeAnyLayouts:
+                    insertPoint = self.startIdxOfLayoutGroupBefore(insertPoint)
+
                 gs = GridSlice(self, ts, sliceType, staffCounts)
                 gs.addToken(tok, part, staff, voice)
-                self.slices.insert(idx, gs)
+                self.slices.insert(insertPoint, gs)
                 return gs
 
             if gridSlice.timestamp > ts:
@@ -339,8 +344,16 @@ def addTempoToken(
         voice: int,
         staffCounts: list[int]
     ) -> GridSlice:
-        return self.addTokenOfSliceType(tok, timestamp, SliceType.Tempos,
-                                        part, staff, voice, staffCounts)
+        return self.addTokenOfSliceType(
+            tok,
+            timestamp,
+            SliceType.Tempos,
+            part,
+            staff,
+            voice,
+            staffCounts,
+            beforeAnyLayouts=True
+        )
 
     '''
     //////////////////////////////
@@ -957,18 +970,48 @@ def addVerseLabels(
             if verseLabel is not None:
                 newStaff.sides.setVerse(i, verseLabel)
 
+
+    def addLayoutParameterAtTime(
+        self,
+        timestamp: HumNum,
+        partIndex: int,
+        locomment: str,
+        beforeAnyNonTextLayouts: bool = False
+    ) -> None:
+        # find the associated data slice at the timestamp
+        associatedSlice: GridSlice | None = None
+
+        for theSlice in self.slices:
+            if not theSlice.isDataSlice:
+                continue
+            if theSlice.timestamp >= timestamp:
+                associatedSlice = theSlice
+                break
+
+        staffIndex: int = 0
+        voiceIndex: int = 0
+        self.addLayoutParameter(
+            associatedSlice,
+            partIndex,
+            staffIndex,
+            voiceIndex,
+            locomment,
+            beforeAnyNonTextLayouts=beforeAnyNonTextLayouts
+        )
+
     '''
     //////////////////////////////
     //
     // GridMeasure::addLayoutParameter --
     '''
     def addLayoutParameter(
         self,
-        associatedSlice: GridSlice,
+        associatedSlice: GridSlice | None,
         partIndex: int,
         staffIndex: int,
         voiceIndex: int,
-        locomment: str
+        locomment: str,
+        beforeAnyNonTextLayouts: bool = False
     ) -> None:
         # add this '!LO:' string just before this associatedSlice
         if len(self.slices) == 0:
@@ -992,25 +1035,37 @@ def addLayoutParameter(
                 # cannot find owning line (a.k.a. associatedSlice is not in this GridMeasure)
                 return
 
-        # see if the previous slice is a layout slice we can use
-        prevIdx: int = associatedSliceIdx - 1
-        prevSlice: GridSlice = self.slices[prevIdx]
-        if prevSlice.isLocalLayoutSlice:
-            prevStaff: GridStaff = prevSlice.parts[partIndex].staves[staffIndex]
-            prevVoice: GridVoice = self._getIndexedVoice_AppendingIfNecessary(prevStaff.voices,
-                                                                              voiceIndex)
-            if prevVoice.token is None or prevVoice.token.text == '!':
-                prevVoice.token = HumdrumToken(locomment)
-                return
+        if not beforeAnyNonTextLayouts:
+            # see if the previous slice is a layout slice we can use
+            prevIdx: int = associatedSliceIdx - 1
+            prevSlice: GridSlice = self.slices[prevIdx]
+            if prevSlice.isLocalLayoutSlice:
+                prevStaff: GridStaff = prevSlice.parts[partIndex].staves[staffIndex]
+                prevVoice: GridVoice = self._getIndexedVoice_AppendingIfNecessary(prevStaff.voices,
+                                                                                  voiceIndex)
+                if prevVoice.token is None or prevVoice.token.text == '!':
+                    prevVoice.token = HumdrumToken(locomment)
+                    return
+
+        insertPoint: int = associatedSliceIdx
+        insertSlice: GridSlice | None = associatedSlice
+        if beforeAnyNonTextLayouts:
+            insertPoint = self.startIdxOfNonTextLayoutGroupBefore(
+                associatedSliceIdx,
+                partIndex,
+                staffIndex,
+                voiceIndex
+            )
+            if insertPoint < len(self.slices):
+                insertSlice = self.slices[insertPoint]
 
         # if we get here, we couldn't use the previous slice, so we need to insert
         # a new Layout slice to use, just before the associated slice.
-        insertPoint: int = associatedSliceIdx
         newSlice: GridSlice
 
-        if associatedSlice is not None:
-            newSlice = GridSlice(self, associatedSlice.timestamp, SliceType.Layouts)
-            newSlice.initializeBySlice(associatedSlice)
+        if insertSlice is not None:
+            newSlice = GridSlice(self, insertSlice.timestamp, SliceType.Layouts)
+            newSlice.initializeBySlice(insertSlice)
             self.slices.insert(insertPoint, newSlice)
         else:
             newSlice = GridSlice(self, self.timestamp + self.duration, SliceType.Layouts)
@@ -1022,6 +1077,46 @@ def addLayoutParameter(
                                                                          voiceIndex)
         newVoice.token = HumdrumToken(locomment)
 
+    def startIdxOfLayoutGroupBefore(self, sliceIdx: int) -> int:
+        for testIdx in reversed(range(0, sliceIdx)):
+            # loop backward from sliceIdx-1 to 0
+            # We are counting on layout slices having zero duration,
+            # since we need to not change timestamps as we walk them.
+            if self.slices[testIdx].sliceType != SliceType.Layouts:
+                return testIdx + 1
+        return 0
+
+    def startIdxOfNonTextLayoutGroupBefore(
+        self,
+        sliceIdx: int,
+        partIdx: int,
+        staffIdx: int,
+        voiceIdx: int
+    ) -> int:
+        for testIdx in reversed(range(0, sliceIdx)):
+            # loop backward from sliceIdx-1 to 0
+            # We are counting on layout slices having zero duration,
+            # since we need to not change timestamps as we walk them.
+            if self.slices[testIdx].sliceType != SliceType.Layouts:
+                # it is not a layout slice; we stop here
+                return testIdx + 1
+
+            # it is a layout slice.  Is this voice a non-text layout (i.e. not '!LO:TX')?
+            if 0 <= partIdx < len(self.slices[testIdx].parts):
+                part: GridPart = self.slices[testIdx].parts[partIdx]
+                if 0 <= staffIdx < len(part.staves):
+                    staff: GridStaff = part.staves[staffIdx]
+                    if 0 <= voiceIdx < len(staff.voices):
+                        voice: GridVoice | None = staff.voices[voiceIdx]
+                        if voice is not None and voice.token is not None:
+                            if voice.token.text.startswith('!LO:TX'):
+                                # it is a text layout;
+                                # we've passed any non-text layouts; we stop here
+                                return testIdx + 1
+
+        return 0
+
+
     '''
     //////////////////////////////
     //