musicxml: keep postfix markup in the measure of its note

The postfix events after a note (-., ^\markup, ...) follow the note in
the music tree, so the note was completed before them. When the note
completed a measure, its markup was put in the next measure, together
with the markup of that one.

The postfix events are now part of the note they follow, as for the
\rest command. This makes test_markup pass; the case with a \mark is
from #193, which addresses the same problem.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CMyxTwm2w6VtbxBdt5dL1T

Author: claude

ly/musicxml/lymus2musxml.py

@@ -157,14 +157,16 @@ def parse_nodes(self, nodes):
 
     def leave_note(self, node=None):
         """Complete the current note (or rest or chord) when the node,
-        if given, is not part of it."""
+        if given, is not part of it. The postfix events after a note
+        (-., ^\\markup, ...) are part of it, so that e.g. its markup is in
+        the measure of the note, also when the note completes the measure."""
         if self.note_node:
             n = node.node if isinstance(node, End) else node
             if isinstance(n, ly.music.items.Command) and n.token == '\\rest':
                 # makes the note before it a rest
                 return
             while n:
-                if n is self.note_node:
+                if n is self.note_node or isinstance(n, ly.music.items.Postfix):
                     return
                 n = n.parent()
             self.mediator.end_note()

tests/test_musicxml_measures.py

@@ -170,3 +170,29 @@ def test_voices_with_tuplets():
 def test_passing_bar_checks_after_time_change(capsys):
     convert(r"{ \time 3/4 c'2. | \time 2/4 c'2 | c'4 c' | }")
     assert 'bar check' not in capsys.readouterr().out.lower()
+
+
+def words(root, part=0):
+    return [[w.text.strip() for w in m.iter('words')] for m in measures(root, part)]
+
+
+def test_markup_of_note_completing_measure():
+    root = convert(r"""\relative {
+  a'1-\markup intenso |
+  a1^\markup dolce |
+  a2_\markup { poco più forte } a2
+}""")
+    assert words(root) == [['intenso'], ['dolce'], ['poco più forte']]
+    validate(root)
+
+
+def test_markup_of_note_and_mark_in_next_measure():
+    # from #193
+    root = convert(r"""\relative {
+  a'1^\markup intenso |
+  \mark \markup Coda
+  a1 |
+  a1
+}""")
+    assert words(root) == [['intenso'], ['Coda'], []]
+    validate(root)

tests/test_xml.py

@@ -7,7 +7,6 @@
 import os
 import os.path
 import io
-import pytest
 import re
 import sys
 
@@ -62,7 +61,6 @@ def test_church():
     compare_output('church_modes')
 
 
-@pytest.mark.xfail
 def test_markup():
     compare_output('markup')
 

tests/test_xml_files/markup.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 4.0 Partwise//EN"
                                 "http://www.musicxml.org/dtds/partwise.dtd">
 <score-partwise version="4.0">