fix #35176: ottava layout in various special situations
This commit is contained in:
Marc Sabatella
parent
1349587b2d
commit
4868a125e2
9 changed files with 56 additions and 15 deletions
|
|
@ -469,25 +469,69 @@ SLine::SLine(const SLine& s)
|
|||
QPointF SLine::linePos(GripLine grip, System** sys) const
|
||||
{
|
||||
qreal x = 0.0;
|
||||
qreal sp = staff()->spatium();
|
||||
switch (anchor()) {
|
||||
case Spanner::Anchor::SEGMENT:
|
||||
{
|
||||
ChordRest* cr;
|
||||
if (grip == GripLine::START) {
|
||||
cr = static_cast<ChordRest*>(startElement());
|
||||
if (cr) {
|
||||
// some sources say to center the text over the note head
|
||||
// some say to start the text just to left of notehead
|
||||
// our simple compromise - left align
|
||||
if (cr->durationType() == TDuration::DurationType::V_MEASURE && type() == Element::Type::OTTAVA)
|
||||
x = cr->x(); // center for measure rests
|
||||
else if (cr->space().lw() > 0.0)
|
||||
x = -cr->space().lw(); // account for accidentals, etc
|
||||
}
|
||||
}
|
||||
else {
|
||||
cr = static_cast<ChordRest*>(endElement());
|
||||
if (type() == Element::Type::OTTAVA) {
|
||||
// lay out to right edge of note (including dots)
|
||||
if (cr)
|
||||
x += cr->segment()->width();
|
||||
if (cr && cr->durationType() == TDuration::DurationType::V_MEASURE) {
|
||||
x = cr->x() + cr->width();
|
||||
}
|
||||
else if (cr) {
|
||||
// lay out just past right edge of all notes for this segment on this staff
|
||||
// note: the cheap solution is to simply use segment width,
|
||||
// but that would account for notes in other staves unnecessarily
|
||||
// and in any event, segment bboxes seem unreliable
|
||||
qreal width = 0;
|
||||
Segment* s = cr->segment();
|
||||
int n = staffIdx() * VOICES;
|
||||
for (int i = 0; i < VOICES; ++i) {
|
||||
ChordRest* vcr = static_cast<ChordRest*>(s->element(n + i));
|
||||
if (vcr)
|
||||
width = qMax(width, vcr->space().rw());
|
||||
}
|
||||
// extend past chord/rest
|
||||
x = width + sp;
|
||||
// but don't overlap next chord/rest
|
||||
Segment* ns = s->next();
|
||||
bool crFound = false;
|
||||
while (ns) {
|
||||
for (int i = 0; i < VOICES; ++i) {
|
||||
if (ns->element(n + i)) {
|
||||
crFound = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (crFound)
|
||||
break;
|
||||
ns = ns->next();
|
||||
}
|
||||
if (crFound) {
|
||||
qreal nextNoteDistance = ns->x() - s->x();
|
||||
if (x > nextNoteDistance)
|
||||
x = qMax(width, nextNoteDistance);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (type() == Element::Type::HAIRPIN || type() == Element::Type::TRILL || type() == Element::Type::TEXTLINE) {
|
||||
// lay out all the way to next CR or (almost to) barline
|
||||
// lay out to just before next CR or barline
|
||||
if (cr && endElement()->parent() && endElement()->parent()->type() == Element::Type::SEGMENT) {
|
||||
qreal x2 = 0.0;
|
||||
qreal sp = endElement()->staff()->spatium();
|
||||
qreal x2 = cr->x() + cr->space().rw();
|
||||
int t = track2();
|
||||
Segment* seg = static_cast<Segment*>(endElement()->parent())->next();
|
||||
for ( ; seg; seg = seg->next()) {
|
||||
|
|
@ -495,11 +539,11 @@ QPointF SLine::linePos(GripLine grip, System** sys) const
|
|||
if (t != -1 && !seg->element(t)) {
|
||||
continue;
|
||||
}
|
||||
x2 = seg->x() - sp; // 1sp shy of next chord
|
||||
x2 = qMax(x2, seg->x() - sp);
|
||||
break;
|
||||
}
|
||||
else if (seg->segmentType() == Segment::Type::EndBarLine) {
|
||||
x2 = seg->x() - sp;
|
||||
x2 = qMax(x2, seg->x() - sp);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -507,19 +551,16 @@ QPointF SLine::linePos(GripLine grip, System** sys) const
|
|||
// no end segment found, use measure width
|
||||
x2 = endElement()->parent()->parent()->width() - sp;
|
||||
}
|
||||
x += x2 - endElement()->parent()->x();
|
||||
x = x2 - endElement()->parent()->x();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (cr && cr->durationType() == TDuration::DurationType::V_MEASURE)
|
||||
x -= cr->x();
|
||||
|
||||
int t = grip == GripLine::START ? tick() : tick2();
|
||||
Measure* m = cr ? cr->measure() : score()->tick2measure(t);
|
||||
|
||||
if (m) {
|
||||
x += cr ? cr->pos().x() + cr->segment()->pos().x() + m->pos().x() : m->tick2pos(t);
|
||||
x += cr ? cr->segment()->pos().x() + m->pos().x() : m->tick2pos(t);
|
||||
*sys = m->system();
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ else
|
|||
emmentaler-text-1 gonville-text-1 bravura-text-1 musejazz-text-1\
|
||||
emmentaler-text-2 gonville-text-2 bravura-text-2 musejazz-text-2\
|
||||
emmentaler-text-3 gonville-text-3 bravura-text-3 musejazz-text-3\
|
||||
frametext ottava slurs-1 slurs-2 hairpins-1 pedal-1 line-1 line-2 line-3\
|
||||
frametext ottava slurs-1 slurs-2 hairpins-1 pedal-1 line-1 line-2 line-3 line-4\
|
||||
chord-layout-1 chord-layout-2 chord-layout-3 chord-layout-4 chord-layout-5\
|
||||
chord-layout-6 chord-layout-7 chord-layout-8 chord-layout-9 chord-layout-10\
|
||||
chord-layout-11 chord-layout-12 chord-layout-13 chord-layout-14 cross-1\
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmres
|
|||
emmentaler-text-1,bravura-test-1,gonville-test-1,musejazz-text-1 ^
|
||||
emmentaler-text-2,bravura-test-2,gonville-test-2,musejazz-text-2 ^
|
||||
emmentaler-text-3,bravura-test-3,gonville-test-3,musejazz-text-3 ^
|
||||
frametext,ottava,slurs-1,slurs-2,hairpins-1,pedal-1,line-1,line-2,line-3, ^
|
||||
frametext,ottava,slurs-1,slurs-2,hairpins-1,pedal-1,line-1,line-2,line-3,line-4, ^
|
||||
chord-layout-1,chord-layout-2,chord-layout-3,chord-layout-4,chord-layout-5, ^
|
||||
chord-layout-6,chord-layout-7,chord-layout-8,chord-layout-9,chord-layout-10, ^
|
||||
chord-layout-11,chord-layout-12,chord-layout-13,chord-layout-14,cross-1, ^
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 9.3 KiB |
BIN
vtest/line-4-ref.png
Normal file
BIN
vtest/line-4-ref.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
BIN
vtest/line-4.mscz
Normal file
BIN
vtest/line-4.mscz
Normal file
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.5 KiB |
Loading…
Reference in a new issue