Add disambiguation between underscores and hyphens

Generally works, but breaks for large font sizes as the x separation is
hardcoded.
Remove spatialfilter as the last commit replaced it