Convert to LilyPond 2.18, correct pitches, trills