fixes & vtest for whole notes

libmscore/slur.cpp

@@ -801,6 +801,11 @@ void Slur::slurPos(SlurPos* sp)
 
       sp->p1 = scr->pagePos() - sp->system1->pagePos();
       sp->p2 = ecr->pagePos() - sp->system2->pagePos();
+      // account for centering or other adjustments (other than mirroring)
+      if (!note1->mirror())
+            sp->p1.rx() += note1->x();
+      if (!note2->mirror())
+            sp->p2.rx() += note2->x();
 
       qreal xo, yo;
 
@@ -820,7 +825,6 @@ void Slur::slurPos(SlurPos* sp)
             }
 
       qreal __up = _up ? -1.0 : 1.0;
-      qreal hw   = note1 ? note1->headWidth() : startCR()->width();
       switch (sa1) {
             case SlurAnchor::STEM: //sc can't be null
                   sp->p1 += sc->stemPos() - sc->pagePos() + sc->stem()->p2();
@@ -845,14 +849,15 @@ void Slur::slurPos(SlurPos* sp)
       //
       //------p1
       bool stemPos = false;   // p1 starts at chord stem side
+      qreal hw = note1 ? note1->headWidth() : startCR()->width();
+      xo = hw * .5;
       if (note1)
             yo = note1->pos().y();
       else if(_up)
             yo = startCR()->bbox().top();
       else
             yo = startCR()->bbox().top() + startCR()->height();
       yo += _spatium * .9 * __up;
-      xo = hw * .5;
 
       if (stem1) { //sc not null
             Beam* beam1 = sc->beam();
@@ -905,6 +910,7 @@ void Slur::slurPos(SlurPos* sp)
             sp->p1 += QPointF(xo, yo);
 
       //------p2
+      hw = note2 ? note2->headWidth() : endCR()->width();
       xo = hw * .5;
       if (note2)
             yo = note2->pos().y();

vtest/gen

@@ -29,7 +29,7 @@ else
        emmentaler-3 bravura-3 emmentaler-4 bravura-4 emmentaler-5 bravura-5\
        emmentaler-6 bravura-6 emmentaler-7 bravura-7\
        emmentaler-8 bravura-8 emmentaler-9 bravura-9 emmentaler-10 bravura-10\
-       emmentaler-11 bravura-11 frametext ottava slurs-1\
+       emmentaler-11 bravura-11 frametext ottava slurs-1 slurs-2\
        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\
        accidental-1 accidental-2 accidental-3 accidental-4\

vtest/gen.bat

@@ -9,6 +9,7 @@ set SRC=mmrest-1,bravura-mmrest,mmrest-2,mmrest-4,mmrest-5,mmrest-6,mmrest-7,mmr
  emmentaler-3,bravura-3,emmentaler-4,bravura-4,emmentaler-5,bravura-5, ^
  emmentaler-6,bravura-6,emmentaler-7,bravura-7, ^
  emmentaler-8,bravura-8,emmentaler-9,bravura-9,emmentaler-10,bravura-10, ^
+ emmentlar-11,bravura-11,frametext,ottava,slurs-1,slurs-2, ^
  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, ^
  accidental-1,accidental-2,accidental-3,accidental-4, ^