Several corrections to rests with ledger lines

src/engraving/libmscore/engravingitem.cpp

@@ -55,6 +55,7 @@
 #include "mscore.h"
 #include "note.h"
 #include "page.h"
+#include "rest.h"
 #include "score.h"
 #include "segment.h"
 #include "shape.h"
@@ -2704,6 +2705,16 @@ double EngravingItem::computePadding(const EngravingItem* nextItem) const
     double scaling = (mag() + nextItem->mag()) / 2;
     double padding = score()->paddingTable().at(type()).at(nextItem->type());
     padding *= scaling;
+    if (!isLedgerLine() && nextItem->isRest()) {
+        const Rest* rest = toRest(nextItem);
+        SymId symbol = rest->sym();
+        if (symbol == SymId::restWholeLegerLine
+            || symbol == SymId::restDoubleWholeLegerLine
+            || symbol == SymId::restHalfLegerLine) {
+            // In this case the ledgerLine is included in the glyph itself, so we must ignore it
+            padding += rest->bbox().left();
+        }
+    }
     return padding;
 }
 }

src/engraving/libmscore/rest.cpp

@@ -414,7 +414,7 @@ void Rest::layout()
 void Rest::layoutDots()
 {
     checkDots();
-    double x = symWidth(m_sym) + score()->styleMM(Sid::dotNoteDistance) * mag();
+    double x = symWidthNoLedgerLines() + score()->styleMM(Sid::dotNoteDistance) * mag();
     double dx = score()->styleMM(Sid::dotDotDistance) * mag();
     double y = m_dotline * spatium() * .5;
     for (NoteDot* dot : m_dots) {
@@ -424,6 +424,20 @@ void Rest::layoutDots()
     }
 }
 
+double Rest::symWidthNoLedgerLines() const
+{
+    if (m_sym == SymId::restHalfLegerLine) {
+        return symWidth(SymId::restHalf);
+    }
+    if (m_sym == SymId::restWholeLegerLine) {
+        return symWidth(SymId::restWhole);
+    }
+    if (m_sym == SymId::restDoubleWholeLegerLine) {
+        return symWidth(SymId::restDoubleWhole);
+    }
+    return symWidth(m_sym);
+}
+
 //---------------------------------------------------------
 //   checkDots
 //---------------------------------------------------------
@@ -477,6 +491,10 @@ int Rest::getDotline(DurationType durationType)
     case DurationType::V_128TH:
         dl = -5;
         break;
+    case DurationType::V_MEASURE:
+    case DurationType::V_WHOLE:
+        dl = 1;
+        break;
     default:
         dl = -1;
         break;

src/engraving/libmscore/rest.h

@@ -77,6 +77,7 @@ class Rest : public ChordRest
 
     void checkDots();
     void layoutDots();
+    double symWidthNoLedgerLines() const;
     NoteDot* dot(int n);
     const std::vector<NoteDot*>& dotList() const;
     int getDotline() const { return m_dotline; }