Join accidentals to notes in a single token

Simplify the detection of fermatas, slur or trill, fix some unhandled cases.