[MusicXML] Add missing Gould arrow quartertone accidentals #6263

rettinghaus · 2020-06-26T08:17:01Z

This PR is a simple addition to allow import/export of the added Gould arrow quartertone accidentals in MusicXML 3.1.

I signed CLA
I made sure the code in the PR follows the coding rules
I made sure the code compiles on my machine
I made sure there are no unnecessary changes in the code
I made sure the title of the PR reflects the core meaning of the issue you are solving
I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"
I made sure the commit message title starts with "fix #424242:" if there is a related issue
I created the test (mtest, vtest, script test) to verify the changes I made

Jojo-Schmitz · 2020-06-26T09:59:27Z

Looks good to me. @lvinken , what do you think?
Can you please have a look at #6182, whether that should enable the added accidentals also for MusicXML?

I think you should rebase this to the 3.x branch though. As far as I can tell you can do that here on GitHub, via the Edit button

Not sure what's up with Travis, seems to have hit a timeout, but the build and all the tests passed.
Not sure where the GitHub tests went. Seems we're having an issue with out build enironment, @anatoly-os ?

Jojo-Schmitz · 2020-06-26T11:50:32Z

I've just double checked, those accidentals indeed do exist in MusicXML, see https://github.com/w3c/musicxml/blob/6e3a667b85855b04d7e4548ea508b537bc29fc52/schema/musicxml.xsd#L1415-L1418
As do the two remaining ones from the Gould accidentals added in #6182, see https://github.com/w3c/musicxml/blob/6e3a667b85855b04d7e4548ea508b537bc29fc52/schema/musicxml.xsd#L1419-L1420
As do the ones added in #6002, see https://github.com/w3c/musicxml/blob/6e3a667b85855b04d7e4548ea508b537bc29fc52/schema/musicxml.xsd#L1421-L1422

Jojo-Schmitz · 2020-06-26T11:53:30Z

importexport/musicxml/musicxmlsupport.cpp

+            case AccidentalType::SHARP2_ARROW_DOWN:  s = "double-sharp-down";    break;
+            case AccidentalType::SHARP2_ARROW_UP:    s = "double-sharp-up";      break;
+            case AccidentalType::FLAT2_ARROW_DOWN:   s = "flat-flat-down";       break;
+            case AccidentalType::FLAT2_ARROW_UP:     s = "flat-flat-up";         break;
            case AccidentalType::SORI:               s = "sori";                 break;
            case AccidentalType::KORON:              s = "koron";                break;
            default:


Maybe the default should be s = "other"? While keeping the qDebug() message, I guess.

Don't think so. The other value is supposed to go together with the @smuflattribute.
See the answer bei @mdgood here: w3c/musicxml#263

OK, then let's just add that?
Probably something for a different PR though

Jojo-Schmitz · 2020-06-26T11:59:04Z

importexport/musicxml/musicxmlsupport.cpp

+      map["double-sharp-down"] = AccidentalType::SHARP2_ARROW_DOWN;
+      map["double-sharp-up"] = AccidentalType::SHARP2_ARROW_UP;
+      map["flat-flat-down"] = AccidentalType::FLAT2_ARROW_DOWN;
+      map["flat-flat-up"] = AccidentalType::FLAT2_ARROW_UP;


Not sure though how or whether to handle an import of "other". Seems the current defaulting to AccidentalType::NONE alone with a qDebug() message is reasonable.

As mentioned above, handling "other" would only make sense, if we'd check the @smufl attribute. So, for now, I think it's ok to ignore "other".

and default to "other" for all otherwise unknown accidentals. This change/commit will cause a merge conflict with musescore#6263

This change/commit will cause a merge conflict with musescore#6263

and fix some MusicXML todos This change/commit will cause a merge conflict with musescore#6263

lvinken · 2020-06-27T09:54:53Z

Looks OK to me. Note that this should go in 3.x and master, I am not quite sure if automatic sync from 3.x to master is in place.

Jojo-Schmitz · 2020-06-27T09:57:39Z

Thanks. There is no automatic sync between 3.x and master

and fix some MusicXML todos This change/commit will cause a merge conflict with musescore#6263

and fix some MusicXML todos This change/commit will cause a merge conflict with musescore#6263 (it actually includes it completly)

and fix some MusicXML todos and complete the accifental mappings This change/commit will cause a merge conflict with musescore#6263 (it actually includes it completly)

[MusicXML] Add missing Gould arrow quartertone accidentals

and fix some MusicXML todos and complete the accifental mappings This change/commit will cause a merge conflict with musescore#6263 (it actually includes it completly)

