Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement #17037: Replacement of 'b' and '#' with '♭' and '♯' for staff names imported from mxml #17118

Closed
wants to merge 2 commits into from
Closed

Implement #17037: Replacement of 'b' and '#' with '♭' and '♯' for staff names imported from mxml #17118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c0aa80
allow replacement of 'b' and '#' with unicode equivalent in insrt names
asattely Apr 3, 2023
5bf7ca1
code review changes
asattely Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/engraving/libmscore/instrument.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ class Instrument
void setIsPrimary(bool isPrimary);

void updateInstrumentId();
void updateNamesForAccidentals();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this line (it is not needed)


bool singleNoteDynamics() const { return _singleNoteDynamics; }
void setSingleNoteDynamics(bool val) { _singleNoteDynamics = val; }
Expand Down
31 changes: 30 additions & 1 deletion src/importexport/musicxml/internal/musicxml/importmxml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* SPDX-License-Identifier: GPL-3.0-only
* MuseScore-CLA-applies
*
Expand Down Expand Up @@ -53,6 +53,34 @@ static int musicXMLImportErrorDialog(QString text, QString detailedText)
return errorDialog.exec();
}

void updateNamesForAccidentals(Instrument* inst)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

static void updateNamesForAccidentals(Instrument* inst)

{
auto replace = [](String name) {
name = name.replace(std::regex(
R"(((?:^|\s)([A-Ga-g]|[Uu][Tt]|[Dd][Oo]|[Rr][EeÉé]|[MmSsTt][Ii]|[FfLl][Aa]|[Ss][Oo][Ll]))b(?=\s|$))"),
String::fromStdString(R"($1♭)"));

name = name.replace(std::regex(
R"(((?:^|\s)([A-Ga-g]|[Uu][Tt]|[Dd][Oo]|[Rr][EeÉé]|[MmSsTt][Ii]|[FfLl][Aa]|[Ss][Oo][Ll]))#(?=\s|$))"),
String::fromStdString(R"($1♯)"));

return name;
};
// change staff names from simple text (eg 'Eb') to text using accidental symbols (eg 'E♭')

// Instrument::longNames() is const af so we need to make a deep copy, update it, and then set it again
StaffNameList longNamesCopy = inst->longNames();
for (StaffName& sn : longNamesCopy) {
sn.setName(replace(sn.name()));
}
StaffNameList shortNamesCopy = inst->shortNames();
for (StaffName& sn : shortNamesCopy) {
sn.setName(replace(sn.name()));
}
inst->setLongNames(longNamesCopy);
inst->setShortNames(shortNamesCopy);
}

//---------------------------------------------------------
// importMusicXMLfromBuffer
//---------------------------------------------------------
Expand Down Expand Up @@ -83,6 +111,7 @@ Err importMusicXMLfromBuffer(Score* score, const QString& /*name*/, QIODevice* d
for (const Part* part : score->parts()) {
for (const auto& pair : part->instruments()) {
pair.second->updateInstrumentId();
updateNamesForAccidentals(pair.second);
}
}

Expand Down