* Use <sup> for tonal marks and workaround missing defs
* Support for multiple types