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

Lyric improvements #3905

Merged
merged 9 commits into from
Jan 6, 2025
Merged

Lyric improvements #3905

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e1c7af4
Make Verse member of AttPlacementRelStaff
lpugin Dec 27, 2024
aae3bb5
Add support for lyrics above the staff
lpugin Dec 27, 2024
b4d0d07
Add --lyric-height option
lpugin Dec 27, 2024
4cd183c
Change --lyric-height to --lyric-height-factor
lpugin Jan 6, 2025
87b521c
Update src/adjustfloatingpositionerfunctor.cpp
lpugin Jan 6, 2025
7dea440
Update include/vrv/verticalaligner.h
lpugin Jan 6, 2025
7bafbe8
Remove duplicating if statement
lpugin Jan 6, 2025
b0eafde
Fix formatting
lpugin Jan 6, 2025
8ed9ef4
Revert "Remove duplicating if statement"
lpugin Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/alignfunctor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,11 +655,8 @@ FunctorCode AlignVerticallyFunctor::VisitStaff(Staff *staff)
const int verseNumber = verse->GetN();
const data_STAFFREL versePlace = verse->GetPlace();
const bool verseCollapse = m_doc->GetOptions()->m_lyricVerseCollapse.GetValue();
if ((versePlace == STAFFREL_above) && !alignment->GetVersePositionAbove(verseNumber, verseCollapse)) {
alignment->AddVerseN(verseNumber, verse->GetPlace());
}
if ((versePlace != STAFFREL_above) && !alignment->GetVersePositionBelow(verseNumber, verseCollapse)) {
alignment->AddVerseN(verseNumber, verse->GetPlace());
if (!alignment->GetVersePositionAbove(verseNumber, verseCollapse)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, sorry -- just re-looking. One is GetVersePositionAbove and one is GetVersePositionBelow...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it was actually correct. Reverted.

alignment->AddVerseN(verseNumber, versePlace);
}
}
}
Expand Down
Loading