fix musescore#25384: grace note spacing

libmscore/chord.cpp

@@ -1591,8 +1591,10 @@ void Chord::layoutPitched()
 
             Accidental* accidental = note->accidental();
             if (accidental) {
+                  qreal x = accidental->x() + note->x();
                   // convert x position of accidental to segment coordinate system
-                  qreal x = accidental->x() + note->x() + note->chord()->x();
+                  if (_noteType == NOTE_NORMAL)
+                        x += note->chord()->x();
                   x -= score()->styleS(ST_accidentalDistance).val() * _spatium;
                   lll = qMax(lll, -x);
                   }
@@ -1724,7 +1726,7 @@ void Chord::layoutPitched()
             for (int i = n-1; i >= 0; --i) {
                   Chord* c = _graceNotes[i];
                   x -= c->space().rw();
-                  c->setPos(x, 0);
+                  c->setPos(x - ipos().x(), 0);
                   x -= c->space().lw() + minNoteDistance * graceMag;
                   }
             if (-x > _space.lw())

vtest/gen

@@ -25,7 +25,7 @@ else
        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\
        accidental-1 accidental-2 accidental-3 accidental-4 accidental-5 accidental-6\
-       tie-1"
+       tie-1 grace-1"
 fi
 
 DPI=130

vtest/gen.bat

@@ -12,7 +12,7 @@ set SRC=mmrest-1,bravura-mmrest,mmrest-2,mmrest-4,mmrest-5,mmrest-6,mmrest-7,mmr
  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, ^
  accidental-1,accidental-2,accidental-3,accidental-4,accidental-5,accidental-6, ^
- tie-1
+ tie-1,grace-1
 
 set MSCORE=..\win32install\bin\mscore.exe
 set DPI=130