Improved handling of @ format mask

[MarkBaker]

This is:

• a bugfix
• a new feature
• refactoring
• additional unit tests

Checklist:

• Changes are covered by unit tests
  • Changes are covered by existing unit tests
  • New unit tests have been added
• Code style is respected
• Commit message explains why the change is made (see https://github.com/erlang/otp/wiki/Writing-good-commit-messages)
• CHANGELOG.md contains a short summary of the change and a link to the pull request if applicable
• Documentation is updated as necessary

Why this change is needed?

Improved handling of @ format mask

With some limitations remaining:

• Still doesn't work in section 4
• Doesn't work correctly if there is an @ in quotes, not recognised as a literal