Skip to content

feat: model unmeasured tremolos and the full slash range in mx::api #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
webern merged 3 commits into from
Aug 5, 2026
Merged

feat: model unmeasured tremolos and the full slash range in mx::api #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
445638b
feat: model unmeasured tremolos and the full slash range in mx::api
rpatters1 Aug 3, 2026
b8fb070
Merge branch 'main' into unmeasured-tremolos
webern Aug 4, 2026
17a1264
bump test count
webern Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 33 additions & 16 deletions data/corpus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@
<file version="3.1">synthetic/transpose.3.1.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -811,6 +812,7 @@
<file version="3.1">synthetic/transpose.3.1.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -1222,6 +1224,7 @@
<file version="3.1">synthetic/transpose.3.1.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -1646,6 +1649,7 @@
<file version="3.1">synthetic/transpose.3.1.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -2060,6 +2064,7 @@
<file version="3.1">synthetic/transpose.3.1.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -2474,6 +2479,7 @@
<file version="3.1">synthetic/transpose.3.1.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -2873,6 +2879,7 @@
<file version="3.0">synthetic/toe.3.0.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -3424,6 +3431,7 @@
<file version="3.0">synthetic/toe.3.0.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -3673,6 +3681,7 @@
<file version="3.0">synthetic/toe.3.0.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -3917,6 +3926,7 @@
<file version="3.0">synthetic/toe.3.0.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -4161,6 +4171,7 @@
<file version="3.0">synthetic/toe.3.0.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -4739,6 +4750,7 @@
<file version="3.0">synthetic/toe.3.0.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -5862,7 +5874,7 @@
<file version="3.0">synthetic/word-font.3.0.xml</file>
</synthetic-files>
</element>
<element name="staff" total-files="455" wild-files="123" synthetic-files="332" min-synthetic-version="3.0">
<element name="staff" total-files="456" wild-files="123" synthetic-files="333" min-synthetic-version="3.0">
<wild-files count="123">
<file>custom/segno_coda_roundtrip.3.0.xml</file>
<file>custom/segno_coda_roundtrip.3.1.xml</file>
Expand All @@ -5878,7 +5890,7 @@
<file>foundsuite/Invention_12.xml</file>
<!-- 111 more -->
</wild-files>
<synthetic-files count="332" min-version="3.0">
<synthetic-files count="333" min-version="3.0">
<file version="3.0">synthetic/accent.3.0.xml</file>
<file version="3.0">synthetic/accidental-mark.3.0.xml</file>
<file version="3.1">synthetic/accidental-mark.3.1.xml</file>
Expand Down Expand Up @@ -6184,6 +6196,7 @@
<file version="3.0">synthetic/toe.3.0.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -7210,7 +7223,7 @@
<file version="3.1">synthetic/fermata.3.1.xml</file>
</synthetic-files>
</element>
<element name="ornaments" total-files="68" wild-files="47" synthetic-files="21" min-synthetic-version="3.0">
<element name="ornaments" total-files="69" wild-files="47" synthetic-files="22" min-synthetic-version="3.0">
<attributes>
<attribute name="id" wild-files="0" synthetic-files="1"/>
</attributes>
Expand All @@ -7229,7 +7242,7 @@
<file>foundsuite/Invention_4.xml</file>
<!-- 35 more -->
</wild-files>
<synthetic-files count="21" min-version="3.0">
<synthetic-files count="22" min-version="3.0">
<file version="3.0">synthetic/accidental-mark.3.0.xml</file>
<file version="3.1">synthetic/accidental-mark.3.1.xml</file>
<file version="3.0">synthetic/delayed-inverted-turn.3.0.xml</file>
Expand All @@ -7246,6 +7259,7 @@
<file version="3.0">synthetic/shake.3.0.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/turn.3.0.xml</file>
<file version="3.0">synthetic/vertical-turn.3.0.xml</file>
Expand Down Expand Up @@ -7549,6 +7563,7 @@
<file version="3.0">synthetic/toe.3.0.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -7711,10 +7726,10 @@
<synthetic-files count="0">
</synthetic-files>
</element>
<element name="part-group" total-files="415" wild-files="29" synthetic-files="386" min-synthetic-version="3.0">
<element name="part-group" total-files="416" wild-files="29" synthetic-files="387" min-synthetic-version="3.0">
<attributes>
<attribute name="number" wild-files="29" synthetic-files="0"/>
<attribute name="type" wild-files="29" synthetic-files="386"/>
<attribute name="type" wild-files="29" synthetic-files="387"/>
</attributes>
<wild-files count="29">
<file>custom/transposition.musicxml</file>
Expand All @@ -7731,7 +7746,7 @@
<file>lysuite/ly14a_StaffDetails_LineChanges.xml</file>
<!-- 17 more -->
</wild-files>
<synthetic-files count="386" min-version="3.0">
<synthetic-files count="387" min-version="3.0">
<file version="3.0">synthetic/accent.3.0.xml</file>
<file version="3.0">synthetic/accidental-mark.3.0.xml</file>
<file version="3.1">synthetic/accidental-mark.3.1.xml</file>
Expand Down Expand Up @@ -8091,6 +8106,7 @@
<file version="3.1">synthetic/transpose.3.1.xml</file>
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
<file version="3.0">synthetic/trill-mark.3.0.xml</file>
<file version="3.0">synthetic/triple-tongue.3.0.xml</file>
<file version="3.0">synthetic/tuplet-dot.3.0.xml</file>
Expand Down Expand Up @@ -9358,20 +9374,20 @@
<file version="3.0">synthetic/staccatissimo.3.0.xml</file>
</synthetic-files>
</element>
<element name="tremolo" total-files="14" wild-files="12" synthetic-files="2" min-synthetic-version="3.0">
<element name="tremolo" total-files="15" wild-files="12" synthetic-files="3" min-synthetic-version="3.0">
<attributes>
<attribute name="type" wild-files="9" synthetic-files="2"/>
<attribute name="default-x" wild-files="6" synthetic-files="2"/>
<attribute name="default-y" wild-files="6" synthetic-files="2"/>
<attribute name="type" wild-files="9" synthetic-files="3"/>
<attribute name="default-x" wild-files="6" synthetic-files="3"/>
<attribute name="default-y" wild-files="6" synthetic-files="3"/>
<attribute name="color" wild-files="0" synthetic-files="2"/>
<attribute name="font-family" wild-files="0" synthetic-files="2"/>
<attribute name="font-size" wild-files="0" synthetic-files="2"/>
<attribute name="font-style" wild-files="0" synthetic-files="2"/>
<attribute name="font-weight" wild-files="0" synthetic-files="2"/>
<attribute name="placement" wild-files="0" synthetic-files="2"/>
<attribute name="relative-x" wild-files="0" synthetic-files="2"/>
<attribute name="relative-y" wild-files="0" synthetic-files="2"/>
<attribute name="smufl" wild-files="0" synthetic-files="1"/>
<attribute name="placement" wild-files="0" synthetic-files="3"/>
<attribute name="relative-x" wild-files="0" synthetic-files="3"/>
<attribute name="relative-y" wild-files="0" synthetic-files="3"/>
<attribute name="smufl" wild-files="0" synthetic-files="2"/>
</attributes>
<wild-files count="12">
<file>foundsuite/Berlioz_Le_Corsaire.xml</file>
Expand All @@ -9387,9 +9403,10 @@
<file>musuite/testTremolo.xml</file>
<file>recsuite/ActorPreludeSample.xml</file>
</wild-files>
<synthetic-files count="2" min-version="3.0">
<synthetic-files count="3" min-version="3.0">
<file version="3.0">synthetic/tremolo.3.0.xml</file>
<file version="3.1">synthetic/tremolo.3.1.xml</file>
<file version="3.1">synthetic/tremolo.unmeasured.3.1.xml</file>
</synthetic-files>
</element>
<element name="fret" total-files="16" wild-files="11" synthetic-files="5" min-synthetic-version="3.0">
Expand Down
84 changes: 84 additions & 0 deletions data/synthetic/tremolo.unmeasured.3.1.features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated by `python3 -m audit files`. The element/attribute surface of the
sibling corpus file. Do not edit by hand; regenerate with the audit tool. -->
<feature-audit>
<audited>synthetic/tremolo.unmeasured.3.1.xml</audited>
<audited-version>3.1</audited-version>
<features>
<feature>
<name>grace</name>
</feature>
<feature>
<name>measure</name>
<attributes>
<attribute>number</attribute>
</attributes>
</feature>
<feature>
<name>notations</name>
</feature>
<feature>
<name>note</name>
</feature>
<feature>
<name>octave</name>
</feature>
<feature>
<name>ornaments</name>
</feature>
<feature>
<name>part</name>
<attributes>
<attribute>id</attribute>
</attributes>
</feature>
<feature>
<name>part-group</name>
<attributes>
<attribute>type</attribute>
</attributes>
</feature>
<feature>
<name>part-list</name>
</feature>
<feature>
<name>part-name</name>
</feature>
<feature>
<name>pitch</name>
</feature>
<feature>
<name>score-part</name>
<attributes>
<attribute>id</attribute>
</attributes>
</feature>
<feature>
<name>score-partwise</name>
<attributes>
<attribute>version</attribute>
</attributes>
</feature>
<feature>
<name>staff</name>
</feature>
<feature>
<name>step</name>
</feature>
<feature>
<name>tremolo</name>
<attributes>
<attribute>default-x</attribute>
<attribute>default-y</attribute>
<attribute>placement</attribute>
<attribute>relative-x</attribute>
<attribute>relative-y</attribute>
<attribute>smufl</attribute>
<attribute>type</attribute>
</attributes>
</feature>
<feature>
<name>voice</name>
</feature>
</features>
</feature-audit>
30 changes: 30 additions & 0 deletions data/synthetic/tremolo.unmeasured.3.1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<score-partwise version="3.1">
<part-list>
<part-group type="start">
</part-group>
<score-part id="id1">
<part-name>x</part-name>
</score-part>
<part-group type="stop">
</part-group>
</part-list>
<part id="id1">
<measure number="x">
<note>
<grace />
<pitch>
<step>A</step>
<octave>1</octave>
</pitch>
<voice>1</voice>
<staff>1</staff>
<notations>
<ornaments>
<tremolo type="unmeasured" default-x="1" default-y="1" relative-x="1" relative-y="1" placement="above" smufl="pendereckiTremolo">0</tremolo>
</ornaments>
</notations>
</note>
</measure>
</part>
</score-partwise>
25 changes: 16 additions & 9 deletions src/include/mx/api/MarkData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,21 @@ enum class MarkType
mordent,
invertedMordent,
schleifer,
tremoloSingleOne, ///< A tremolo on a single note (a glyph, not a spanner) with 1 slash
tremoloSingleTwo, ///< A tremolo on a single note (a glyph, not a spanner) with 2 slashes
tremoloSingleThree, ///< A tremolo on a single note (a glyph, not a spanner) with 3 slashes
tremoloSingleFour, ///< A tremolo on a single note (a glyph, not a spanner) with 4 slashes
tremoloSingleFive, ///< A tremolo on a single note (a glyph, not a spanner) with 5 slashes
// One-note tremolos: slashes struck through the stem of a single note, not a spanner across
// two. MusicXML allows 1 through 8 of them. SMuFL provides a precomposed glyph for only the
// first five (tremolo1 through tremolo5); because those are combining marks, a renderer builds
// the higher counts by stacking them.
tremoloSingleOne, ///< A one-note tremolo with 1 slash
tremoloSingleTwo, ///< A one-note tremolo with 2 slashes
tremoloSingleThree, ///< A one-note tremolo with 3 slashes, the customary number
tremoloSingleFour, ///< A one-note tremolo with 4 slashes
tremoloSingleFive, ///< A one-note tremolo with 5 slashes
tremoloSingleSix, ///< A one-note tremolo with 6 slashes
tremoloSingleSeven, ///< A one-note tremolo with 7 slashes
tremoloSingleEight, ///< A one-note tremolo with 8 slashes
tremoloStart, ///< The first note of a measured (two-note) tremolo; slash count is in MarkData::choice
tremoloStop, ///< The second note of a measured (two-note) tremolo; slash count is in MarkData::choice
tremoloUnmeasured, ///< An unmeasured tremolo (buzz roll); its glyph is named in MarkData::choice
otherOrnament, ///< MusicXML's 'other-ornament' value
unknownOrnament, ///< Error state

Expand Down Expand Up @@ -272,10 +280,9 @@ struct MarkData
Bool fingeringAlternate;

// Payload for mark types whose data does not fit the common fields above. Its Kind SHOULD
// correspond to markType (e.g. MarkDataChoice::Kind::tremolo pairs with
// MarkType::tremoloStart/tremoloStop), but this is a convention that MarkData does not
// enforce. New mark-specific data belongs here, as a new MarkDataChoice alternative -- see
// MarkDataChoice.h.
// correspond to markType (e.g. MarkDataChoice::Kind::tremolo pairs with the MarkType::tremolo*
// values), but this is a convention that MarkData does not enforce. New mark-specific data
// belongs here, as a new MarkDataChoice alternative -- see MarkDataChoice.h.
MarkDataChoice choice;

MarkData();
Expand Down
Loading
Loading