gregchapman-dev
diff --git a/‎ReleaseNotes_4.1.0.txt‎
Lines changed: 3 additions & 3 deletions b/‎ReleaseNotes_4.1.0.txt‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎musicdiff/__init__.py‎
Lines changed: 1 addition & 1 deletion b/‎musicdiff/__init__.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎musicdiff/__main__.py‎
Lines changed: 1 addition & 1 deletion b/‎musicdiff/__main__.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎musicdiff/annotation.py‎
Lines changed: 103 additions & 63 deletions b/‎musicdiff/annotation.py‎
Lines changed: 103 additions & 63 deletions
@@ -9,10 +9,10 @@ Changes since 4.0.0:
     In support of SER, notation_sizes (a.k.a. symbol counts) and diff costs (a.k.a.
         symbolic error counts) have been reviewed and updated:
         AnnNote.notation_size(): add 1 symbol for slash on grace note
-        AnnExtra.notation_size(): 1 symbol for the text, add 1 symbol if there is any
+        AnnExtra.notation_size(): len(text) for the text, add 1 symbol if there is any
             style specified
-        AnnExtra diff error count: text diff is 1 symbol error, offset diff is 1 symbol
-            error, duration diff is 1 symbol error, style diff is 1 symbol error
+        AnnExtra diff error count: text diff is Levenshtein distance, offset diff is
+            1 symbol error, duration diff is 1 symbol error, style diff is 1 symbol error
         AnnLyric.notation_size(): use len(text) as symbol count instead of 1;
             add 1 symbol if there's a verse number;
             add 1 symbol if there's a verse identifier different from the number;
 
@@ -6,7 +6,7 @@
 #                   https://github.com/fosfrancesco/music-score-diff.git
 #                   by Francesco Foscarin <[email protected]>
 #
-# Copyright:     (c) 2022-2024 Francesco Foscarin, Greg Chapman
+# Copyright:     (c) 2022-2025 Francesco Foscarin, Greg Chapman
 # License:       MIT, see LICENSE
 # ------------------------------------------------------------------------------
 
 
@@ -9,7 +9,7 @@
 #                   https://github.com/fosfrancesco/music-score-diff.git
 #                   by Francesco Foscarin <[email protected]>
 #
-# Copyright:     (c) 2022-2024 Francesco Foscarin, Greg Chapman
+# Copyright:     (c) 2022-2025 Francesco Foscarin, Greg Chapman
 # License:       MIT, see LICENSE
 # ------------------------------------------------------------------------------
 import sys
 
@@ -8,7 +8,7 @@
 #                   https://github.com/fosfrancesco/music-score-diff.git
 #                   by Francesco Foscarin <[email protected]>
 #
-# Copyright:     (c) 2022-2024 Francesco Foscarin, Greg Chapman
+# Copyright:     (c) 2022-2025 Francesco Foscarin, Greg Chapman
 # License:       MIT, see LICENSE
 # ------------------------------------------------------------------------------
 
