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 #279980, fix #287723, fix #186111: rehearsal mark alignment #4919

Merged
merged 1 commit into from May 20, 2019

Conversation

@MarcSabatella
Copy link
Contributor

MarcSabatella commented Apr 14, 2019

There's been a bunch of give and take over the years on the best way to position rehearsal marks with respect to horizontal alignment. While we have a solution that works decently well in a lot of cases, it does not do well well if there are repeats, or in the case of mid-measure key changes. Also, there was a regression between 2.3.2 and 3.0 where we lost correct alignment of right-aligned rehearsal marks (here: c1726bb#diff-2ee382c946a5e3ac5f7506d72dae8919).

This PR address these issues. It's not a big change; it just restructures the calculations in a way that covers the different cases: (header / no header, repeat / no repeat, start / middle of system, left / right / center alignment. The calculations themselves are basically same as always, I just apply them more consistently. Only real new aspect is the specific check for repeats.

Here is the result:

image

@MarcSabatella

This comment has been minimized.

Copy link
Contributor Author

MarcSabatella commented May 19, 2019

I'd really like to see this merged for 3.1, it's going to affect default layout in a positive way but meanwhile people are applying manual adjustments that will end up being wrong.

@anatoly-os anatoly-os merged commit d0545a5 into musescore:master May 20, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.