Fix text block modifiers with additional parameters

The options hash for the text block modifiers was previously not popped from
the modifier text.

Using pop_style to pop the last element if it's a hash, then merging the arrays.

I'll also add a couple more tests for the other text block modifiers.

Ref #582, #588