git.iko.soy/typeable/pandoc
on master help sign in
Markdown reader: Removed unneeded definitions.
22b2c02John MacFarlane
src/Text/Pandoc/Readers/Markdown.hs+8−10
compare with master
unifiedsplit
@@ -66,10 +66,6 @@ hruleChars = "*-_"
66setextHChars :: [Char]
66setextHChars :: [Char]
67setextHChars = "=-"
67setextHChars = "=-"
68
68
69−-- treat these as potentially non-text when parsing inline:
70−specialChars :: [Char]
71−specialChars = "\\[]*_~`<>$!^-.&@'\";\8216\8217\8220\8221"
72−
73--
69--
74-- auxiliary functions
70-- auxiliary functions
75--
71--
@@ -296,6 +292,7 @@ block = do
296 , bulletList
292 , bulletList
297 , orderedList
293 , orderedList
298 , definitionList
294 , definitionList
295+ , rawTeXBlock
299 , para
296 , para
300 , rawHtmlBlocks
297 , rawHtmlBlocks
301 , plain
298 , plain
@@ -698,6 +695,13 @@ rawVerbatimBlock = try $ do
698 contents <- manyTill anyChar (htmlTag (~== TagClose tag))
695 contents <- manyTill anyChar (htmlTag (~== TagClose tag))
699 return $ open ++ contents ++ renderTags [TagClose tag]
696 return $ open ++ contents ++ renderTags [TagClose tag]
700
697
698+rawTeXBlock :: GenParser Char ParserState Block
699+rawTeXBlock = do
700+ failIfStrict
701+ result <- rawLaTeXEnvironment' <|> rawConTeXtEnvironment'
702+ spaces
703+ return $ Para [TeX result]
704+
701rawHtmlBlocks :: GenParser Char ParserState Block
705rawHtmlBlocks :: GenParser Char ParserState Block
702rawHtmlBlocks = do
706rawHtmlBlocks = do
703 htmlBlocks <- many1 $ do blk <- rawVerbatimBlock <|>
707 htmlBlocks <- many1 $ do blk <- rawVerbatimBlock <|>
@@ -933,9 +937,6 @@ ltSign = do
933 else notFollowedBy' rawHtmlBlocks >> char '<' -- unless it starts html
937 else notFollowedBy' rawHtmlBlocks >> char '<' -- unless it starts html
934 return $ Str ['<']
938 return $ Str ['<']
935
939
936−specialCharsMinusLt :: [Char]
937−specialCharsMinusLt = filter (/= '<') specialChars
938−
939exampleRef :: GenParser Char ParserState Inline
940exampleRef :: GenParser Char ParserState Inline
940exampleRef = try $ do
941exampleRef = try $ do
941 char '@'
942 char '@'
@@ -1028,9 +1029,6 @@ whitespace = spaceChar >>
1028nonEndline :: GenParser Char st Char
1029nonEndline :: GenParser Char st Char
1029nonEndline = satisfy (/='\n')
1030nonEndline = satisfy (/='\n')
1030
1031
1031−strChar :: GenParser Char st Char
1032−strChar = noneOf (specialChars ++ " \t\n")
1033−
1034str :: GenParser Char ParserState Inline
1032str :: GenParser Char ParserState Inline
1035str = do
1033str = do
1036 a <- alphaNum
1034 a <- alphaNum