and fix some MusicXML todos and complete the accidental mappings This change/commit will cause a merge conflict with musescore#6263 (it actually includes it completly)

and fix some MusicXML todos and complete the accidental mappings This change/commit will cause a merge conflict with #6263 (it actually includes it completly)

rettinghaus mentioned this pull request Jun 26, 2020

MuseScore 3.5 Release Candidate. PRs to be merged #6195

Closed

1 task

Jojo-Schmitz approved these changes Jun 26, 2020

View reviewed changes

[MusicXML] Add missing Gould arrow quartertone accidentals

9059e48

rettinghaus force-pushed the dev-arrowaccid branch from 97b2c22 to 9059e48 Compare June 26, 2020 10:14

rettinghaus changed the base branch from 3.5rc to 3.x June 26, 2020 10:15

Jojo-Schmitz reviewed Jun 26, 2020

View reviewed changes

Jojo-Schmitz mentioned this pull request Jun 26, 2020

Add support for triple sharp and triple flat #6002

Closed

Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jun 26, 2020

MusicXML im-/export of the 2 additional Gould accidentals

0ed448f

This change/commit will cause a merge conflict with musescore#6263

Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jun 26, 2020

MusicXML im-/export of the 2 additional Gould accidentals

302b7d9

and fix some MusicXML todos This change/commit will cause a merge conflict with musescore#6263

Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jun 27, 2020

MusicXML im-/export of the 2 additional Gould accidentals

e9cffd9

and fix some MusicXML todos This change/commit will cause a merge conflict with musescore#6263

Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jun 27, 2020

MusicXML im-/export of the 2 additional Gould accidentals

e39fc61

and fix some MusicXML todos This change/commit will cause a merge conflict with musescore#6263

Jojo-Schmitz added a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jun 27, 2020

MusicXML im-/export of the 2 additional Gould accidentals

9b94be9

and fix some MusicXML todos This change/commit will cause a merge conflict with musescore#6263

Jojo-Schmitz mentioned this pull request Jun 27, 2020

[MU3] Add more accidentals #6182

Merged

anatoly-os merged commit 5229e68 into musescore:3.x Jul 7, 2020

anatoly-os added a commit that referenced this pull request Jul 7, 2020

Merge pull request #6263 from rettinghaus/dev-arrowaccid

999d739

[MusicXML] Add missing Gould arrow quartertone accidentals

rettinghaus deleted the dev-arrowaccid branch July 22, 2020 07:25

Jojo-Schmitz mentioned this pull request Jul 22, 2020

[MU4 Issue] PRs from 3.x to be merged into / ported to master #6079

Closed

29 tasks

anatoly-os added a commit that referenced this pull request Jul 22, 2020

Manually merged #6263 to master

502116f

This was referenced Oct 20, 2020

Add more accidentals (master) Jojo-Schmitz/MuseScore#69

Closed

[MU4] Add more accidentals #6708

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MusicXML] Add missing Gould arrow quartertone accidentals #6263

[MusicXML] Add missing Gould arrow quartertone accidentals #6263

rettinghaus commented Jun 26, 2020

Jojo-Schmitz commented Jun 26, 2020 •

edited

Jojo-Schmitz commented Jun 26, 2020 •

edited

Jojo-Schmitz Jun 26, 2020 •

edited

rettinghaus Jun 26, 2020

Jojo-Schmitz Jun 26, 2020

Jojo-Schmitz Jun 26, 2020 •

edited

rettinghaus Jun 26, 2020

lvinken commented Jun 27, 2020

Jojo-Schmitz commented Jun 27, 2020

[MusicXML] Add missing Gould arrow quartertone accidentals #6263

[MusicXML] Add missing Gould arrow quartertone accidentals #6263

Conversation

rettinghaus commented Jun 26, 2020

Jojo-Schmitz commented Jun 26, 2020 • edited

Jojo-Schmitz commented Jun 26, 2020 • edited

Jojo-Schmitz Jun 26, 2020 • edited

Choose a reason for hiding this comment

rettinghaus Jun 26, 2020

Choose a reason for hiding this comment

Jojo-Schmitz Jun 26, 2020

Choose a reason for hiding this comment

Jojo-Schmitz Jun 26, 2020 • edited

Choose a reason for hiding this comment

rettinghaus Jun 26, 2020

Choose a reason for hiding this comment

lvinken commented Jun 27, 2020

Jojo-Schmitz commented Jun 27, 2020

Jojo-Schmitz commented Jun 26, 2020 •

edited

Jojo-Schmitz commented Jun 26, 2020 •

edited

Jojo-Schmitz Jun 26, 2020 •

edited

Jojo-Schmitz Jun 26, 2020 •

edited