Merge pull request #1558 from cuthbertLab/ct_measure_numbers

Improve measure numbers on ClercqTemperley
cuthbertLab · May 8, 2023 · 42534a3 · 42534a3
2 parents 696545a + 83696c5
commit 42534a3
Show file tree

Hide file tree

Showing 3 changed files with 313 additions and 167 deletions.
diff --git a/music21/converter/__init__.py b/music21/converter/__init__.py
@@ -970,6 +970,7 @@ def getSubConverterFormats(self):
         ('abc', <class 'music21.converter.subConverters.ConverterABC'>)
         ('braille', <class 'music21.converter.subConverters.ConverterBraille'>)
         ('capella', <class 'music21.converter.subConverters.ConverterCapella'>)
+        ('clercqtemperley', <class 'music21.converter.subConverters.ConverterClercqTemperley'>)
         ('cttxt', <class 'music21.converter.subConverters.ConverterClercqTemperley'>)
         ('har', <class 'music21.converter.subConverters.ConverterClercqTemperley'>)
         ('humdrum', <class 'music21.converter.subConverters.ConverterHumdrum'>)

diff --git a/music21/converter/subConverters.py b/music21/converter/subConverters.py
@@ -1397,13 +1397,13 @@ class ConverterClercqTemperley(SubConverter):
     Wrapper for parsing harmonic definitions in Trevor de Clercq and
     David Temperley's format.
     '''
-    registerFormats = ('cttxt', 'har')
-    registerInputExtensions = ('cttxt', 'har')
+    registerFormats = ('cttxt', 'har', 'clercqTemperley')
+    registerInputExtensions = ('cttxt', 'har', 'clercqTemperley')
 
-    def parseData(self, strData, number=None):
+    def parseData(self, strData: str | pathlib.Path, number=None):
         from music21.romanText import clercqTemperley
         ctSong = clercqTemperley.CTSong(strData)
-        self.stream = ctSong.toScore()
+        self.stream = ctSong.toPart()
 
     def parseFile(self,
                   filePath: pathlib.Path | str,