Markup engine rendering incorrectly

[marcbowes]

This is two issues:

• Markup with a single markup character should not be marked up: e.g. this/that
• Markup can spill onto the next line if not properly terminated: e.g. this/