Fix conversion of link-wrapped markers

- Normalize link-wrapped cites before plain text normalization,
  because the latter handles removal of unnecessary tags etc.

- Include wrapper tags in plain text version of cite, so that
  link tags will be removed in the case that they are closed
  and reopened within the text of the marker.