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

fix #85876: Breath marks for voices > 1 #4220

Merged
merged 1 commit into from
Jun 6, 2020

Conversation

tobik
Copy link
Contributor

@tobik tobik commented Nov 26, 2018

With this pull request breath marks can be assigned to voices > 1.

When a breath mark is dropped on a note the breath mark gets assigned to the voice of the note. The horizontal position is set to the end of this note.

Layouting a breath mark adapts it's vertical position according to it's voice. Breath mark of voices 1 and 3 are set to top staff line as before. Breath marks for voices 2 and 4 are moved down to the bottom line of the staff.

@mattmcclinch
Copy link
Contributor

Moving breath marks to the bottom staff line for voices 2 and 4 is an interesting idea, but I am not sure that it is based on any standard for music engraving. According to Gould, breath marks should always go above the staff. Also, this conflicts with #4598, which is meant to fix a breath mark positioning issue.

@mattmcclinch
Copy link
Contributor

Well, I just came across some examples in choral music where breath marks for lower voices were placed below the staff. I think the best way to handle this would be the way we handle "Above" or "Below" placement for fermatas. The default placement would be set based on the voice, and the user could change it via the Inspector if desired. Then layout would use the placement property rather than the voice to determine whether to place the breath mark above or below the staff. (Or on the top line or bottom line, as the case may be.)

@tobik
Copy link
Contributor Author

tobik commented Jan 18, 2019

Gould does not handle breath marks for multiple voices. So it is probably up to us? In fact, most the literature I have to use utilizes breath marks down in voice 2.

The PR consist of two parts.

  • The insertion of the breath mark at the position of the note in the specific voice. So if you have a whole note in voice 1 but 4 quarters in voice 2 the breath mark is placed behind the quarter, not behind the whole.
  • The vertical position of the breath mark according to its voice.

Especially point 1 could not be accomplished by the proposed handling with Above and Below. Please reconsider the PR. I did quite some scores with it and it is such a releave.

@tobik
Copy link
Contributor Author

tobik commented Dec 4, 2019

@mattmcclinch
According to your comment from 18 Jan I added placement handling. The default placement for breaths in voice 1/3 is above and in voice 2/4 below. The placement can be changed in the inspector.

libmscore/breath.cpp Outdated Show resolved Hide resolved
@tobik tobik mentioned this pull request May 4, 2020
12 tasks
@anatoly-os
Copy link
Contributor

@tobik Could you please rebase this branch on top of 3.x?

@tobik tobik changed the base branch from master to 3.x June 6, 2020 15:22
@tobik
Copy link
Contributor Author

tobik commented Jun 6, 2020

I will resolve the conflicts ASAP

@mattmcclinch
Copy link
Contributor

You were supposed to rebase 85876-breath-voices onto 3.x, not merge 3.x into 85876-breath-voices.

@tobik
Copy link
Contributor Author

tobik commented Jun 6, 2020

There's been a conflict due to a recent merge in 3.x. I tried to resolve this. What did I wrong?
Is it maybe just a misleading commit title which has been automatically generated by github.

@anatoly-os
Copy link
Contributor

@anatoly-os
Copy link
Contributor

And don't forget to squash the commits git rebase -i HEAD~6 and follow the instructions provided during the interactive rebasing process (replace peak with squash for all, but the very first commit)

@anatoly-os anatoly-os merged commit 3951269 into musescore:3.x Jun 6, 2020
@tobik tobik deleted the 85876-breath-voices branch June 7, 2020 19:37
anatoly-os added a commit that referenced this pull request Aug 20, 2020
Remaining changes have to be migrated to the ew inspector
@anatoly-os
Copy link
Contributor

@vpereverzev this PR introduces a new field to the breath inspector. I've applied the changes from this PR not related to the inspector in f30bec6. Could you please remake the related changes to the new inspector?

Harmoniker1 added a commit to Harmoniker1/MuseScore that referenced this pull request Aug 25, 2020
… to "below"

See musescore#4220, the copy-and-paste case was missed, causing this regression.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants