fix #27781: wrong articulation position on stemless notes

chenlung · Jul 22, 2014 · 95f5cb5 · 95f5cb5
1 parent 6bde76a
commit 95f5cb5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/libmscore/chord.cpp b/libmscore/chord.cpp
@@ -2485,7 +2485,11 @@ QPointF Chord::layoutArticulation(Articulation* a)
             QPointF pos;                        // computed articulation position
             if (stem())                         // if there is a stem, assume artic. will be beyond the stem
                   pos = stem()->hookPos();
-
+            else {                              // otherwise, compute horizontal position as if there were a stem
+                  pos.rx() = stemPosX();
+                  if (!_up)
+                        pos.rx() += point(score()->styleS(StyleIdx::stemWidth));
+                  }
             a->layout();
 
             qreal _spatium2 = _spatium * .5;

diff --git a/libmscore/slur.cpp b/libmscore/slur.cpp
@@ -898,6 +898,8 @@ void Slur::slurPos(SlurPos* sp)
                         yo = fixArticulations(yo, sc, __up);
                   }
             }
+      else if (sc->up() != _up)
+            yo = fixArticulations(yo, sc, __up);
 
       if (sa1 == SlurAnchor::NONE)
             sp->p1 += QPointF(xo, yo);
@@ -960,6 +962,8 @@ void Slur::slurPos(SlurPos* sp)
             else if (ec->up() != _up)
                   yo = fixArticulations(yo, ec, __up);
             }
+      else if (ec->up() != _up)
+            yo = fixArticulations(yo, ec, __up);
 
       if (sa2 == SlurAnchor::NONE)
             sp->p2 += QPointF(xo, yo);

diff --git a/vtest/slurs-1-ref.png b/vtest/slurs-1-ref.png
diff --git a/vtest/slurs-1.mscz b/vtest/slurs-1.mscz