Skip to content

Musicxml: fix testInferredTechnique test #33617

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

Open
RomanPudashkin wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −23
Open

Musicxml: fix testInferredTechnique test #33617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion muse
Open in desktop
Submodule muse updated 6 files
+1 −1 .github/pull_request_template.md
+1 −1 buildscripts/cmake/CheckCompilerVersion.cmake
+12 −1 framework/audio/engine/internal/synthesizers/fluidsynth/fluidsequencer.cpp
+10 −1 framework/cloud/internal/abstractcloudservice.cpp
+3 −0 framework/ui/view/iconcodes.h
+15 −1 framework/vst/internal/synth/vstsequencer.cpp
48 changes: 27 additions & 21 deletions src/importexport/musicxml/internal/import/importmusicxmlpass2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5001,36 +5001,42 @@ PlayingTechniqueType MusicXmlParserDirection::getPlayingTechnique() const
return PlayingTechniqueType::Undefined;
}

const String plainWords = MScoreTextToMusicXml::toPlainText(m_wordsText.simplified());
static const std::unordered_map<muse::String, PlayingTechniqueType> textToPlayTechniqueType {
{ u"natural", PlayingTechniqueType::Natural },
{ u"normal", PlayingTechniqueType::Natural },
{ u"ord", PlayingTechniqueType::Natural },
{ u"arco", PlayingTechniqueType::Natural },
{ u"pizz", PlayingTechniqueType::Pizzicato },
{ u"open", PlayingTechniqueType::Open },
{ u"senza sord", PlayingTechniqueType::Open },
{ u"unmuted", PlayingTechniqueType::Open },
String plainWords = MScoreTextToMusicXml::toPlainText(m_wordsText.simplified()).toLower();
plainWords.remove(std::wregex(L"[\\.,;:]+")); // remove punctuation

// Ordered longest-first so specific phrases match before their substrings
// (e.g. "without mute" before "mute", "con sord" before "ord")
static const std::vector<std::pair<muse::String, PlayingTechniqueType> > textToPlayTechniqueType {
{ u"palm mute", PlayingTechniqueType::Undefined },
{ u"palmmute", PlayingTechniqueType::Undefined },
{ u"without mute", PlayingTechniqueType::Open },
{ u"no mute", PlayingTechniqueType::Open },
{ u"mute", PlayingTechniqueType::Mute },
{ u"distortion", PlayingTechniqueType::Distortion },
{ u"senza sord", PlayingTechniqueType::Open },
{ u"harmonics", PlayingTechniqueType::Harmonics },
{ u"overdrive", PlayingTechniqueType::Overdrive },
{ u"sul pont", PlayingTechniqueType::SulPonticello },
{ u"sul tast", PlayingTechniqueType::SulTasto },
{ u"con sord", PlayingTechniqueType::Mute },
{ u"sord", PlayingTechniqueType::Mute },
{ u"trem", PlayingTechniqueType::Tremolo },
{ u"detache", PlayingTechniqueType::Detache },
{ u"martele", PlayingTechniqueType::Martele },
{ u"legno", PlayingTechniqueType::ColLegno },
{ u"sul pont", PlayingTechniqueType::SulPonticello },
{ u"sul tast", PlayingTechniqueType::SulTasto },
{ u"natural", PlayingTechniqueType::Natural },
{ u"no mute", PlayingTechniqueType::Open },
{ u"unmuted", PlayingTechniqueType::Open },
{ u"vibrato", PlayingTechniqueType::Vibrato },
{ u"legato", PlayingTechniqueType::Legato },
{ u"distortion", PlayingTechniqueType::Distortion },
{ u"overdrive", PlayingTechniqueType::Overdrive },
{ u"harmonics", PlayingTechniqueType::Harmonics },
{ u"normal", PlayingTechniqueType::Natural },
{ u"legno", PlayingTechniqueType::ColLegno },
{ u"open", PlayingTechniqueType::Open },
{ u"arco", PlayingTechniqueType::Natural },
{ u"jazz", PlayingTechniqueType::JazzTone },
{ u"mute", PlayingTechniqueType::Mute },
{ u"pizz", PlayingTechniqueType::Pizzicato },
{ u"sord", PlayingTechniqueType::Mute },
{ u"trem", PlayingTechniqueType::Tremolo },
{ u"ord", PlayingTechniqueType::Natural },
};

for (auto& technique : textToPlayTechniqueType) {
for (const auto& technique : textToPlayTechniqueType) {
if (plainWords.contains(technique.first)) {
return technique.second;
}
Expand Down
2 changes: 1 addition & 1 deletion src/importexport/musicxml/tests/data/testInferredTechnique_ref.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
<eid>t_t</eid>
<voice>
<PlayTechAnnotation>
<playTechType>mute</playTechType>
<playTechType>open</playTechType>
<eid>u_u</eid>
<text>senza sord</text>
</PlayTechAnnotation>
Expand Down
Loading