@@ -854,9 +854,6 @@ inline = choice [ whitespace
860 , interpretedRole
857 , interpretedRole
@@ -907,42 +904,36 @@ strong :: RSTParser Inlines
907strong = B.strong . trimInlines . mconcat <$>
904strong = B.strong . trimInlines . mconcat <$>
908 enclosed (atStart $ string "**") (try $ string "**") inline
905 enclosed (atStart $ string "**") (try $ string "**") inline
910−-- Parses inline interpreted text which is required to have the given role.
911−-- This decision is based on the role marker (if present),
912−-- and the current default interpreted text role.
913−interpreted :: [Char] -> RSTParser [Char]
914−interpreted role = try $ do
916− if role == stateRstDefaultRole state
917− then try markedInterpretedText <|> unmarkedInterpretedText
918− else markedInterpretedText
920− markedInterpretedText = try (roleMarker *> unmarkedInterpretedText)
921− <|> (unmarkedInterpretedText <* roleMarker)
922− roleMarker = string $ ":" ++ role ++ ":"
923− -- Note, this doesn't precisely implement the complex rule in
907+-- Note, this doesn't precisely implement the complex rule in
924− -- http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#inline-markup-recognition-rules
908+-- http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#inline-markup-recognition-rules
925− -- but it should be good enough for most purposes
909+-- but it should be good enough for most purposes
910+interpretedRole :: RSTParser Inlines
911+interpretedRole = try $ do
912+ (role, contents) <- roleBefore <|> roleAfter
914+ "sup" -> return $ B.superscript $ B.str contents
915+ "sub" -> return $ B.subscript $ B.str contents
916+ "math" -> return $ B.math contents
917+ _ -> return $ B.str contents --unknown
919+roleMarker :: RSTParser String
920+roleMarker = char ':' *> many1Till (letter <|> char '-') (char ':')
922+roleBefore :: RSTParser (String,String)
923+roleBefore = try $ do
925+ contents <- unmarkedInterpretedText
926+ return (role,contents)
928+roleAfter :: RSTParser (String,String)
930+ contents <- unmarkedInterpretedText
931+ role <- roleMarker <|> (stateRstDefaultRole <$> getState)
932+ return (role,contents)
927unmarkedInterpretedText :: RSTParser [Char]
934unmarkedInterpretedText :: RSTParser [Char]
928unmarkedInterpretedText = enclosed (atStart $ char '`') (char '`') anyChar
935unmarkedInterpretedText = enclosed (atStart $ char '`') (char '`') anyChar
930−-- For unknown interpreted roles, we just ignore the role.
931−interpretedRole :: RSTParser Inlines
932−interpretedRole = try $ B.str <$>
933− ( (roleMarker *> unmarkedInterpretedText)
934− <|> (unmarkedInterpretedText <* roleMarker) )
935− where roleMarker = char ':' *> many1Till (letter <|> char '-') (char ':')
937−superscript :: RSTParser Inlines
938−superscript = B.superscript . B.str <$> interpreted "sup"
940−subscript :: RSTParser Inlines
941−subscript = B.subscript . B.str <$> interpreted "sub"
943−math :: RSTParser Inlines
944−math = B.math <$> interpreted "math"
946whitespace :: RSTParser Inlines
937whitespace :: RSTParser Inlines
947whitespace = B.space <$ skipMany1 spaceChar <?> "whitespace"
938whitespace = B.space <$ skipMany1 spaceChar <?> "whitespace"