gregchapman-dev
diff --git a/‎.flake8‎
Lines changed: 29 additions & 14 deletions b/‎.flake8‎
Lines changed: 29 additions & 14 deletions
diff --git a/‎.pylintrc‎
Lines changed: 3 additions & 2 deletions b/‎.pylintrc‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎README.md‎
Lines changed: 4 additions & 5 deletions b/‎README.md‎
Lines changed: 4 additions & 5 deletions
diff --git a/‎ReleaseNotes_2.0.0.txt‎
Lines changed: 57 additions & 0 deletions b/‎ReleaseNotes_2.0.0.txt‎
Lines changed: 57 additions & 0 deletions
diff --git a/‎ReleaseNotes_3.0.0.txt‎
Lines changed: 61 additions & 0 deletions b/‎ReleaseNotes_3.0.0.txt‎
Lines changed: 61 additions & 0 deletions
diff --git a/‎converter21/HumdrumConverter.py‎
Lines changed: 23 additions & 36 deletions b/‎converter21/HumdrumConverter.py‎
Lines changed: 23 additions & 36 deletions
@@ -1,19 +1,34 @@
 [flake8]
 ignore=
-  E127,  # over indented
-  E128,  # under indented
-  E301,  # 0 blank lines -- good test but something going wrong in new algorithm
-  E302,  # blank lines
-  E303,  # blank lines
-  E501,  # let pylint check line length
-  E722,  # let pylint check bare except
-  E731,  # do not assign a lambda
-  F401,  # let pylint check for imported but unused (wildcards and exports trigger)
-  F405,  # __all__ is okay to get from wildcard.
-  F821,  # let pylint check for undefined (del at end of module makes undefined)
-  F841,  # let pylint check for unused
-  W391,  # extra blank lines at end of file
-  W503,  # line break BEFORE binary operator
+  E127,
+  E128,
+  E301,
+  E302,
+  E303,
+  E501,
+  E722,
+  E731,
+  F401,
+  F405,
+  F821,
+  F841,
+  W391,
+  W503,
+
+#  E127,  # over indented
+#  E128,  # under indented
+#  E301,  # 0 blank lines -- good test but something going wrong in new algorithm
+#  E302,  # blank lines
+#  E303,  # blank lines
+#  E501,  # let pylint check line length
+#  E722,  # let pylint check bare except
+#  E731,  # do not assign a lambda
+#  F401,  # let pylint check for imported but unused (wildcards and exports trigger)
+#  F405,  # __all__ is okay to get from wildcard.
+#  F821,  # let pylint check for undefined (del at end of module makes undefined)
+#  F841,  # let pylint check for unused
+#  W391,  # extra blank lines at end of file
+#  W503,  # line break BEFORE binary operator
 
 exclude=
   .git,
 
@@ -80,6 +80,7 @@ disable=
     import-self,  # fix is either to get rid of it or move away many tests...
     wrong-import-position,
     no-else-return,
+    broad-exception-caught,
     too-many-ancestors,
     inconsistent-return-statements,
     keyword-arg-before-vararg,
@@ -326,7 +327,7 @@ exclude-protected=_asdict,_fields,_replace,_source,_make
 max-args=5
 
 # maximum boolean expressions in a line (too-many-boolean-expressions)
-max-bool-expr=10
+max-bool-expr=30
 
 # Argument names that match this expression will be ignored. Default to name
 # with leading underscore
@@ -382,4 +383,4 @@ int-import-graph=
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
-overgeneral-exceptions=Exception
+# overgeneral-exceptions=Exception
@@ -1,12 +1,12 @@
 # converter21
