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.

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

Add 2 Couperin ornaments #10412

Merged
merged 1 commit into from
May 11, 2023
Merged

Conversation

sammik
Copy link
Contributor

@sammik sammik commented Jan 30, 2022

Added two french ornaments - Tremblement appuyé (Couperin), and Pincé (Couperin)

  • 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
Copy link
Contributor

Jojo-Schmitz commented Jan 31, 2022

Possible merge conflict with #10282

@@ -286,6 +286,7 @@ void SymbolsMetaParser::doParse(const Ms::EngravingItem* item, const RenderingCo
types.emplace(mpe::ArticulationType::UpMordent);
break;
case Ms::SymId::ornamentMordent:
case Ms::SymId::ornamentPinceCouperin:
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz Jan 31, 2022

Choose a reason for hiding this comment

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

Trying to port this PR to 3.x (for inclusion in PR #9000) and wonder where this change needs to go (or whether at all)?

Also unsure where Ms::SymId::ornamentTremplementCouperin would belong, why it is missing here?

And whether I'd need to something similar for PR #10282?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ms::SymId::ornamentTreblementCouperin was there already

case Ms::SymId::ornamentTremblementCouperin:

Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz Jan 31, 2022

Choose a reason for hiding this comment

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

Ah, explains my 2nd question. Not the first nor the last though-

Ah, last question is answered as well: I added them already.
Remains the first?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think this applies to MU3, since it is part of the new MPE playback system.

Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz Jan 31, 2022

Choose a reason for hiding this comment

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

Yep, just found that out myself seconds ago, thanks

Good, answers the 1st question as : no need for this in 3.x

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jan 31, 2022
Tremblement appuyé (Couperin), Pincé (Couperin)

Backport of PR musescore#10412
@sammik sammik changed the title Add 2 Couperin ornamnets Add 2 Couperin ornaments Jan 31, 2022
@sammik
Copy link
Contributor Author

sammik commented Jan 31, 2022

Possible merge conflict with #10282 (And typo in commit- and PR title, "ornamnets")

Should I change commit message?

@Jojo-Schmitz
Copy link
Contributor

Only if you haven't got anything better to do ;-)

@sammik
Copy link
Contributor Author

sammik commented Jan 31, 2022 via email

@Jojo-Schmitz
Copy link
Contributor

That's when the WAF* kicks in...

*) Women's Acceptancy Factor ;-)

@sammik sammik force-pushed the couperin-ornaments branch from 924af5b to 1864aca Compare January 31, 2022 20:54
@sammik
Copy link
Contributor Author

sammik commented Jan 31, 2022

That's when the WAF* kicks in...

*) Women's Acceptancy Factor ;-)

:)
S*WAF === true
*Sleeping

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Feb 4, 2022
Tremblement appuyé (Couperin), Pincé (Couperin)

Backport of PR musescore#10412
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Feb 5, 2022
Tremblement appuyé (Couperin), Pincé (Couperin)

Backport of PR musescore#10412
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Feb 7, 2022
Tremblement appuyé (Couperin), Pincé (Couperin)

Backport of PR musescore#10412
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Feb 24, 2022
Tremblement appuyé (Couperin), Pincé (Couperin)

Backport of PR musescore#10412
@Jojo-Schmitz
Copy link
Contributor

rebase needed

@RobFog
Copy link

RobFog commented May 1, 2022

Rebase still needed.

@sammik sammik force-pushed the couperin-ornaments branch from 1864aca to dc33d8e Compare May 1, 2022 14:23
@sammik
Copy link
Contributor Author

sammik commented May 1, 2022

Rebase done

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request May 12, 2022
Tremblement appuyé (Couperin), Pincé (Couperin)

Backport of PR musescore#10412
@sammik sammik force-pushed the couperin-ornaments branch from dc33d8e to 2e9061d Compare July 18, 2022 21:39
@cbjeukendrup cbjeukendrup added the strings Affects translatable strings label Sep 26, 2022
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Mar 5, 2023
Tremblement appuyé (Couperin), Pincé (Couperin)

Backport of PR musescore#10412
@Jojo-Schmitz
Copy link
Contributor

Rebase needed

@sammik sammik force-pushed the couperin-ornaments branch from 2e9061d to e4394c2 Compare May 11, 2023 00:00
@sammik
Copy link
Contributor Author

sammik commented May 11, 2023

Rebase needed

done

@sammik sammik force-pushed the couperin-ornaments branch from e4394c2 to 3c1ab8c Compare May 11, 2023 00:07
Tremblement appuyé (Couperin), Pincé (Couperin)
@sammik sammik force-pushed the couperin-ornaments branch from 3c1ab8c to ad06c36 Compare May 11, 2023 00:16
@sammik
Copy link
Contributor Author

sammik commented May 11, 2023

@RomanPudashkin
please, look at this, if You have some time

@RomanPudashkin RomanPudashkin merged commit 2648a41 into musescore:master May 11, 2023
@sammik sammik deleted the couperin-ornaments branch May 11, 2023 08:49
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request May 8, 2024
Tremblement appuyé (Couperin), Pincé (Couperin)

Leftover from an earlier backport of musescore#10412
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request May 8, 2024
Tremblement appuyé (Couperin), Pincé (Couperin)

Leftover from an earlier backport of musescore#10412
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request May 13, 2024
Tremblement appuyé (Couperin), Pincé (Couperin)

Leftover from an earlier backport of musescore#10412
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request May 13, 2024
Tremblement appuyé (Couperin), Pincé (Couperin)

Leftover from an earlier backport of musescore#10412
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
strings Affects translatable strings
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants