Even after fixing #659, my Dormition Exaposteilaria weren't round-tripping properly through the lyrics tokenizer. I tracked down the problem to a martyria, which was stopping the extraction process from adding the last underscore. Fixed by looking ahead past martyriae. With this change and #659 my Dormition Exaposteilaria round-trips correctly.
Even after fixing #659, my Dormition Exaposteilaria weren't round-tripping properly through the lyrics tokenizer. I tracked down the problem to a martyria, which was stopping the extraction process from adding the last underscore. Fixed by looking ahead past martyriae. With this change and #659 my Dormition Exaposteilaria round-trips correctly.