Make define parsing more robust
Generalise markup
Define \chorus
Fix escapes
Fix chord formatting
Add format option
Make define parsing more robust
Merge chord formatting