fix repeat barlines & "free" annotations

* preserve repeat and other barlines where possible
* preserve "free" annotations - like chord symbols in the middle of an
otherwise empty measure
* update test