"Double Coda" to "Codetta"

as it was known under in MuseScore 1's repeats palette, and in Mu3' and Mu4'S timeline
musescore · Sep 4, 2023 · d68c996 · d68c996
1 parent bb4d41c
commit d68c996
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 32 deletions.
diff --git a/src/engraving/dom/jump.cpp b/src/engraving/dom/jump.cpp
@@ -54,12 +54,12 @@ const std::vector<JumpTypeTableItem> jumpTypeTable {
     { JumpType::DS_AL_FINE, "D.S. al Fine", "segno", "fine", "" },
     { JumpType::DS,         "D.S.",         "segno", "end",  "" },
 
-    { JumpType::DC_AL_DBLCODA,  "D.C. al Double Coda",   "start", "varcoda",  "codab" },
-    { JumpType::DS_AL_DBLCODA,  "D.S. al Double Coda",   "segno", "varcoda",  "codab" },
-    { JumpType::DSS,            "Dal Segno Segno",       "varsegno", "end",  "" },
-    { JumpType::DSS_AL_CODA,    "D.S.S. al Coda",        "varsegno", "coda",  "codab" },
-    { JumpType::DSS_AL_DBLCODA, "D.S.S. al Double Coda", "varsegno", "varcoda", "codab" },
-    { JumpType::DSS_AL_FINE,    "D.S.S. al Fine",        "varsegno", "fine",  "" },
+    { JumpType::DC_AL_DBLCODA,  "D.C. al Codetta",   "start", "varcoda",  "codab" },
+    { JumpType::DS_AL_DBLCODA,  "D.S. al Codetta",   "segno", "varcoda",  "codab" },
+    { JumpType::DSS,            "Dal Segno Segno",   "varsegno", "end",  "" },
+    { JumpType::DSS_AL_CODA,    "D.S.S. al Coda",    "varsegno", "coda",  "codab" },
+    { JumpType::DSS_AL_DBLCODA, "D.S.S. al Codetta", "varsegno", "varcoda", "codab" },
+    { JumpType::DSS_AL_FINE,    "D.S.S. al Fine",    "varsegno", "fine",  "" },
 };
 
 //---------------------------------------------------------

diff --git a/src/engraving/dom/marker.cpp b/src/engraving/dom/marker.cpp
@@ -118,7 +118,7 @@ void Marker::setMarkerType(MarkerType t)
         break;
 
     case MarkerType::DA_DBLCODA:
-        txt = "Da Double Coda";
+        txt = "Da Codetta";
         initTextStyleType(TextStyleType::REPEAT_RIGHT, true);
         setLabel(u"coda");
         break;

diff --git a/src/engraving/tests/repeat_tests.cpp b/src/engraving/tests/repeat_tests.cpp
@@ -307,7 +307,7 @@ TEST_F(Engraving_RepeatTests, repeat46) {
 }
 
 TEST_F(Engraving_RepeatTests, repeat47) {
-    // #269378 Double Coda messed up repeat rewind logic
+    // #269378 Double Coda AKA Codetta messed up repeat rewind logic
     repeat("repeat47.mscx", u"1;2;3; 2; 4;5;6;7; 6; 8;9;10;11; 2; 4; 13;14;15; 9;10; 16;17;18");
 }
 

