Change Decrescendo to Diminuendo

As much as possible

src/braille/internal/braille.cpp

@@ -2888,12 +2888,12 @@ QString Braille::brailleHairpinBefore(ChordRest* chordRest, const std::vector<Ha
             result += beginTextBraille + BRAILLE_HAIRPIN_DIV_START;
             resetOctave(hairpin->staffIdx());
             break;
-        case HairpinType::DECRESC_HAIRPIN:
+        case HairpinType::DIM_HAIRPIN:
             result += beginTextBraille + BRAILLE_HAIRPIN_CONV_START;
             resetOctave(hairpin->staffIdx());
             break;
         case HairpinType::CRESC_LINE:
-        case HairpinType::DECRESC_LINE:
+        case HairpinType::DIM_LINE:
             result += beginTextBraille + BRAILLE_LINE_CONT_START_1;
             resetOctave(hairpin->staffIdx());
             break;
@@ -2925,12 +2925,12 @@ QString Braille::brailleHairpinAfter(ChordRest* chordRest, const std::vector<Hai
             result += BRAILLE_HAIRPIN_DIV_END;
             resetOctave(hairpin->staffIdx());
             break;
-        case HairpinType::DECRESC_HAIRPIN:
+        case HairpinType::DIM_HAIRPIN:
             result += BRAILLE_HAIRPIN_CONV_END;
             resetOctave(hairpin->staffIdx());
             break;
         case HairpinType::CRESC_LINE:
-        case HairpinType::DECRESC_LINE:
+        case HairpinType::DIM_LINE:
             result += BRAILLE_LINE_CONT_END_1;
             resetOctave(hairpin->staffIdx());
             break;

src/engraving/compat/midi/compatmidirenderinternal.cpp

@@ -1585,7 +1585,7 @@ void fillHairpinVelocities(const Hairpin* h, std::unordered_map<staff_idx_t, Vel
     // Make the change negative when the hairpin is a diminuendo
     HairpinType htype = h->hairpinType();
     ChangeDirection direction = ChangeDirection::INCREASING;
-    if (htype == HairpinType::DECRESC_HAIRPIN || htype == HairpinType::DECRESC_LINE) {
+    if (htype == HairpinType::DIM_HAIRPIN || htype == HairpinType::DIM_LINE) {
         veloChange *= -1;
         direction = ChangeDirection::DECREASING;
     }

src/engraving/dom/cmd.cpp

@@ -3244,15 +3244,15 @@ void Score::cmdMirrorNoteHead()
             HairpinType st = h->hairpinType();
             switch (st) {
             case HairpinType::CRESC_HAIRPIN:
-                st = HairpinType::DECRESC_HAIRPIN;
+                st = HairpinType::DIM_HAIRPIN;
                 break;
-            case HairpinType::DECRESC_HAIRPIN:
+            case HairpinType::DIM_HAIRPIN:
                 st = HairpinType::CRESC_HAIRPIN;
                 break;
             case HairpinType::CRESC_LINE:
-                st = HairpinType::DECRESC_LINE;
+                st = HairpinType::DIM_LINE;
                 break;
-            case HairpinType::DECRESC_LINE:
+            case HairpinType::DIM_LINE:
                 st = HairpinType::CRESC_LINE;
                 break;
             case HairpinType::INVALID:

src/engraving/dom/edit.cpp

@@ -3885,7 +3885,7 @@ Hairpin* Score::addHairpin(HairpinType type, ChordRest* cr1, ChordRest* cr2)
     if (type == HairpinType::CRESC_LINE) {
         hairpin->setBeginText(u"cresc.");
         hairpin->setContinueText(u"(cresc.)");
-    } else if (type == HairpinType::DECRESC_LINE) {
+    } else if (type == HairpinType::DIM_LINE) {
         hairpin->setBeginText(u"dim.");
         hairpin->setContinueText(u"(dim.)");
     }
@@ -3990,7 +3990,7 @@ Hairpin* Score::addHairpinToDynamicOnGripDrag(Dynamic* dynamic, bool isLeftGrip,
     }
 
     Hairpin* hairpin = Factory::createHairpin(dummy()->segment());
-    hairpin->setHairpinType(isLeftGrip ? HairpinType::DECRESC_HAIRPIN : HairpinType::CRESC_HAIRPIN);
+    hairpin->setHairpinType(isLeftGrip ? HairpinType::DIM_HAIRPIN : HairpinType::CRESC_HAIRPIN);
 
     hairpin->setTrack(track);
     hairpin->setTrack2(track);

src/engraving/dom/hairpin.cpp

@@ -166,7 +166,7 @@ std::vector<PointF> HairpinSegment::gripsPositions(const EditData&) const
         if (hairpin()->hairpinType() == HairpinType::CRESC_HAIRPIN) {
             lineApertureX = len - offsetX;                  // End of CRESCENDO - Offset
         } else {
-            lineApertureX = offsetX;                        // Begin of DECRESCENDO + Offset
+            lineApertureX = offsetX;                        // Begin of DIMINUENDO + Offset
         }
         double lineApertureH = (len - offsetX) * h1 / len;   // Vertical position for y grip
         gripLineAperturePoint.setX(lineApertureX);
@@ -263,7 +263,7 @@ Sid HairpinSegment::getPropertyStyle(Pid pid) const
             return Sid::hairpinText;
         case HairpinType::CRESC_LINE:
             return Sid::hairpinCrescText;
-        case HairpinType::DECRESC_LINE:
+        case HairpinType::DIM_LINE:
             return Sid::hairpinDecrescText;
         }
         break;
@@ -273,7 +273,7 @@ Sid HairpinSegment::getPropertyStyle(Pid pid) const
             return Sid::hairpinText;
         case HairpinType::CRESC_LINE:
             return Sid::hairpinCrescContText;
-        case HairpinType::DECRESC_LINE:
+        case HairpinType::DIM_LINE:
             return Sid::hairpinDecrescContText;
         }
         break;
@@ -448,7 +448,7 @@ Sid Hairpin::getPropertyStyle(Pid pid) const
             return Sid::hairpinText;
         case HairpinType::CRESC_LINE:
             return Sid::hairpinCrescText;
-        case HairpinType::DECRESC_LINE:
+        case HairpinType::DIM_LINE:
             return Sid::hairpinDecrescText;
         }
         break;
@@ -458,7 +458,7 @@ Sid Hairpin::getPropertyStyle(Pid pid) const
             return Sid::hairpinText;
         case HairpinType::CRESC_LINE:
             return Sid::hairpinCrescContText;
-        case HairpinType::DECRESC_LINE:
+        case HairpinType::DIM_LINE:
             return Sid::hairpinDecrescContText;
         }
         break;
@@ -512,7 +512,7 @@ DynamicType Hairpin::dynamicTypeFrom() const
 
 DynamicType Hairpin::dynamicTypeTo() const
 {
-    if (m_hairpinType == HairpinType::DECRESC_HAIRPIN && hairpinCircledTip()) {
+    if (m_hairpinType == HairpinType::DIM_HAIRPIN && hairpinCircledTip()) {
         return DynamicType::N;
     }
 
@@ -661,7 +661,7 @@ PropertyValue Hairpin::propertyDefault(Pid id) const
         if (m_hairpinType == HairpinType::CRESC_LINE) {
             return style().styleV(Sid::hairpinCrescText);
         }
-        if (m_hairpinType == HairpinType::DECRESC_LINE) {
+        if (m_hairpinType == HairpinType::DIM_LINE) {
             return style().styleV(Sid::hairpinDecrescText);
         }
         return String();
@@ -670,7 +670,7 @@ PropertyValue Hairpin::propertyDefault(Pid id) const
         if (m_hairpinType == HairpinType::CRESC_LINE) {
             return style().styleV(Sid::hairpinCrescContText);
         }
-        if (m_hairpinType == HairpinType::DECRESC_LINE) {
+        if (m_hairpinType == HairpinType::DIM_LINE) {
             return style().styleV(Sid::hairpinDecrescContText);
         }
         return String();
@@ -777,12 +777,12 @@ muse::TranslatableString Hairpin::subtypeUserName() const
     switch (hairpinType()) {
     case HairpinType::CRESC_HAIRPIN:
         return TranslatableString("engraving/hairpintype", "Crescendo hairpin");
-    case HairpinType::DECRESC_HAIRPIN:
-        return TranslatableString("engraving/hairpintype", "Decrescendo hairpin");
+    case HairpinType::DIM_HAIRPIN:
+        return TranslatableString("engraving/hairpintype", "Diminuendo hairpin");
     case HairpinType::CRESC_LINE:
         return TranslatableString("engraving/hairpintype", "Crescendo line");
-    case HairpinType::DECRESC_LINE:
-        return TranslatableString("engraving/hairpintype", "Decrescendo line");
+    case HairpinType::DIM_LINE:
+        return TranslatableString("engraving/hairpintype", "Diminuendo line");
     default:
         return TranslatableString("engraving/hairpintype", "Custom");
     }

src/engraving/dom/hairpin.h

@@ -33,9 +33,9 @@ class Hairpin;
 enum class HairpinType : signed char {
     INVALID = -1,
     CRESC_HAIRPIN,
-    DECRESC_HAIRPIN,
+    DIM_HAIRPIN,
     CRESC_LINE,
-    DECRESC_LINE
+    DIM_LINE
 };
 
 //---------------------------------------------------------
@@ -98,7 +98,7 @@ class HairpinSegment final : public TextLineBaseSegment
 //---------------------------------------------------------
 //   @@ Hairpin
 //   @P dynRange     enum (Dynamic.STAFF, Dynamic.PART, Dynamic.SYSTEM)
-//   @P hairpinType  enum (Hairpin.CRESCENDO, Hairpin.DECRESCENDO)
+//   @P hairpinType  enum (Hairpin.CRESCENDO, Hairpin.DIMINUENDO)
 //   @P veloChange   int
 //---------------------------------------------------------
 
@@ -149,7 +149,7 @@ class Hairpin final : public TextLineBase
 
     bool isDecrescendo() const
     {
-        return m_hairpinType == HairpinType::DECRESC_HAIRPIN || m_hairpinType == HairpinType::DECRESC_LINE;
+        return m_hairpinType == HairpinType::DIM_HAIRPIN || m_hairpinType == HairpinType::DIM_LINE;
     }
 
     PropertyValue getProperty(Pid id) const override;
@@ -159,7 +159,7 @@ class Hairpin final : public TextLineBase
     String accessibleInfo() const override;
     bool isLineType() const
     {
-        return m_hairpinType == HairpinType::CRESC_LINE || m_hairpinType == HairpinType::DECRESC_LINE;
+        return m_hairpinType == HairpinType::CRESC_LINE || m_hairpinType == HairpinType::DIM_LINE;
     }
 
     PointF linePos(Grip grip, System** system) const override;

src/engraving/dom/note.cpp

@@ -2666,7 +2666,7 @@ double Note::playingTuning() const
 //---------------------------------------------------------
 //   customizeVelocity
 //    Input is the global velocity determined by dynamic
-//    signs and crescendo/decrescendo etc.
+//    signs and crescendo/diminuendo etc.
 //    Returns the actual play velocity for this note
 //    modified by veloOffset
 //---------------------------------------------------------

src/engraving/playback/metaparsers/internal/symbolsmetaparser.cpp

@@ -316,7 +316,7 @@ mpe::ArticulationTypeSet SymbolsMetaParser::symbolToArticulations(SymId symId, O
         types.emplace(mpe::ArticulationType::Crescendo);
         break;
     case SymId::dynamicDiminuendoHairpin:
-        types.emplace(mpe::ArticulationType::Decrescendo);
+        types.emplace(mpe::ArticulationType::Diminuendo);
         break;
     case SymId::ornamentUpPrall:
         types.emplace(mpe::ArticulationType::UpPrall);

src/engraving/playback/playbackcontext.cpp

@@ -483,7 +483,7 @@ void PlaybackContext::handleHairpin(const Hairpin* hairpin, const int tickPositi
     const dynamic_level_t nominalLevelTo = findNominalEndDynamicLevel(hairpin);
     const bool hasNominalLevelTo = nominalLevelTo != NATURAL_DYNAMIC_LEVEL;
 
-    // If there is an end dynamic marking, check if it matches the 'direction' of the hairpin (cresc. vs decresc.)
+    // If there is an end dynamic marking, check if it matches the 'direction' of the hairpin (cresc. vs dim.)
     const bool isCrescendo = hairpin->isCrescendo();
     const bool useNominalLevelTo = hasNominalLevelTo && (isCrescendo
                                                          ? nominalLevelTo > levelFrom

src/engraving/rendering/score/tlayout.cpp

@@ -3050,7 +3050,7 @@ void TLayout::layoutHairpinSegment(HairpinSegment* item, LayoutContext& ctx)
             }
         }
         break;
-        case HairpinType::DECRESC_HAIRPIN: {
+        case HairpinType::DIM_HAIRPIN: {
             switch (item->spannerSegmentType()) {
             case SpannerSegmentType::SINGLE:
             case SpannerSegmentType::END: {
@@ -3089,7 +3089,7 @@ void TLayout::layoutHairpinSegment(HairpinSegment* item, LayoutContext& ctx)
 
         item->joinedHairpinRef().clear();
         if (item->spannerSegmentType() != SpannerSegmentType::MIDDLE) {
-            if (type == HairpinType::DECRESC_HAIRPIN && item->spannerSegmentType() != SpannerSegmentType::BEGIN) {
+            if (type == HairpinType::DIM_HAIRPIN && item->spannerSegmentType() != SpannerSegmentType::BEGIN) {
                 item->joinedHairpinRef() << item->pointsRef()[0] << item->pointsRef()[1] << item->pointsRef()[2]; // [top-left, joint, bottom-left]
             } else if (type == HairpinType::CRESC_HAIRPIN && item->spannerSegmentType() != SpannerSegmentType::END) {
                 item->joinedHairpinRef() << item->pointsRef()[1] << item->pointsRef()[0] << item->pointsRef()[3]; // [top-right, joint, bottom-right]
@@ -3209,10 +3209,10 @@ void TLayout::fillHairpinSegmentShape(const HairpinSegment* item, HairpinSegment
     Shape sh;
     switch (item->hairpin()->hairpinType()) {
     case HairpinType::CRESC_HAIRPIN:
-    case HairpinType::DECRESC_HAIRPIN:
+    case HairpinType::DIM_HAIRPIN:
         sh = Shape(item->ldata()->bbox(), item);
         break;
-    case HairpinType::DECRESC_LINE:
+    case HairpinType::DIM_LINE:
     case HairpinType::CRESC_LINE:
     default:
         sh = textLineBaseSegmentShape(item);

src/engraving/rendering/single/singlelayout.cpp

@@ -1055,7 +1055,7 @@ void SingleLayout::layout(HairpinSegment* item, const Context& ctx)
             }
         }
         break;
-        case HairpinType::DECRESC_HAIRPIN: {
+        case HairpinType::DIM_HAIRPIN: {
             switch (item->spannerSegmentType()) {
             case SpannerSegmentType::SINGLE:
             case SpannerSegmentType::END: {

src/engraving/rw/read206/read206.cpp

@@ -2170,8 +2170,8 @@ void Read206::readHairpin206(XmlReader& e, ReadContext& ctx, Hairpin* h)
             e.readInt();
             if (h->hairpinType() == HairpinType::CRESC_HAIRPIN) {
                 h->setHairpinType(HairpinType::CRESC_LINE);
-            } else if (h->hairpinType() == HairpinType::DECRESC_HAIRPIN) {
-                h->setHairpinType(HairpinType::DECRESC_LINE);
+            } else if (h->hairpinType() == HairpinType::DIM_HAIRPIN) {
+                h->setHairpinType(HairpinType::DIM_LINE);
             }
             useText = true;
         } else if (!readTextLineProperties(e, ctx, h)) {

src/engraving/rw/read400/tread.cpp

@@ -2755,8 +2755,8 @@ void TRead::read(Hairpin* h, XmlReader& e, ReadContext& ctx)
             e.readInt();
             if (h->hairpinType() == HairpinType::CRESC_HAIRPIN) {
                 h->setHairpinType(HairpinType::CRESC_LINE);
-            } else if (h->hairpinType() == HairpinType::DECRESC_HAIRPIN) {
-                h->setHairpinType(HairpinType::DECRESC_LINE);
+            } else if (h->hairpinType() == HairpinType::DIM_HAIRPIN) {
+                h->setHairpinType(HairpinType::DIM_LINE);
             }
         } else if (tag == "singleNoteDynamics") {
             h->setSingleNoteDynamics(e.readBool());

src/engraving/rw/read410/tread.cpp

@@ -3174,8 +3174,8 @@ void TRead::read(Hairpin* h, XmlReader& e, ReadContext& ctx)
             e.readInt();
             if (h->hairpinType() == HairpinType::CRESC_HAIRPIN) {
                 h->setHairpinType(HairpinType::CRESC_LINE);
-            } else if (h->hairpinType() == HairpinType::DECRESC_HAIRPIN) {
-                h->setHairpinType(HairpinType::DECRESC_LINE);
+            } else if (h->hairpinType() == HairpinType::DIM_HAIRPIN) {
+                h->setHairpinType(HairpinType::DIM_LINE);
             }
         } else if (tag == "singleNoteDynamics") {
             h->setSingleNoteDynamics(e.readBool());

src/engraving/tests/hairpin_tests.cpp

@@ -41,9 +41,9 @@ TEST_F(Engraving_HairpinTests, hairpin)
     Hairpin* hp = new Hairpin(score->dummy()->segment());
 
     // subtype
-    hp->setHairpinType(HairpinType::DECRESC_HAIRPIN);
+    hp->setHairpinType(HairpinType::DIM_HAIRPIN);
     Hairpin* hp2 = static_cast<Hairpin*>(ScoreRW::writeReadElement(hp));
-    EXPECT_EQ(hp2->hairpinType(), HairpinType::DECRESC_HAIRPIN);
+    EXPECT_EQ(hp2->hairpinType(), HairpinType::DIM_HAIRPIN);
     delete hp2;
 
     hp->setHairpinType(HairpinType::CRESC_HAIRPIN);

src/engraving/tests/playback/playbackcontext_tests.cpp

@@ -358,7 +358,7 @@ TEST_F(Engraving_PlaybackContextTests, Dynamics_Niente)
     const std::map<int, int> f_to_n_curve = TConv::easingValueCurve(1920, HAIRPIN_STEPS, static_cast<int>(n - f), ChangeMethod::NORMAL);
     const std::map<int, int> n_to_f_curve = TConv::easingValueCurve(1920, HAIRPIN_STEPS, static_cast<int>(f - n), ChangeMethod::NORMAL);
 
-    // 1st measure: Decresc. al niente with 'n' dynamic
+    // 1st measure: Dim. al niente with 'n' dynamic
     for (const auto& pair : f_to_n_curve) {
         mpe::timestamp_t time = timestampFromTicks(score, pair.first);
         expectedDynamics.emplace(time, f + static_cast<dynamic_level_t>(pair.second));

src/framework/mpe/internal/articulationstringutils.h

@@ -99,7 +99,7 @@ static const std::unordered_map<ArticulationType, QString> ARTICULATION_TYPE_NAM
     { ArticulationType::SlideInAbove, "SlideInAbove" },
     { ArticulationType::SlideInBelow, "SlideInBelow" },
     { ArticulationType::Crescendo, "Crescendo" },
-    { ArticulationType::Decrescendo, "Decrescendo" },
+    { ArticulationType::Diminuendo, "Diminuendo" },
     { ArticulationType::DiscreteGlissando, "DiscreteGlissando" },
     { ArticulationType::ContinuousGlissando, "ContinuousGlissando" },
     { ArticulationType::Legato, "Legato" },

src/framework/mpe/mpetypes.h

@@ -297,7 +297,7 @@ enum class ArticulationType : signed char {
     // multi-note articulations
     Trill,
     Crescendo,
-    Decrescendo,
+    Diminuendo,
     DiscreteGlissando,
     Legato,
     Pedal,
@@ -318,7 +318,7 @@ inline bool isMultiNoteArticulation(const ArticulationType type)
     static const ArticulationTypeSet MULTI_TYPES = {
         ArticulationType::Trill,
         ArticulationType::Crescendo,
-        ArticulationType::Decrescendo,
+        ArticulationType::Diminuendo,
         ArticulationType::DiscreteGlissando,
         ArticulationType::Legato,
         ArticulationType::Pedal,

src/framework/mpe/tests/multinotearticulationstest.cpp

@@ -332,7 +332,7 @@ TEST_F(MPE_MultiNoteArticulationsTest, IsMultiNoteArticulation)
     const ArticulationTypeSet MULTI_TYPES = {
         ArticulationType::Trill,
         ArticulationType::Crescendo,
-        ArticulationType::Decrescendo,
+        ArticulationType::Diminuendo,
         ArticulationType::DiscreteGlissando,
         ArticulationType::Legato,
         ArticulationType::Pedal,

src/importexport/capella/internal/capella.cpp

@@ -1103,8 +1103,8 @@ static Fraction readCapVoice(Score* score, CapVoice* cvoice, int staffIdx, const
                              tick.ticks(), track, cr1, cr2);
                     } else {
                         Hairpin* hp = Factory::createHairpin(score->dummy()->segment());
-                        if (wdgo->decresc) {
-                            hp->setHairpinType(HairpinType::DECRESC_HAIRPIN);
+                        if (wdgo->dim) {
+                            hp->setHairpinType(HairpinType::DIM_HAIRPIN);
                         } else {
                             hp->setHairpinType(HairpinType::CRESC_HAIRPIN);
                         }
@@ -2493,7 +2493,7 @@ void WedgeObj::read()
     LineObj::read();
     char b = cap->readByte();
     height = b & 0x7f;
-    decresc = b & 0x80;
+    dim = b & 0x80;
 }
 
 //---------------------------------------------------------

src/importexport/capella/internal/capella.h

@@ -551,12 +551,12 @@ class WedgeObj : public LineObj
 public:
     WedgeObj(Capella* c)
         : LineObj(CapellaType::WEDGE, c), height(32),
-        decresc(false) {}
+        dim(false) {}
     void read();
     void readCapx(engraving::XmlReader& e);
 
     int height;
-    bool decresc;
+    bool dim;
 };
 
 //---------------------------------------------------------