Keypad fermata attachment

[th-we]

In the fermata test file, the following issues need to be fixed:

Bar 4

Input:

Output:

<staff xml:id="m-49" n="1">
    <layer xml:id="m-50" n="1">
        <note xml:id="m-51" dur="4" dur.ppq="256" oct="4" pname="g" pnum="67" stem.dir="up" tstamp.real="00:00:07.2" vel="0"/>
        <note xml:id="m-53" dur="4" dur.ppq="256" oct="4" pname="g" pnum="67" stem.dir="up" tstamp.real="00:00:07.8" vel="0"/>
        <note xml:id="m-55" dur="4" dur.ppq="256" oct="4" pname="g" pnum="67" stem.dir="up" tstamp.real="00:00:08.4" vel="0"/>
        <rest xml:id="m-57" dur="4" dur.ppq="256" tstamp.real="00:00:09"/>
    </layer>
</staff>
<fermata xml:id="m-52" form="norm" layer="1" shape="curved" staff="1" tstamp="1"/>
<fermata xml:id="m-54" form="norm" layer="1" shape="angular" staff="1" tstamp="2"/>
<fermata xml:id="m-56" form="norm" layer="1" shape="square" staff="1" tstamp="3"/>
<fermata xml:id="m-58" form="norm" layer="1" shape="curved" staff="1" startid="#m-55" tstamp="4"/>
<fermata xml:id="m-59" form="norm" layer="1" shape="angular" staff="1" startid="#m-55" tstamp="4"/>

The fermatas on the rest are mis-attached to the ID of the preceding note, but have have the correct @tstamp. The same issue occurs in bar 6 with the layer 2 fermata.