reformatted into two scores; fix ext functions for lilypond 2.16