git.iko.soy/typeable/pandoc
on master help sign in
LaTeX reader: Improved parsing of preamble.
2dfb459John MacFarlane
src/Text/Pandoc/Readers/LaTeX.hs+6−11
compare with master
unifiedsplit
@@ -119,20 +119,15 @@ anyEnvironment = try $ do
119
119
120-- | Process LaTeX preamble, extracting metadata.
120-- | Process LaTeX preamble, extracting metadata.
121processLaTeXPreamble :: GenParser Char ParserState ()
121processLaTeXPreamble :: GenParser Char ParserState ()
122−processLaTeXPreamble = try $ manyTill
122+processLaTeXPreamble =
123− (choice [bibliographic, comment, unknownCommand, nullBlock])
123+ skipMany $ notFollowedBy' anyEnvironment >> block
124− (try (string "\\begin{document}")) >>
125− spaces
126
124
127-- | Parse LaTeX and return 'Pandoc'.
125-- | Parse LaTeX and return 'Pandoc'.
128parseLaTeX :: GenParser Char ParserState Pandoc
126parseLaTeX :: GenParser Char ParserState Pandoc
129parseLaTeX = do
127parseLaTeX = do
130− optional processLaTeXPreamble -- preamble might not be present (fragment)
131− spaces
132− blocks <- parseBlocks
133 spaces
128 spaces
134− optional $ try (string "\\end{document}" >> many anyChar)
129+ blocks <- try (processLaTeXPreamble >> spaces >> environment "document")
135− -- might not be present (fragment)
130+ <|> many block
136 spaces
131 spaces
137 eof
132 eof
138 state <- getState
133 state <- getState
@@ -420,8 +415,8 @@ ignore = try $ do
420
415
421unknownCommand :: GenParser Char ParserState Block
416unknownCommand :: GenParser Char ParserState Block
422unknownCommand = try $ do
417unknownCommand = try $ do
423− notFollowedBy' $ choice $ map end ["itemize", "enumerate", "description",
418+ spaces
424− "document"]
419+ notFollowedBy' $ oneOfStrings ["\\begin","\\end","\\item"]
425 state <- getState
420 state <- getState
426 when (stateParserContext state == ListItemState) $
421 when (stateParserContext state == ListItemState) $
427 notFollowedBy' (string "\\item")
422 notFollowedBy' (string "\\item")