@@ -522,7 +522,7 @@ escapedTag = Str <$>
522522
523523-- | Any special symbol defined in wordBoundaries
524524symbol :: Parser [Char] ParserState Inline
525−symbol = Str . singleton <$> oneOf wordBoundaries
525+symbol = Str . singleton <$> (oneOf wordBoundaries <|> oneOf markupChars)
526526
527527-- | Inline code
528528code :: Parser [Char] ParserState Inline
@@ -546,7 +546,7 @@ attributes = choice [ enclosed (char '(') (char ')') anyChar,
546546surrounded :: Parser [Char] st t -- ^ surrounding parser
547547 -> Parser [Char] st a -- ^ content parser (to be used repeatedly)
548548 -> Parser [Char] st [a]
549−surrounded border = enclosed border (try border)
549+surrounded border = enclosed (border *> notFollowedBy (oneOf " \t\n\r")) (try border)
550550
551551-- | Inlines are most of the time of the same form
552552simpleInline :: Parser [Char] ParserState t -- ^ surrounding parser