Soft hyphens

This is a revised version of #773.