SF #965425: fix so hyphenated words surrounded by punctuation are

wrapped correctly.