Bring up to LilyPond 2.18

KV487 No 7, bring up to LilyPond 2.18