Handle yet more edge cases where the standalone tags fail

This fixes and adds tests for two more cases where I noticed the
standalone tag system acting oddly:

- Tags that are surrounded by text in its paragraph should no longer be
stolen and the paragraph forever looking wierd.
- Tags that somehow don't end up in their own paragraph, but only
separated with a linebreak (<br>) are supported.

(cherry picked from commit fcb6ddcb)