Add the grave accent in vis-à-vis
Convert - to &minus; where appropriate