diff --git a/src/engraving/types/typesconv.cpp b/src/engraving/types/typesconv.cpp
@@ -2271,11 +2271,11 @@ static const std::vector<Item<JumpType> > JUMP_TYPES = {
     { JumpType::DS_AL_FINE,     "", TranslatableString("engraving", "D.S. al Fine") },
     { JumpType::DS,             "", TranslatableString("engraving", "D.S.") },
 
-    { JumpType::DC_AL_DBLCODA,  "", TranslatableString("engraving", "Da Capo al Double Coda") },
-    { JumpType::DS_AL_DBLCODA,  "", TranslatableString("engraving", "Dal Segno al Double Coda") },
+    { JumpType::DC_AL_DBLCODA,  "", TranslatableString("engraving", "Da Capo al Codetta") },
+    { JumpType::DS_AL_DBLCODA,  "", TranslatableString("engraving", "Dal Segno al Codetta") },
     { JumpType::DSS,            "", TranslatableString("engraving", "Dal Segno Segno") },
     { JumpType::DSS_AL_CODA,    "", TranslatableString("engraving", "Dal Segno Segno al Coda") },
-    { JumpType::DSS_AL_DBLCODA, "", TranslatableString("engraving", "Dal Segno Segno al Double Coda") },
+    { JumpType::DSS_AL_DBLCODA, "", TranslatableString("engraving", "Dal Segno Segno al Codetta") },
     { JumpType::DSS_AL_FINE,    "", TranslatableString("engraving", "Dal Segno Segno al Fine") },
 
     { JumpType::USER,           "", TranslatableString("engraving", "Custom") }
@@ -2301,7 +2301,7 @@ static const std::array<Item<MarkerType>, 11> MARKER_TYPES = { {
     { MarkerType::TOCODA,       "coda",     TranslatableString("engraving", "To coda") },
     { MarkerType::TOCODASYM,    "",         TranslatableString("engraving", "To coda (symbol)") },
     { MarkerType::DA_CODA,      "",         TranslatableString("engraving", "Da Coda") },
-    { MarkerType::DA_DBLCODA,   "",         TranslatableString("engraving", "Da Double Coda") },
+    { MarkerType::DA_DBLCODA,   "",         TranslatableString("engraving", "Da Codetta") },
     { MarkerType::USER,         "",         TranslatableString("engraving", "Custom") }
 } };
 

diff --git a/src/importexport/guitarpro/internal/importgtp-gp5.cpp b/src/importexport/guitarpro/internal/importgtp-gp5.cpp
@@ -1044,10 +1044,10 @@ bool GuitarPro5::read(IODevice* io)
                 Segment* s = measure->getSegment(SegmentType::KeySig, measure->tick());
                 StaffText* st = new StaffText(s);
                 static constexpr char text[][22] = {
-                    "fine", "Da Capo", "D.C. al Coda", "D.C. al Double Coda",
-                    "D.C. al Fine", "Da Segno", "D.S. al Coda", "D.S. al Double Coda",
-                    "D.S. al Fine", "Da Segno Segno", "D.S.S. al Coda", "D.S.S. al Double Coda",
-                    "D.S.S. al Fine", "Da Coda", "Da Double Coda"
+                    "fine", "Da Capo", "D.C. al Coda", "D.C. al Codetta",
+                    "D.C. al Fine", "Da Segno", "D.S. al Coda", "D.S. al Codetta",
+                    "D.S. al Fine", "Da Segno Segno", "D.S.S. al Coda", "D.S.S. al Codetta",
+                    "D.S.S. al Fine", "Da Coda", "Da Codetta"
                 };
                 st->setPlainText(String::fromAscii(text[i - 4]));
                 st->setParent(s);

diff --git a/src/importexport/guitarpro/tests/data/directions.gp-ref.mscx b/src/importexport/guitarpro/tests/data/directions.gp-ref.mscx
@@ -205,7 +205,7 @@
       <Measure>
         <Jump>
           <style>repeat_right</style>
-          <text>D.C. al Double Coda</text>
+          <text>D.C. al Codetta</text>
           <jumpTo>start</jumpTo>
           <playUntil>varcoda</playUntil>
           <continueAt>codab</continueAt>
@@ -300,7 +300,7 @@
       <Measure>
         <Jump>
           <style>repeat_right</style>
-          <text>D.S. al Double Coda</text>
+          <text>D.S. al Codetta</text>
           <jumpTo>segno</jumpTo>
           <playUntil>varcoda</playUntil>
           <continueAt>codab</continueAt>
@@ -428,7 +428,7 @@
       <Measure>
         <Jump>
           <style>repeat_right</style>
-          <text>D.S.S. al Double Coda</text>
+          <text>D.S.S. al Codetta</text>
           <jumpTo>varsegno</jumpTo>
           <playUntil>varcoda</playUntil>
           <continueAt>codab</continueAt>
@@ -517,7 +517,7 @@
       <Measure>
         <Marker>
           <style>repeat_right</style>
-          <text>Da Double Coda</text>
+          <text>Da Codetta</text>
           <label>coda</label>
           </Marker>
         <voice>

diff --git a/src/importexport/guitarpro/tests/data/directions.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/directions.gpx-ref.mscx
@@ -205,7 +205,7 @@
       <Measure>
         <Jump>
           <style>repeat_right</style>
-          <text>D.C. al Double Coda</text>
+          <text>D.C. al Codetta</text>
           <jumpTo>start</jumpTo>
           <playUntil>varcoda</playUntil>
           <continueAt>codab</continueAt>
@@ -300,7 +300,7 @@
       <Measure>
         <Jump>
           <style>repeat_right</style>
-          <text>D.S. al Double Coda</text>
+          <text>D.S. al Codetta</text>
           <jumpTo>segno</jumpTo>
           <playUntil>varcoda</playUntil>
           <continueAt>codab</continueAt>
@@ -428,7 +428,7 @@
       <Measure>
         <Jump>
           <style>repeat_right</style>
-          <text>D.S.S. al Double Coda</text>
+          <text>D.S.S. al Codetta</text>
           <jumpTo>varsegno</jumpTo>
           <playUntil>varcoda</playUntil>
           <continueAt>codab</continueAt>
@@ -517,7 +517,7 @@
       <Measure>
         <Marker>
           <style>repeat_right</style>
-          <text>Da Double Coda</text>
+          <text>Da Codetta</text>
           <label>coda</label>
           </Marker>
         <voice>

diff --git a/src/importexport/mei/tests/data/jump-01.mei b/src/importexport/mei/tests/data/jump-01.mei
@@ -52,7 +52,7 @@
                            <note xml:id="n912k7" dur="1" pname="d" oct="4" />
                         </layer>
                      </staff>
-                     <repeatMark xml:id="r1275fyx" type="mscore-jump-dc-al-double-coda" func="daCapo" tstamp="0.000000">D.C. al Double Coda</repeatMark>
+                     <repeatMark xml:id="r1275fyx" type="mscore-jump-dc-al-double-coda" func="daCapo" tstamp="0.000000">D.C. al Codetta</repeatMark>
                   </measure>
                   <measure xml:id="m19nftig" n="3">
                      <staff xml:id="m3s1" n="1">

diff --git a/src/importexport/mei/tests/data/jump-01.mscx b/src/importexport/mei/tests/data/jump-01.mscx
@@ -76,7 +76,7 @@
       <Measure>
         <Jump>
           <style>repeat_right</style>
-          <text>D.C. al Double Coda</text>
+          <text>D.C. al Codetta</text>
           <jumpTo>start</jumpTo>
           <playUntil>varcoda</playUntil>
           <continueAt>codab</continueAt>

diff --git a/src/importexport/mei/tests/data/jump-02.mei b/src/importexport/mei/tests/data/jump-02.mei
@@ -225,7 +225,7 @@
                            <mRest xml:id="mf88e0i" />
                         </layer>
                      </staff>
-                     <repeatMark xml:id="rb0e9jx" type="mscore-jump-dc-al-double-coda" func="daCapo" tstamp="0.000000">D.C. al Double Coda</repeatMark>
+                     <repeatMark xml:id="rb0e9jx" type="mscore-jump-dc-al-double-coda" func="daCapo" tstamp="0.000000">D.C. al Codetta</repeatMark>
                   </measure>
                   <measure xml:id="m4wju9q" n="26">
                      <staff xml:id="m26s1" n="1">
@@ -247,7 +247,7 @@
                            <mRest xml:id="mdx816j" />
                         </layer>
                      </staff>
-                     <repeatMark xml:id="r1rlyijq" type="mscore-jump-ds-al-double-coda" func="dalSegno" tstamp="0.000000">D.S. al Double Coda</repeatMark>
+                     <repeatMark xml:id="r1rlyijq" type="mscore-jump-ds-al-double-coda" func="dalSegno" tstamp="0.000000">D.S. al Codetta</repeatMark>
                   </measure>
                   <measure xml:id="m14x5idk" n="29">
                      <staff xml:id="m29s1" n="1">
@@ -306,7 +306,7 @@
                            <mRest xml:id="mnffeub" />
                         </layer>
                      </staff>
-                     <repeatMark xml:id="ra4t4wq" type="mscore-jump-dss-al-double-coda" func="dalSegno" tstamp="0.000000">D.S.S. al Double Coda</repeatMark>
+                     <repeatMark xml:id="ra4t4wq" type="mscore-jump-dss-al-double-coda" func="dalSegno" tstamp="0.000000">D.S.S. al Codetta</repeatMark>
                   </measure>
                   <measure xml:id="m1cd5cwt" n="37">
                      <staff xml:id="m37s1" n="1">

diff --git a/src/importexport/mei/tests/data/jump-02.mscx b/src/importexport/mei/tests/data/jump-02.mscx
@@ -329,7 +329,7 @@
       <Measure>
         <Jump>
           <style>repeat_right</style>
-          <text>D.C. al Double Coda</text>
+          <text>D.C. al Codetta</text>
           <jumpTo>start</jumpTo>
           <playUntil>varcoda</playUntil>
           <continueAt>codab</continueAt>
@@ -360,7 +360,7 @@
       <Measure>
         <Jump>
           <style>repeat_right</style>
-          <text>D.S. al Double Coda</text>
+          <text>D.S. al Codetta</text>
           <jumpTo>segno</jumpTo>
           <playUntil>varcoda</playUntil>
           <continueAt>codab</continueAt>
@@ -445,7 +445,7 @@
       <Measure>
         <Jump>
           <style>repeat_right</style>
-          <text>D.S.S. al Double Coda</text>
+          <text>D.S.S. al Codetta</text>
           <jumpTo>varsegno</jumpTo>
           <playUntil>varcoda</playUntil>
           <continueAt>codab</continueAt>