diff --git a/importexport/musicxml/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp index b4ba4dbc49b71..b90de6f82e221 100644 --- a/importexport/musicxml/importmxmlpass2.cpp +++ b/importexport/musicxml/importmxmlpass2.cpp @@ -3845,7 +3845,9 @@ void MusicXMLParserDirection::textToDynamic(QString& text) const QString simplifiedText = MScoreTextToMXML::toPlainText(text).simplified(); // Correct finale's incorrect dynamic export if (_pass1.exporterString().contains("finale")) { - static const std::map finaleDynamicSubs = { { "π", "pp" }, { "P", "mp" }, { "F", "mf" }, { "ƒ", "ff" } }; + static const std::map finaleDynamicSubs + = { { "π", "pp" }, { "P", "mp" }, { "F", "mf" }, { "ƒ", "ff" }, { "Ï", "fff" }, + { "S", "sf" }, { "ß", "sfz" }, { "Z", "fz" }, { "Í", "fp" } }; for (const auto& sub : finaleDynamicSubs) { if (simplifiedText == sub.first) { simplifiedText = sub.second; diff --git a/mtest/musicxml/io/testFinaleDynamics.xml b/mtest/musicxml/io/testFinaleDynamics.xml index 9796344322646..544fb343e01af 100644 --- a/mtest/musicxml/io/testFinaleDynamics.xml +++ b/mtest/musicxml/io/testFinaleDynamics.xml @@ -123,6 +123,12 @@ quarter down + + + Ï + + + B @@ -149,6 +155,12 @@ quarter down + + + S + + + B @@ -177,6 +189,12 @@ quarter down + + + ß + + + B @@ -203,6 +221,12 @@ quarter down + + + Z + + + B @@ -231,6 +255,12 @@ quarter down + + + Í + + + B diff --git a/mtest/musicxml/io/testFinaleDynamics_ref.mscx b/mtest/musicxml/io/testFinaleDynamics_ref.mscx index 3d8214e50760e..c08211cafb038 100644 --- a/mtest/musicxml/io/testFinaleDynamics_ref.mscx +++ b/mtest/musicxml/io/testFinaleDynamics_ref.mscx @@ -151,6 +151,7 @@ pp 33 + down quarter @@ -160,6 +161,11 @@ 19 + + fff + 33 + down + quarter down @@ -171,6 +177,7 @@ p 49 + down quarter @@ -180,6 +187,11 @@ 19 + + sf + 33 + down + quarter down @@ -195,6 +207,7 @@ mp 64 + down quarter @@ -204,6 +217,11 @@ 19 + + sfz + 33 + down + quarter down @@ -215,6 +233,7 @@ mf 80 + down quarter @@ -224,6 +243,11 @@ 19 + + fz + 33 + down + quarter down @@ -239,6 +263,7 @@ f 96 + down quarter @@ -248,6 +273,11 @@ 19 + + fp + 33 + down + quarter down @@ -259,6 +289,7 @@ ff 112 + down quarter