Improve export of technical indications

Backport of musescore#20252
Jojo-Schmitz · Dec 2, 2023 · 8d58fe4 · 8d58fe4
1 parent 4d9efea
commit 8d58fe4
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 10 deletions.
diff --git a/importexport/musicxml/exportxml.cpp b/importexport/musicxml/exportxml.cpp
@@ -2910,26 +2910,67 @@ static QString symIdToOrnam(const SymId sid)
 static QString symIdToTechn(const SymId sid)
       {
       switch (sid) {
-            case SymId::brassMuteClosed:
-                  return "stopped";
-                  break;
-            case SymId::stringsHarmonic:
-                  return "harmonic";
-                  break;
             case SymId::stringsUpBow:
                   return "up-bow";
                   break;
             case SymId::stringsDownBow:
                   return "down-bow";
                   break;
+            case SymId::stringsHarmonic:
+                  return "harmonic";
+                  break;
+            case SymId::stringsThumbPosition:
+            case SymId::stringsThumbPositionTurned:
+                  return "thumb-position";
+                  break;
+            case SymId::doubleTongueAbove:
+            case SymId::doubleTongueBelow:
+                  return "double-tongue";
+                  break;
+            case SymId::tripleTongueAbove:
+            case SymId::tripleTongueBelow:
+                  return "triple-tongue";
+                  break;
+            case SymId::brassMuteClosed:
+                  return "stopped";
+                  break;
             case SymId::pluckedSnapPizzicatoAbove:
+            case SymId::pluckedSnapPizzicatoBelow:
                   return "snap-pizzicato";
                   break;
+            case SymId::keyboardPedalHeel1:
+            case SymId::keyboardPedalHeel2:
+            case SymId::keyboardPedalHeel3:
+                  return "heel";
+                  break;
+            case SymId::keyboardPedalToe1:
+            case SymId::keyboardPedalToe2:
+                  return "toe";
+                  break;
+            case SymId::pluckedWithFingernails:
+                  return "fingernails";
+                  break;
+            case SymId::brassBend:
+                  return "brass-bend";
+                  break;
+            case SymId::brassFlip:
+                  return "brass-flip";
+                  break;
+            case SymId::brassSmear:
+                  return "smear";
+                  break;
             case SymId::brassMuteOpen:
-                  return "open-string";
+                  //return "open-string";
+                  return "open";
                   break;
-            case SymId::stringsThumbPosition:
-                  return "thumb-position";
+            case SymId::brassMuteHalfClosed:
+                  return "half-muted";
+                  break;
+            case SymId::brassHarmonMuteClosed:
+                  return "harmon-mute";
+                  break;
+            case SymId::guitarGolpe:
+                  return "golpe";
                   break;
             default:
                   ; // nothing
@@ -3104,6 +3145,7 @@ void ExportMusicXml::chordAttributes(Chord* chord, Notations& notations, Technic
                   notations.tag(_xml);
                   technical.tag(_xml);
                   mxmlTechn += color2xml(a);
+                  mxmlTechn += positioningAttributes(a);
                   if (sid == SymId::stringsHarmonic) {
                         if (placement != "")
                               attr += QString(" placement=\"%1\"").arg(placement);

diff --git a/importexport/musicxml/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp
@@ -1231,6 +1231,7 @@ static bool convertArticulationToSymId(const QString& mxmlName, SymId& id)
       map["spiccato"]         = SymId::articStaccatissimoAbove;
       map["snap-pizzicato"]   = SymId::pluckedSnapPizzicatoAbove;
       map["schleifer"]        = SymId::ornamentPrecompSlide;
+      map["open"]             = SymId::brassMuteOpen;
       map["open-string"]      = SymId::brassMuteOpen;
       map["thumb-position"]   = SymId::stringsThumbPosition;
       map["soft-accent"]      = SymId::articSoftAccentAbove;

diff --git a/mtest/musicxml/io/testNoteAttributes2_ref.xml b/mtest/musicxml/io/testNoteAttributes2_ref.xml
@@ -511,7 +511,7 @@
         <stem>up</stem>
         <notations>
           <technical>
-            <open-string/>
+            <open/>
             </technical>
           </notations>
         </note>