Skip to content

Commit

Permalink
MusicXML im-/export of the 2 additional Gould accidentals
Browse files Browse the repository at this point in the history
This change/commit will cause a merge conflict with musescore#6263
  • Loading branch information
Jojo-Schmitz committed Jun 26, 2020
1 parent 5efffce commit 0ed448f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion importexport/musicxml/musicxmlsupport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,8 @@ QString accidentalType2MxmlString(const AccidentalType type)
case AccidentalType::SHARP_SLASH3: s = "slash-quarter-sharp"; break;
case AccidentalType::FLAT_SLASH2: s = "double-slash-flat"; break;
case AccidentalType::SHARP_SLASH2: s = "slash-sharp"; break;
case AccidentalType::ARROW_DOWN: s = "arrow-down"; break;
case AccidentalType::ARROW_UP: s = "arrow-up"; break;
case AccidentalType::SORI: s = "sori"; break;
case AccidentalType::KORON: s = "koron"; break;
default:
Expand Down Expand Up @@ -520,6 +522,8 @@ AccidentalType mxmlString2accidentalType(const QString mxmlName)
map["natural-up"] = AccidentalType::NATURAL_ARROW_UP;
map["flat-down"] = AccidentalType::FLAT_ARROW_DOWN;
map["flat-up"] = AccidentalType::FLAT_ARROW_UP;
map["arrow-down"] = AccidentalType::ARROW_DOWN;
map["arrow-up"] = AccidentalType::ARROW_UP;

map["slash-quarter-sharp"] = AccidentalType::SHARP_SLASH3; // MIRRORED_FLAT_SLASH; ?
map["slash-sharp"] = AccidentalType::SHARP_SLASH2; // SHARP_SLASH; ?
Expand All @@ -535,7 +539,6 @@ AccidentalType mxmlString2accidentalType(const QString mxmlName)
return map.value(mxmlName);
else
qDebug("mxmlString2accidentalType: unknown accidental '%s'", qPrintable(mxmlName));
// default: return AccidentalType::NONE
return AccidentalType::NONE;
}

Expand Down

0 comments on commit 0ed448f

Please sign in to comment.