@@ -649,50 +649,29 @@ def __init__(
                 Style, Metadata, or Voicing.
         """
         self.extra = extra.id
-        self.offset: OffsetQL
-        self.duration: OffsetQL
-        self.numNotes: int = 1
-
-        if isinstance(extra, m21.spanner.Spanner):
-            self.numNotes = len(extra)
-            firstNote: m21.note.GeneralNote | m21.spanner.SpannerAnchor = (
-                M21Utils.getPrimarySpannerElement(extra)
-            )
-            lastNote: m21.note.GeneralNote | m21.spanner.SpannerAnchor = (
-                extra.getLast()
-            )
-            self.offset = firstNote.getOffsetInHierarchy(measure)
-            # to compute duration we need to use offset-in-score, since the end note might
-            # be in another Measure.  Except for ArpeggioMarkSpanners, where the duration
-            # doesn't matter, so we just set it to 0, rather than figuring out the longest
-            # duration in all the notes/chords in the arpeggio.
-            if isinstance(extra, m21.expressions.ArpeggioMarkSpanner):
-                self.duration = 0.
-            else:
-                startOffsetInScore: OffsetQL = firstNote.getOffsetInHierarchy(score)
-                try:
-                    endOffsetInScore: OffsetQL = opFrac(
-                        lastNote.getOffsetInHierarchy(score) + lastNote.duration.quarterLength
-                    )
-                except m21.sites.SitesException:
-                    endOffsetInScore = startOffsetInScore
-                self.duration = opFrac(endOffsetInScore - startOffsetInScore)
-        elif isinstance(extra, m21.bar.Barline):
-            # we ignore offset for barlines; barline offset is derived from the objects in the
-            # measure, which are already being compared.
-            self.offset = 0.0
-            self.duration = extra.duration.quarterLength
-        elif isinstance(extra, m21.harmony.ChordSymbol):
-            # we ignore duration for ChordSymbols, it is often 0.0 or 1.0, and meaningless.
-            self.offset = extra.getOffsetInHierarchy(measure)
-            self.duration = 0.0
-        else:
-            self.offset = extra.getOffsetInHierarchy(measure)
-            self.duration = extra.duration.quarterLength
-
-        self.content: str = M21Utils.extra_to_string(extra, detail)
+        self.kind: str = M21Utils.extra_to_kind(extra)
         self.styledict: dict = {}
 
+        # kind-specific fields (set to None if not relevant)
+
+        # content is a string that (if not None) should be counted as 1 symbol per character
+        # (e.g. "con fiero")
+        self.content: str | None = M21Utils.extra_to_string(extra, self.kind, detail)
+
+        # symbolic is a string that (if not None) should be counted as 1 symbol (e.g. "G2+8")
+        self.symbolic: str | None = M21Utils.extra_to_symbolic(extra, self.kind, detail)
+
+        # offset and/or duration are sometimes relevant
+        self.offset: OffsetQL | None = None
+        self.duration: OffsetQL | None = None
+        self.offset, self.duration = M21Utils.extra_to_offset_and_duration(
+            extra, self.kind, measure, score, detail
+        )
+
+        # infodict (kind-specific elements; each element is worth one musical symbol)
+        self.infodict: dict[str, str] = M21Utils.extra_to_infodict(extra, self.kind, detail)
+
+        # styledict
         if DetailLevel.includesStyle(detail):
             if not isinstance(extra, m21.harmony.ChordSymbol):
                 # We don't (yet) compare style of ChordSymbols, because Humdrum has no way (yet)
@@ -705,8 +684,7 @@ def __init__(
                     smuflTextSuppressed: bool = False
                     if (isinstance(extra, m21.tempo.MetronomeMark)
                             and not extra.textImplicit
-                            and extra.text
-                            and not self.content.startswith('MM:TX:')):
+                            and M21Utils.parse_note_equal_num(extra.text) != (None, None)):
                         smuflTextSuppressed = True
 
                     self.styledict = M21Utils.obj_to_styledict(
@@ -728,43 +706,102 @@ def notation_size(self) -> int:
             int: The notation size of the annotated extra
         """
         if self._cached_notation_size is None:
-            cost: int = len(self.content)
-            cost += 2  # for offset and duration
+            cost: int = 0
+            if self.content is not None:
+                cost += len(self.content)
+            if self.symbolic is not None:
+                cost += 1
+            if self.offset is not None:
+                cost += 1
+            if self.duration is not None:
+                cost += 1
+            cost += len(self.infodict)
             if self.styledict:
-                cost += 1  # someday we might count items in styledict
+                cost += 1  # someday we might add len(styledict) instead of 1
             self._cached_notation_size = cost
 
         return self._cached_notation_size
 
     def readable_str(self, name: str = "", idx: int = 0, changedStr: str = "") -> str:
-        string: str = self.content
+        string: str = self.content or ""
+        if self.symbolic:
+            if string:
+                string += " "
+            string += self.symbolic
+        if self.infodict and name != "info":
+            for i, k in enumerate(self.infodict):
+                if string:
+                    string += " "
+                string += f"{k}:{self.infodict[k]}"
+
         if name == "":
-            if self.duration > 0:
-                string += f" dur={M21Utils.ql_to_string(self.duration)}"
-            if self.numNotes != 1:
-                string += f" numNotes={self.numNotes}"
+            if self.duration is not None:
+                if string:
+                    string += " "
+                string += f"dur={M21Utils.ql_to_string(self.duration)}"
             return string
 
         if name == "content":
-            return string
+            if self.content is None:
+                return ""
+            return self.content
+
+        if name == "symbolic":
+            if self.symbolic is None:
+                return ""
+            return self.symbolic
 
         if name == "offset":
-            string += f" offset={M21Utils.ql_to_string(self.offset)}"
+            if self.offset is None:
+                return ""
+            if string:
+                string += " "
+            string += f"offset={M21Utils.ql_to_string(self.offset)}"
             return string
 
         if name == "duration":
-            string += f" dur={M21Utils.ql_to_string(self.duration)}"
+            if self.duration is None:
+                return ""
+            if string:
+                string += " "
+            string += f"dur={M21Utils.ql_to_string(self.duration)}"
             return string
 
-        if name == "style":
+        if name == "info":
             changedKeys: list[str] = changedStr.split(',')
             if not changedKeys:
-                string += " changedStyle={}"
+                if string:
+                    string += " "
+                string += "changedInfo={}"
                 return string
 
-            string += " changedStyle={"
+            if string:
+                string += " "
+            string += "changedInfo={"
 
             needsComma: bool = False
+            for i, k in enumerate(changedKeys):
+                if k in self.infodict:
+                    if needsComma:
+                        string += ", "
+                    string += f"{k}:{self.infodict[k]}"
+                    needsComma = True
+            string += "}"
+            return string
+
+        if name == "style":
+            changedKeys = changedStr.split(',')
+            if not changedKeys:
+                if string:
+                    string += " "
+                string += "changedStyle={}"
+                return string
+
+            if string:
+                string += " "
+            string += "changedStyle={"
+
+            needsComma = False
             for i, k in enumerate(changedKeys):
                 if k in self.styledict:
                     if needsComma:
@@ -788,9 +825,11 @@ def __str__(self) -> str:
         Returns:
             str: the compared representation of the AnnExtra. Does not consider music21 id.
         """
-        string = f'{self.content},off={self.offset},dur={self.duration}'
-        if self.numNotes != 1:
-            string += f',numNotes={self.numNotes}'
+        string = f'{self.kind},content={self.content},symbol={self.symbolic}'
+        string += f',off={self.offset},dur={self.duration}'
+        # then any info fields
+        for k, v in self.infodict.items():
+            string += f",{k}={v}"
         # and then any style fields
         for k, v in self.styledict.items():
             string += f",{k}={v}"
@@ -1187,7 +1226,8 @@ def __init__(
 
         # For correct comparison, sort the extras_list, so that any extras
         # that all have the same offset are sorted alphabetically.
-        self.extras_list.sort(key=lambda e: (e.offset, str(e)))
+        # 888 need to sort by class here?  Or not at all?
+        self.extras_list.sort(key=lambda e: (e.kind, e.offset))
 
         self.lyrics_list: list[AnnLyric] = []
         if DetailLevel.includesLyrics(detail):
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# https://github.com/fosfrancesco/music-score-diff.git`
`7`	`7`	`# by Francesco Foscarin <[email protected]>`
`8`	`8`	`#`
`9`		`-# Copyright: (c) 2022-2024 Francesco Foscarin, Greg Chapman`
	`9`	`+# Copyright: (c) 2022-2025 Francesco Foscarin, Greg Chapman`
`10`	`10`	`# License: MIT, see LICENSE`
`11`	`11`	`# ------------------------------------------------------------------------------`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`# https://github.com/fosfrancesco/music-score-diff.git`
`10`	`10`	`# by Francesco Foscarin <[email protected]>`
`11`	`11`	`#`
`12`		`-# Copyright: (c) 2022-2024 Francesco Foscarin, Greg Chapman`
	`12`	`+# Copyright: (c) 2022-2025 Francesco Foscarin, Greg Chapman`
`13`	`13`	`# License: MIT, see LICENSE`
`14`	`14`	`# ------------------------------------------------------------------------------`
`15`	`15`	`import sys`