If the punctuation is included in the emphasis, the terminator should follow the punctuation. If it is not included in the emphasis, the terminator should precede the punctuation. If you can't tell if the punctuation is included in the emphasis, put the terminator after the punctuation for better readability.
Cindi