From 22b2c02aeb5260aa9f904601d051c47a1dfb68d6 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 3 Jan 2011 13:20:57 -0800 Subject: Markdown reader: Removed unneeded definitions. specialChars, strChar, specialCharsMinusLt. --- src/Text/Pandoc/Readers/Markdown.hs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/Text') diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 2c8bef063..4ab3f9275 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -66,10 +66,6 @@ hruleChars = "*-_" setextHChars :: [Char] setextHChars = "=-" --- treat these as potentially non-text when parsing inline: -specialChars :: [Char] -specialChars = "\\[]*_~`<>$!^-.&@'\";\8216\8217\8220\8221" - -- -- auxiliary functions -- @@ -296,6 +292,7 @@ block = do , bulletList , orderedList , definitionList + , rawTeXBlock , para , rawHtmlBlocks , plain @@ -698,6 +695,13 @@ rawVerbatimBlock = try $ do contents <- manyTill anyChar (htmlTag (~== TagClose tag)) return $ open ++ contents ++ renderTags [TagClose tag] +rawTeXBlock :: GenParser Char ParserState Block +rawTeXBlock = do + failIfStrict + result <- rawLaTeXEnvironment' <|> rawConTeXtEnvironment' + spaces + return $ Para [TeX result] + rawHtmlBlocks :: GenParser Char ParserState Block rawHtmlBlocks = do htmlBlocks <- many1 $ do blk <- rawVerbatimBlock <|> @@ -933,9 +937,6 @@ ltSign = do else notFollowedBy' rawHtmlBlocks >> char '<' -- unless it starts html return $ Str ['<'] -specialCharsMinusLt :: [Char] -specialCharsMinusLt = filter (/= '<') specialChars - exampleRef :: GenParser Char ParserState Inline exampleRef = try $ do char '@' @@ -1028,9 +1029,6 @@ whitespace = spaceChar >> nonEndline :: GenParser Char st Char nonEndline = satisfy (/='\n') -strChar :: GenParser Char st Char -strChar = noneOf (specialChars ++ " \t\n") - str :: GenParser Char ParserState Inline str = do a <- alphaNum -- cgit v1.2.3