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 #44841: reconcile lyricsline length adjustments #1657

Merged

Conversation

MarcSabatella
Copy link
Contributor

This change re-instates the portion of my code from #1638 that conflicted with @mgavioli changes in #1643, while preserving his changes as well.

This should now properly handle the layout of both types of LYRICSLINE in SLine::linePos(). Melisma lines get my code to calculate the endpoint more accurately relative to the righthand edge of the chord, hyphens get the original code to initially extend all the way to the next chord or end barline (this is adjusted later in LyricsLineSegment::layout()).

I also made an adjustment to in SLine::linePos() to allow hyphens to extend all the way to the end barline. Other lines in this category (HAIRPIN, TRILL, TEXTLINE) are terminated 1sp short of the barline, but this isn't appropriate for hyphens. The result was that a hyphen on the last note of a crowded system was being rendered shorter than necessary, with an extra 1sp of legroom going to waste.

@wschweer : I have been testing and reviewing things as thoroughly as I can, and so far so good. I fixed one crash that resulted from an unexpected interaction between commits, but aside from that and this one area where we knew there a potential conflict, all the code seems to be working well together.

Thanks, @mgavioli for undertaking this! An awful lot of lyric annoyances have been eliminated.

@mgavioli
Copy link
Contributor

@MarcSabatella : thanks to you for all the improvements and sorry for the conflict on SLine::linePos(): sometime it is hard to guess how git will do the merging...

wschweer added a commit that referenced this pull request Jan 21, 2015
…osition

fix #44841: reconcile lyricsline length adjustments
@wschweer wschweer merged commit 5858566 into musescore:master Jan 21, 2015
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

3 participants