ComplexTrillSpanner now suppresses all but the first "tr" of a trill group.
Merged master.