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

Fix #274521: fix concert pitch clef issues #3824

Merged
merged 1 commit into from Jul 31, 2018
Merged

Fix #274521: fix concert pitch clef issues #3824

merged 1 commit into from Jul 31, 2018

Conversation

jthistle
Copy link
Contributor

shoogle
shoogle reviewed Jul 22, 2018
View reviewed changes
share/instruments/instruments.xml Outdated
@@ -1066,10 +1066,13 @@
<shortName>Hph.</shortName>
<description>Heckelphone</description>
<musicXMLid>wind.reed.heckelphone</musicXMLid>
<clef>G8vb</clef>
<clef>G</clef>
Copy link
Contributor

Choose a reason for hiding this comment

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

<clef> should be <transposingClef>, and <concertClef> should appear immediately afterwards. See piccolo for example.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My bad, I'll change that and update the branch

shoogle
shoogle reviewed Jul 22, 2018
View reviewed changes
share/instruments/instruments.xml Outdated
@@ -2044,6 +2047,7 @@
<pPitchRange>22-60</pPitchRange>
<transposeDiatonic>-7</transposeDiatonic>
<transposeChromatic>-12</transposeChromatic>
<concertClef>F8vb</concertClef>
Copy link
Contributor

Choose a reason for hiding this comment

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

Same problem here as above.

@shoogle
Copy link
Contributor

shoogle commented Jul 22, 2018

This looks good to me. Thanks for applying my suggestions. Now you just need to squash these commits into one single commit.

Squashing commits

  • Easy method: soft reset and commit
    • This method is fine for squashing multiple commits into one (e.g. 2 into 1, like you are doing here).
    • It also allows you to edit that one squashed commit.
  • Advanced method: interactive rebase
    • This method can be used to squash commits (e.g. 2 into 1) and it also allows you to do more fancy things like split commits (e.g. 1 into 2), or squash into more than one (e.g. 3 into 2).
    • It also allows you to edit commits earlier than the most recent one.

You can use the easy method. The advanced method is more complicated and is only useful for things that the easy method can't handle. I only mention the advanced method because for some reason it is usually given as the method for squashing commits, even though the easy method works fine for this.

@jthistle
Copy link
Contributor Author

Squashed and ready for merge :)

@lasconic lasconic merged commit 61840da into musescore:master Jul 31, 2018
@lasconic
Copy link
Contributor

If I'm not wrong, this is your first PR to MuseScore ! Thank you and welcome to the contributor community !

@jthistle
Copy link
Contributor Author

@lasconic - it certainly is! I'm looking forward to making many more, I hope :)

@jthistle jthistle deleted the 274521-fix-clef-issues branch August 16, 2018 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shoogle shoogle shoogle left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jthistle @shoogle @lasconic