Fix #312209: Add alternative inverted turn ornament symbol

musescore · Oct 27, 2020 · 5cb76ae · 5cb76ae
1 parent 6a4cf8b
commit 5cb76ae
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/libmscore/articulation.cpp b/libmscore/articulation.cpp
@@ -632,6 +632,7 @@ bool Articulation::isOrnament() const
 {
     return _symId == SymId::ornamentTurn
            || _symId == SymId::ornamentTurnInverted
+           || _symId == SymId::ornamentTurnSlash
            || _symId == SymId::ornamentTrill
            || _symId == SymId::brassMuteClosed
            || _symId == SymId::ornamentMordentInverted

diff --git a/libmscore/rendermidi.cpp b/libmscore/rendermidi.cpp
@@ -1788,6 +1788,7 @@ std::vector<OrnamentExcursion> excursions = {
     //                               styles          prefix                    sustainp
     { SymId::ornamentTurn,                any, _32nd, {},    { 1,0,-1,0 },   false, true, {} },
     { SymId::ornamentTurnInverted,        any, _32nd, {},    { -1,0,1,0 },   false, true, {} },
+    { SymId::ornamentTurnSlash,           any, _32nd, {},    { -1,0,1,0 },   false, true, {} },
     { SymId::ornamentTrill,           baroque, _32nd, { 1,0 }, { 1,0 },        true,  true, {} },
     { SymId::ornamentTrill,          defstyle, _32nd, { 0,1 }, { 0,1 },        true,  true, {} },
     { SymId::brassMuteClosed,         baroque, _32nd, { 0,-1 },{ 0, -1 },      true,  true, {} },
@@ -1798,9 +1799,8 @@ std::vector<OrnamentExcursion> excursions = {
     { SymId::ornamentPrallMordent,        any, _32nd, {},    { 1,0,-1,0 },   false, true, {} },
     { SymId::ornamentLinePrall,           any, _32nd, { 2,2,2 },{ 1,0 },       true,  true, {} },
     { SymId::ornamentUpPrall,             any, _16th, { -1,0 },{ 1,0 },        true,  true, { 1,0 } },// p 144 Ex 152 [1]
-    { SymId::ornamentUpMordent,           any, _16th, { -1,0 },{ 1,0 },        true,  true, { -1,0 } }// p 144 Ex 152 [1]
-
-    ,{ SymId::ornamentPrecompMordentUpperPrefix, any, _16th, { 1,1,1,0 }, { 1,0 },    true,  true, {} },// p136 Cadence Appuyee [1] [2]
+    { SymId::ornamentUpMordent,           any, _16th, { -1,0 },{ 1,0 },        true,  true, { -1,0 } },// p 144 Ex 152 [1]
+    { SymId::ornamentPrecompMordentUpperPrefix, any, _16th, { 1,1,1,0 }, { 1,0 },    true,  true, {} },// p136 Cadence Appuyee [1] [2]
     { SymId::ornamentDownMordent,         any, _16th, { 1,1,1,0 }, { 1,0 },    true,  true, { -1, 0 } },// p136 Cadence Appuyee + mordent [1] [2]
     { SymId::ornamentPrallUp,             any, _16th, { 1,0 }, { 1,0 },        true,  true, { -1,0 } },// p136 Double Cadence [1]
     { SymId::ornamentPrallDown,           any, _16th, { 1,0 }, { 1,0 },        true,  true, { -1,0,0,0 } },// p144 ex 153 [1]

diff --git a/libmscore/sym.cpp b/libmscore/sym.cpp
@@ -4583,7 +4583,7 @@ const std::array<const char*, int(SymId::lastSym) + 1> Sym::symUserNames = { {
     "Inverted mordent with upper prefix",
     "Mordent with release",
     QT_TRANSLATE_NOOP("symUserNames", "Mordent with upper prefix"),
-    "Pre-beat port de voix follwed by multiple mordent (Dandrieu)",
+    "Pre-beat port de voix followed by multiple mordent (Dandrieu)",
     QT_TRANSLATE_NOOP("symUserNames", "Slide"),
     "Slide-trill with two-note suffix (J.S. Bach)",
     "Slide-trill (D'Anglebert)",
@@ -4613,7 +4613,7 @@ const std::array<const char*, int(SymId::lastSym) + 1> Sym::symUserNames = { {
     QT_TRANSLATE_NOOP("symUserNames", "Trill"),
     QT_TRANSLATE_NOOP("symUserNames", "Turn"),
     QT_TRANSLATE_NOOP("symUserNames", "Inverted turn"),
-    "Turn with slash",
+    QT_TRANSLATE_NOOP("symUserNames", "Turn with slash"),
     "Turn up",
     "Inverted turn up",
     "Curve above",

diff --git a/mu4/importexport/internal/musicxml/exportxml.cpp b/mu4/importexport/internal/musicxml/exportxml.cpp
@@ -2652,6 +2652,7 @@ static QString symIdToOrnam(const SymId sid)
 {
     switch (sid) {
     case SymId::ornamentTurnInverted:
+    case SymId::ornamentTurnSlash:
         return "inverted-turn";
         break;
     case SymId::ornamentTurn:

diff --git a/mu4/palette/internal/palette/palettecreator.cpp b/mu4/palette/internal/palette/palettecreator.cpp
@@ -942,6 +942,7 @@ PalettePanel* PaletteCreator::newOrnamentsPalettePanel()
     // do not include additional symbol-based fingerings (temporarily?) implemented as articulations
     static const std::vector<SymId> art {
         SymId::ornamentTurnInverted,
+        SymId::ornamentTurnSlash,
         SymId::ornamentTurn,
         SymId::ornamentTrill,
         SymId::ornamentMordent,