Back out previous fix, make a better fix.

Author: gregchapman-dev

musicdiff/comparison.py

@@ -1214,13 +1214,13 @@ def _notes_set_distance(original: list[AnnNote], compare_to: list[AnnNote]):
         if unpaired_orig_notes:
             for an in unpaired_orig_notes:
                 cost += an.notation_size()
-                op_list.append(("notedel", an, None, an.notation_size()))
+                op_list.append(("notedel", an, None, an.notation_size(), an.note_idx_in_chord))
 
         # noteins
         if unpaired_comp_notes:
             for an in unpaired_comp_notes:
                 cost += an.notation_size()
-                op_list.append(("noteins", None, an, an.notation_size()))
+                op_list.append(("noteins", None, an, an.notation_size(), an.note_idx_in_chord))
 
         # notesub
         if paired_notes:

musicdiff/visualization.py

@@ -655,6 +655,11 @@ def mark_diffs(
                 if t.TYPE_CHECKING:
                     assert noteOrChord2 is not None
                 if len(op) >= 5 and op[4] is not None:
+                    if not isinstance(noteOrChord2, m21.chord.ChordBase):
+                        # Can happen if imported xml has repeated xml:id values,
+                        # so getElementById returns an unexpected GeneralNote.
+                        # Don't crash, but we won't color the note either.
+                        continue
                     note2 = noteOrChord2.notes[op[4]]
                 else:
                     note2 = noteOrChord2
@@ -676,6 +681,11 @@ def mark_diffs(
                 if t.TYPE_CHECKING:
                     assert noteOrChord1 is not None
                 if len(op) >= 5 and op[4] is not None:
+                    if not isinstance(noteOrChord1, m21.chord.ChordBase):
+                        # Can happen if imported xml has repeated xml:id values,
+                        # so getElementById returns an unexpected GeneralNote.
+                        # Don't crash, but we won't color the note either.
+                        continue
                     note1 = noteOrChord1.notes[op[4]]
                 else:
                     note1 = noteOrChord1
@@ -2365,6 +2375,11 @@ def get_text_output(
                 if t.TYPE_CHECKING:
                     assert noteOrChord2 is not None
                 if len(op) >= 5 and op[4] is not None:
+                    if not isinstance(noteOrChord2, m21.chord.ChordBase):
+                        # Can happen if imported xml has repeated xml:id values,
+                        # so getElementById returns an unexpected GeneralNote.
+                        # Don't crash, but we won't color the note either.
+                        continue
                     note2 = noteOrChord2.notes[op[4]]
                 else:
                     note2 = noteOrChord2
@@ -2384,6 +2399,11 @@ def get_text_output(
                 if t.TYPE_CHECKING:
                     assert noteOrChord1 is not None
                 if len(op) >= 5 and op[4] is not None:
+                    if not isinstance(noteOrChord1, m21.chord.ChordBase):
+                        # Can happen if imported xml has repeated xml:id values,
+                        # so getElementById returns an unexpected GeneralNote.
+                        # Don't crash, but we won't color the note either.
+                        continue
                     note1 = noteOrChord1.notes[op[4]]
                 else:
                     note1 = noteOrChord1