Recognize punctuation and reference

FIXME Input `<` inserts `;` after `<`