Make ^ and marcato synonyms for umarcato
Handle more decorations; move lyrics up a little.