Fix GH#20196: Invalid MusicXML exported for time signatures cut time …

…(Bach) and cut triple time Came in via musescore#7044 Backport of musescore#20197, part 1
Jojo-Schmitz · Nov 30, 2023 · 847caed · 847caed
1 parent 4e77e41
commit 847caed
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 28 deletions.
diff --git a/importexport/musicxml/exportxml.cpp b/importexport/musicxml/exportxml.cpp
@@ -1997,10 +1997,6 @@ void ExportMusicXml::timesig(TimeSig* tsig)
             tagName += " symbol=\"common\"";
       else if (st == TimeSigType::ALLA_BREVE)
             tagName += " symbol=\"cut\"";
-      else if (st == TimeSigType::CUT_BACH)
-            tagName += " symbol=\"cut2\"";
-      else if (st == TimeSigType::CUT_TRIPLE)
-            tagName += " symbol=\"cut3\"";
       if (!tsig->visible())
             tagName += " print-object=\"no\"";
       tagName += color2xml(tsig);

diff --git a/importexport/musicxml/importmxmlpass1.cpp b/importexport/musicxml/importmxmlpass1.cpp
@@ -2700,18 +2700,6 @@ static bool determineTimeSig(MxmlLogger* logger, const QXmlStreamReader* const x
             btp = 4;
             return true;
             }
-      else if (beats == "2" && beatType == "2" && timeSymbol == "cut2") {
-            st = TimeSigType::CUT_BACH;
-            bts = 2;
-            btp = 2;
-            return true;
-            }
-      else if (beats == "9" && beatType == "8" && timeSymbol == "cut3") {
-            st = TimeSigType::CUT_TRIPLE;
-            bts = 9;
-            btp = 8;
-            return true;
-            }
       else {
             if (!timeSymbol.isEmpty() && timeSymbol != "normal") {
                   logger->logError(QString("time symbol '%1' not recognized with beats=%2 and beat-type=%3")

diff --git a/importexport/musicxml/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp
@@ -4981,18 +4981,6 @@ static bool determineTimeSig(const QString beats, const QString beatType, const
             btp = 4;
             return true;
             }
-      else if (beats == "2" && beatType == "2" && timeSymbol == "cut2") {
-            st = TimeSigType::CUT_BACH;
-            bts = 2;
-            btp = 2;
-            return true;
-            }
-      else if (beats == "9" && beatType == "8" && timeSymbol == "cut3") {
-            st = TimeSigType::CUT_TRIPLE;
-            bts = 9;
-            btp = 8;
-            return true;
-            }
       else {
             if (!timeSymbol.isEmpty() && timeSymbol != "normal") {
                   qDebug("determineTimeSig: time symbol <%s> not recognized with beats=%s and beat-type=%s",