Fix GH#24941: revert exchange of staccatissimo and spiccato

Backport of musescore#25428
Jojo-Schmitz · Feb 27, 2025 · 60ecc37 · 60ecc37
1 parent 60280a3
commit 60ecc37
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/importexport/musicxml/exportxml.cpp b/importexport/musicxml/exportxml.cpp
@@ -2863,6 +2863,8 @@ static std::vector<QString> symIdToArtics(const SymId sid)
                   return { "staccato" };
                   break;
 
+            case SymId::articStaccatissimoAbove:
+            case SymId::articStaccatissimoBelow:
             case SymId::articStaccatissimoWedgeAbove:
             case SymId::articStaccatissimoWedgeBelow:
                   return { "staccatissimo" };
@@ -2933,8 +2935,6 @@ static std::vector<QString> symIdToArtics(const SymId sid)
                   return { "tenuto", "accent" };
                   break;
 
-            case SymId::articStaccatissimoAbove:
-            case SymId::articStaccatissimoBelow:
             case SymId::articStaccatissimoStrokeAbove:
             case SymId::articStaccatissimoStrokeBelow:
                   return { "spiccato" };

diff --git a/importexport/musicxml/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp
@@ -1288,8 +1288,8 @@ static bool convertArticulationToSymId(const QString& mxmlName, SymId& id)
       map["staccato"]               = SymId::articStaccatoAbove;
       map["tenuto"]                 = SymId::articTenutoAbove;
       map["detached-legato"]        = SymId::articTenutoStaccatoAbove;
-      map["staccatissimo"]          = SymId::articStaccatissimoWedgeAbove;
-      map["spiccato"]               = SymId::articStaccatissimoAbove;
+      map["staccatissimo"]          = SymId::articStaccatissimoAbove;
+      map["spiccato"]               = SymId::articStaccatissimoStrokeAbove;
       map["stress"]                 = SymId::articStressAbove;
       map["unstress"]               = SymId::articUnstressAbove;
       map["soft-accent"]            = SymId::articSoftAccentAbove;

diff --git a/mtest/musicxml/io/testNoteAttributes2_ref.mscx b/mtest/musicxml/io/testNoteAttributes2_ref.mscx
@@ -185,7 +185,7 @@
           <Chord>
             <durationType>quarter</durationType>
             <Articulation>
-              <subtype>articStaccatissimoWedgeAbove</subtype>
+              <subtype>articStaccatissimoAbove</subtype>
               </Articulation>
             <StemDirection>down</StemDirection>
             <Note>
@@ -196,7 +196,7 @@
           <Chord>
             <durationType>quarter</durationType>
             <Articulation>
-              <subtype>articStaccatissimoWedgeAbove</subtype>
+              <subtype>articStaccatissimoAbove</subtype>
               </Articulation>
             <StemDirection>down</StemDirection>
             <Note>
@@ -451,7 +451,7 @@
           <Chord>
             <durationType>quarter</durationType>
             <Articulation>
-              <subtype>articStaccatissimoBelow</subtype>
+              <subtype>articStaccatissimoStrokeBelow</subtype>
               </Articulation>
             <StemDirection>up</StemDirection>
             <Note>