Fix #16748: Fix articulation combinations on MXML import / export, and ensure placement of articulations is respected #16828
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I'm out of time today but I will have tests for this one tomorrow, please stand by! |
|
Maybe #8514 would be a better basis? |
|
|
||
| case SymId::articSoftAccentTenutoStaccatoAbove: | ||
| case SymId::articSoftAccentTenutoStaccatoBelow: | ||
| return { "soft-accent", "detached-legato" }; |
There was a problem hiding this comment.
Not return { "staccato", "soft-accent", "tenuto" };?
There was a problem hiding this comment.
nope, detached-legato is the glyph for combined staccato and tenuto markings
There was a problem hiding this comment.
OK, thanks for checking anyway ;-)
|
One unit test (the newly added one) needs fixing, https://github.com/musescore/MuseScore/actions/runs/4428468868/jobs/7767593095?pr=16828#step:9:9196 |
oktophonie
approved these changes
Mar 15, 2023
asattely
force-pushed
the
xml-combined-articulation
branch
from
396667d
to
6206829
Compare
this is a port of PR musescore#8190 with a few alterations, namely, the skipping of combination when the placements are not the same.
and ensure that correct articulation placement information is exported when changed from default
asattely
force-pushed
the
xml-combined-articulation
branch
from
6206829
to
af4bc5e
Compare
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Mar 15, 2023
from `{ "staccato", "soft-accent", "tenuto" }` to `{ "soft-accent", "detached-legato" }`, and changing the order a bit to match how musescore#16828 is doing it for master now.
asattely
force-pushed
the
xml-combined-articulation
branch
from
af4bc5e
to
0d9003a
Compare
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Mar 15, 2023
from `{ "staccato", "soft-accent", "tenuto" }` to `{ "soft-accent", "detached-legato" }`, and changing the order a bit to match how musescore#16828 is doing it for master now.
Adds to an earlier backport of musescore#8190 to 3.x
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Mar 15, 2023
from `{ "staccato", "soft-accent", "tenuto" }` to `{ "soft-accent", "detached-legato" }`, and changing the order a bit to match how musescore#16828 is doing it for master now.
Adds to an earlier backport of musescore#8190 to 3.x
RomanPudashkin
approved these changes
Mar 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves: #16748
This PR began as a direct port of #8190, which deals with articulation marks combining (such as tenuto-staccato being a single combined glyph). We also take care not to combine when the placement of the accidentals suggest that they have been manually set at one placement or another.
In testing this PR, I noticed that musescore doesn't export articulation placement at all, so I added that in as well, as per the MusicXML spec.