From 8a11fca2703929366d0c874ce0da73d1d53de05a Mon Sep 17 00:00:00 2001 From: asattely Date: Wed, 15 Mar 2023 20:56:04 +0100 Subject: [PATCH] Changing MusicXML export of "Soft Accent Tenuto Staccato" from `{ "staccato", "soft-accent", "tenuto" }` to `{ "soft-accent", "detached-legato" }`, and changing the order a bit to match how #16828 is doing it for master now. Adds to an earlier backport of #8190 to 3.x --- importexport/musicxml/exportxml.cpp | 31 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/importexport/musicxml/exportxml.cpp b/importexport/musicxml/exportxml.cpp index 9d7a86fe3b0bc..81b41dfa32508 100644 --- a/importexport/musicxml/exportxml.cpp +++ b/importexport/musicxml/exportxml.cpp @@ -2535,6 +2535,21 @@ static std::vector symIdToArtics(const SymId sid) return { "soft-accent" }; break; + case SymId::articSoftAccentStaccatoAbove: + case SymId::articSoftAccentStaccatoBelow: + return { "soft-accent", "staccato" }; + break; + + case SymId::articSoftAccentTenutoAbove: + case SymId::articSoftAccentTenutoBelow: + return { "soft-accent", "tenuto" }; + break; + + case SymId::articSoftAccentTenutoStaccatoAbove: + case SymId::articSoftAccentTenutoStaccatoBelow: + return { "soft-accent", "detached-legato" }; + break; + case SymId::articStressAbove: case SymId::articStressBelow: return { "stress" }; @@ -2565,22 +2580,6 @@ static std::vector symIdToArtics(const SymId sid) return { "tenuto", "accent" }; break; - case SymId::articSoftAccentStaccatoAbove: - case SymId::articSoftAccentStaccatoBelow: - return { "staccato", "soft-accent" }; - break; - - case SymId::articSoftAccentTenutoAbove: - case SymId::articSoftAccentTenutoBelow: - return { "soft-accent", "tenuto" }; - break; - - - case SymId::articSoftAccentTenutoStaccatoAbove: - case SymId::articSoftAccentTenutoStaccatoBelow: - return { "staccato", "soft-accent", "tenuto" }; - break; - default: ; // nothing break;