-A music21-extending converter package that contains alternate music21 Humdrum and MEI converters (a Humdrum parser/writer, and a MEI parser).  converter21 is also a command line tool for conversion between various music notation file formats.
+A music21-extending converter package that contains alternate music21 Humdrum and MEI converters (a Humdrum parser/writer, and a MEI parser/writer).  converter21 is also a command line tool for conversion between various music notation file formats.
 
 The Humdrum portion of this software is derived/translated from the C++ code in [humlib](https://github.com/craigsapp/humlib), by Craig Stuart Sapp.
 
-The core of the MEI portion of this software was based on the MEI converter in [music21](https://github.com/cuthbertlab/music21), by Michael Scott Asato Cuthbert.
+The core of the MEI parsing portion of this software was based on the MEI converter in [music21](https://github.com/cuthbertlab/music21), by Michael Scott Asato Cuthbert.
 
 ## Setup
-Depends on [music21](https://pypi.org/project/music21) v8.1, which should also be configured (instructions [here](https://web.mit.edu/music21/doc/usersGuide/usersGuide_01_installing.html)) to display a musical score (e.g. with Musescore). Some of the tests depend on [musicdiff](https://pypi.org/project/musicdiff), but converter21 itself does not.
+Requires Python 3.10 or later.  Depends on [music21](https://pypi.org/project/music21) v9.1, which should also be configured (instructions [here](https://web.mit.edu/music21/doc/usersGuide/usersGuide_01_installing.html)) to display a musical score (e.g. with Musescore). Some of the tests depend on [musicdiff](https://pypi.org/project/musicdiff), but converter21 itself does not.
 
 ## Command line tool usage:
 ```
@@ -35,8 +35,7 @@ Named arguments:
 ```
 
 ## API usage:
-
-See `converter21/__main__.py` (the source code for the command line tool) for an example of how to get music21 to use converter21's alternate Humdrum and MEI converters in your own code.
+Call converter21.register() to get music21 to use converter21's alternate Humdrum and MEI converters in your own code.
 
 ## License
 The MIT License (MIT)
 
@@ -0,0 +1,57 @@
+Humdrum import changes (since converter21 v1.4.1):
+
+Support lyrics with *ij (italicize them)
+Support ottavas
+Support visual duration of tuplet members
+More accurate trill/turn/mordent placement
+Better duplicate clef handling
+More accurate dynamics placement/duration
+Dynamics are actually per part (not per staff)
+Handle text direction before first barline of first measure
+Better unescaping of text
+Fix beaming to use visual duration
+Improve tempo handling
+Improve fermata handling
+Improve barline handling
+Recip-less grace notes are stemless quarter-notes
+Improve stem direction handling
+Improve key/keysig handling
+Rewrite accidental visibility handling
+
+Humdrum export changes (since converter21 v1.4.1):
+
+Support export of dotted/dashed barlines
+Support export of sf and sfz to 'z' and 'zz'
+Support visual duration of tuplet members
+Improve tempo handling
+Improve cresc/decresc (a.k.a. hairpin) handling
+More accurate dynamics placement
+Dynamics are actually per part (not per staff)
+Better escaping of text
+Recip-less grace notes are stemless quarter-notes
+Fix grace-note positioning around clef/timesig changes
+
+MEI import changes (starting from music21 v7's MEI importer):
+
+Support <fermata>, <trill>, <mordent>, <turn>, <octave>, <arpeggio>, <keysig>, <metersig>
+Support tremolos <bTrem> and <fTrem>
+Support <hairpin>, <dynam>, <tempo>, <dir>, <ending>
+Support staff items with @tstamp/@tstamp2 (things like hairpin, mordent, etc)
+Improved text handling in elements:
+	Support text that is broken up by embedded elements, or embedded in a <rend> element
+	Support styled text (as described by <rend> element)
+Improved beaming (including beam breaks)
+Support accidental display status, location, style
+Improved lyrics support
+Improved note/chord/rest support:
+	Support cue-sized notes/chords/rests
+	Support accented vs unaccented grace notes/chords
+	Support colored notes/chords/rests
+	Support note head shape, stem direction/length/visibility
+	Support invisible notes/chords/rests
+	Better handling of articulations/etc on notes within chords
+Improved clef handling
+Improved instrument handling
+Simple support for editorial elements (user selection for <app> and <choice> is not yet
+    implemented, I just make a reasonable default choice):
+	<app>, <lem>, <rdg>, <choice>, <corr>,<reg>, <add>, <del>, <damage>, <expan>, <orig>
@@ -0,0 +1,61 @@
+Changes since 2.0.1:
+
+Require music21 v9 (for several features/fixes)
+
+Add MEI exporter.  It exports MEI v5 by default, but can be asked to export MEI v4.
+    - MEI export is feature-equivalent with MEI import.
+
+MEI import improvements:
+    - import MEI v4 and v5 (obeying mei@meiversion)
+    - refactor to share code with MEI exporter and have instance-based state
+    - handle nested beams (i.e. grace note beams within another beam group)
+    - fermata placement (above, below)
+    - fix some clef bugs
+    - handle rest positioning (@oloc/@ploc)
+    - fix some octave/Ottava bugs
+    - fix some gestural duration bugs (including some bugs in tuplets)
+    - fix @dots.ges handling
+    - add @dur.ppq handling
+    - fix activeMeter tracking
+    - pad layer with spaces if it is shorter than the longest layer in any staff in the measure
+    - fix handling of missing note@oct/note@oct.ges
+    - handle missing tuplet@num and tuplet@numbase (default num=3, numbase=2)
+    - allPartNs now only contains the staffs defined in the initial scoreDef (instead
+        of all the staffDefs in the score)
+    - allow first scoreDef to be inside first section
+    - better handling of scoreDef keysig/timesig vs staffDef (and vs missing staffDef)
+    - better handling of measure@left (ignore it more)
+    - better handling of repeat starts
+    - support ending "numbers" that are non-numeric
+    - support @unitdur in tremolos (bTrem/fTrem)
+    - fix bug when there are grace notes within a tuplet
+    - add @dur.default handling, and rework @dur/@dur.ges/mRest/mSpace/maxBarDuration handling
+    - better handling of missing @staff
+    - handle verse@label just like <verse><label>
+    - handle ties much more accurately, including chord@tie
+    - stop making up measure numbers
+    - support unpitched notes, fix percussion clefs, staff lines != 5
+    - support placement of articulations (e.g. staccato)
+    - support hairpin with @startid, @endid, or both
+    - support dir/dynam/tempo with @startid instead of @tstamp
+    - generate music21 StaffGroups (and PartStaffs if appropriate)
+    - support tuplet display details
+    - import of metadata
+
+Humdrum export improvements:
+    - support ornaments
+    - support ottavas
+    - fix export of tuplets, including carefully choosing non-power-of-two recip
+    - support tuplet display details (*{X}tuplet/*{X}brackettup)
+    - fix export of articulations with placement
+
+Humdrum import/export improvements:
+    - support center justification
+    - tweaks to systemdecoration/StaffGroup code, now shared with MEI import/export
+    - some metadata fixes
+
+Improvements to all importers/exporters:
+    - support ornament accidentals (I implemented this in music21 v9)
+    - support page and system breaks
+    - improve ottava support (I improved Ottava support in music21 v9)
+    - support delayed turns (I implemented this in music21 v9)
@@ -6,20 +6,19 @@
 #                Humdrum code derived/translated from humlib (authored by
 #                       Craig Stuart Sapp <craig@ccrma.stanford.edu>)
 #
-# Copyright:     (c) 2021-2022 Greg Chapman
+# Copyright:     (c) 2021-2023 Greg Chapman
 # License:       MIT, see LICENSE
 # ------------------------------------------------------------------------------
-import typing as t
 from pathlib import Path
 
-from music21 import converter
 from music21 import common
 from music21 import stream
+from music21.converter.subConverters import SubConverter
 
 from converter21.humdrum import HumdrumFile
 from converter21.humdrum import HumdrumWriter
 
-class HumdrumConverter(converter.subConverters.SubConverter):
+class HumdrumConverter(SubConverter):
     '''
     Simple class wrapper for parsing Humdrum data provided in a file or in a string.
     '''
@@ -29,34 +28,13 @@ class HumdrumConverter(converter.subConverters.SubConverter):
 
     def __init__(self, **keywords) -> None:
         super().__init__(**keywords)
-        self.humdrumFile: t.Optional[HumdrumFile] = None
+        self.humdrumFile: HumdrumFile | None = None
 
     # --------------------------------------------------------------------------
 
     def parseData(self, dataString, number=None) -> stream.Score:
-        '''Create HumdrumFile object from a string, and create a music21 Stream from it.
-
-        >>> humData = ('**kern\\n*M2/4\\n=1\\n24r\\n24g#\\n24f#\\n24e\\n24c#\\n' +
-        ...     '24f\\n24r\\n24dn\\n24e-\\n24gn\\n24e-\\n24dn\\n*-')
-        >>> c = converter.subConverters.HumdrumConverter()
-        >>> s = c.parseData(humData)
-        >>> c.stream.show('text')
-        {0.0} <music21.metadata.Metadata object at 0x7f33545027b8>
-        {0.0} <music21.stream.Part spine_0>
-            {0.0} <music21.stream.Measure 1 offset=0.0>
-                {0.0} <music21.meter.TimeSignature 2/4>
-                {0.0} <music21.note.Rest rest>
-                {0.1667} <music21.note.Note G#>
-                {0.3333} <music21.note.Note F#>
-                {0.5} <music21.note.Note E>
-                {0.6667} <music21.note.Note C#>
-                {0.8333} <music21.note.Note F>
-                {1.0} <music21.note.Rest rest>
-                {1.1667} <music21.note.Note D>
-                {1.3333} <music21.note.Note E->
-                {1.5} <music21.note.Note G>
-                {1.6667} <music21.note.Note E->
-                {1.8333} <music21.note.Note D>
+        '''
+        Create HumdrumFile object from a string, and create a music21 Stream from it.
         '''
         # print("parsing krn string", file=sys.stderr)
         hf = HumdrumFile()
@@ -66,10 +44,12 @@ def parseData(self, dataString, number=None) -> stream.Score:
         return self.stream
 
     # pylint: disable=arguments-differ
-    def parseFile(self,
-            filePath: t.Union[str, Path],
-            number: t.Optional[int] = None,
-            **_keywords) -> stream.Score:
+    def parseFile(
+        self,
+        filePath: str | Path,
+        number: int | None = None,
+        **_keywords
+    ) -> stream.Score:
         '''
         Create HumdrumFile object from a file path, and create a music21 Stream from it.
         Note that normally, implementing parseData is sufficient, but Humdrum files
@@ -82,10 +62,17 @@ def parseFile(self,
         return self.stream
 
     # pylint: disable=arguments-differ
-    def write(self, obj, fmt, fp=None, subformats=None,
-                    makeNotation=True, addRecipSpine=False,
-                    expandTremolos=True,
-                    **keywords):
+    def write(
+        self,
+        obj,
+        fmt,
+        fp=None,
+        subformats=None,
+        makeNotation=True,
+        addRecipSpine=False,
+        expandTremolos=True,
+        **keywords
+    ):
         if fp is None:
             fp = self.getTemporaryFile()
         else: