Add 2 Couperin ornaments

Tremblement appuyé (Couperin), Pincé (Couperin) Backport of PR musescore#10412
Jojo-Schmitz · Feb 24, 2022 · c8614a4 · c8614a4
1 parent 4e87d35
commit c8614a4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/fonttools/smufl2sym-in-trans.json b/fonttools/smufl2sym-in-trans.json
@@ -307,12 +307,14 @@
   "metNoteWhole": null,
   "ornamentMordent": null,
   "ornamentMordentInverted": null,
+  "ornamentPinceCouperin": null,
   "ornamentPrecompMordentUpperPrefix": null,
   "ornamentPrecompSlide": null,
   "ornamentShake3": null,
   "ornamentShakeMuffat1": null,
   "ornamentShortTrill": null,
   "ornamentTremblement": null,
+  "ornamentTremblementCouperin": null,
   "ornamentTrill": null,
   "ornamentTurn": null,
   "ornamentTurnInverted": null,

diff --git a/importexport/musicxml/exportxml.cpp b/importexport/musicxml/exportxml.cpp
@@ -2613,9 +2613,11 @@ static QString symIdToOrnam(const SymId sid)
                   return "inverted-mordent";
                   break;
             case SymId::ornamentTremblement:
+            case SymId::ornamentTremblementCouperin:
                   return "inverted-mordent long=\"yes\"";
                   break;
             case SymId::ornamentPrallMordent:
+            case SymId::ornamentPinceCouperin:
                   return "mordent long=\"yes\"";
                   break;
             case SymId::ornamentUpPrall:

diff --git a/libmscore/articulation.cpp b/libmscore/articulation.cpp
@@ -661,7 +661,9 @@ bool Articulation::isOrnament() const
           || _symId == SymId::ornamentPrallDown
           || _symId == SymId::ornamentPrecompSlide
           || _symId == SymId::ornamentShake3
-          || _symId == SymId::ornamentShakeMuffat1;
+          || _symId == SymId::ornamentShakeMuffat1
+          || _symId == SymId::ornamentTremblementCouperin
+          || _symId == SymId::ornamentPinceCouperin;
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/rendermidi.cpp b/libmscore/rendermidi.cpp
@@ -1786,6 +1786,9 @@ std::vector<OrnamentExcursion> excursions = {
       ,{SymId::ornamentShake3,              any, _32nd, {1,0}, {1,0},        true,  true, {}}
       ,{SymId::ornamentShakeMuffat1,        any, _32nd, {1,0}, {1,0},        true,  true, {}}
 
+      ,{ SymId::ornamentTremblementCouperin,any, _32nd, { 1, 1 }, { 0, 1 },  true, true, { 0, 0 } }
+      ,{ SymId::ornamentPinceCouperin,      any, _32nd, { 0 },    { 0, -1 }, true, true, { 0, 0 } }
+
       // [1] Some of the articulations/ornaments in the excursions table above come from
       // Baroque Music, Style and Performance A Handbook, by Robert Donington,(c) 1982
       // ISBN 0-393-30052-8, W. W. Norton & Company, Inc.

diff --git a/libmscore/sym.cpp b/libmscore/sym.cpp
@@ -5210,7 +5210,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
       "Oblique straight line tilted NW-SE",
       "Oblique straight line tilted SW-NE",
       "Oriscus",
-      "Pincé (Couperin)",
+      QT_TRANSLATE_NOOP("symUserNames", "Pincé (Couperin)"),
       "Port de voix",
       "Supported appoggiatura trill",
       "Supported appoggiatura trill with two-note suffix",
@@ -5252,7 +5252,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
       "Ornament top right concave stroke",
       "Ornament top right convex stroke",
       QT_TRANSLATE_NOOP("symUserNames", "Tremblement"),
-      "Tremblement appuyé (Couperin)",
+      QT_TRANSLATE_NOOP("symUserNames", "Tremblement appuyé (Couperin)"),
       QT_TRANSLATE_NOOP("symUserNames", "Trill"),
       QT_TRANSLATE_NOOP("symUserNames", "Turn"),
       QT_TRANSLATE_NOOP("symUserNames", "Inverted turn"),

diff --git a/mscore/menus.cpp b/mscore/menus.cpp
@@ -1017,6 +1017,8 @@ PalettePanel* MuseScore::newOrnamentsPalettePanel()
             SymId::ornamentPrecompSlide,
             SymId::ornamentShake3,
             SymId::ornamentShakeMuffat1,
+            SymId::ornamentTremblementCouperin,
+            SymId::ornamentPinceCouperin,
             };
       for (auto i : art) {
             Articulation* s = new Articulation(i, gscore);