A deep overhaul of dynamics and expression

src/engraving/layout/layoutsystem.cpp

@@ -957,8 +957,8 @@ void LayoutSystem::layoutSystemElements(const LayoutOptions& options, LayoutCont
             if (e->isDynamic()) {
                 Dynamic* d = toDynamic(e);
                 d->layout();
-
                 if (d->autoplace()) {
+                    d->manageBarlineCollisions();
                     d->autoplaceSegmentElement(false);
                     dynamics.push_back(d);
                 }
@@ -970,7 +970,6 @@ void LayoutSystem::layoutSystemElements(const LayoutOptions& options, LayoutCont
     }
 
     // add dynamics shape to skyline
-
     for (Dynamic* d : dynamics) {
         if (!d->addToSkyline()) {
             continue;
@@ -981,6 +980,21 @@ void LayoutSystem::layoutSystemElements(const LayoutOptions& options, LayoutCont
         system->staff(si)->skyline().add(d->shape().translate(d->pos() + s->pos() + m->pos()));
     }
 
+    //-------------------------------------------------------------
+    // Expressions
+    // Must be done after dynamics. Remember that expressions may
+    // also snap into alignment with dynamics.
+    //-------------------------------------------------------------
+    for (Segment* s : sl) {
+        Measure* m = s->measure();
+        for (EngravingItem* e : s->annotations()) {
+            if (e->isExpression()) {
+                e->layout();
+                system->staff(e->staffIdx())->skyline().add(e->shape().translate(e->pos() + s->pos() + m->pos()));
+            }
+        }
+    }
+
     //-------------------------------------------------------------
     // layout SpannerSegments for current system
     // voltas and tempo change lines are collected here, but laid out later

src/engraving/libmscore/chordrest.cpp

@@ -242,6 +242,7 @@ EngravingItem* ChordRest::drop(EditData& data)
     // fall through
     case ElementType::TEMPO_TEXT:
     case ElementType::DYNAMIC:
+    case ElementType::EXPRESSION:
     case ElementType::FRET_DIAGRAM:
     case ElementType::TREMOLOBAR:
     case ElementType::SYMBOL: