git.iko.soy/typeable/pandoc
on master help sign in
LaTeX reader: Fixed regression introduced with last commit.
2ba7873John MacFarlane
src/Text/Pandoc/Readers/LaTeX.hs+10−10
@@ -852,18 +852,18 @@ braced' = try $ char '{' *> manyTill (satisfy (/='}')) (char '}')
852
852
853include' :: IncludeParser
853include' :: IncludeParser
854include' = do
854include' = do
855− name <- try $ do
855+ fs' <- try $ do
856 char '\\'
856 char '\\'
857− try (string "include")
857+ name <- try (string "include")
858− <|> try (string "input")
858+ <|> try (string "input")
859− <|> string "usepackage"
859+ <|> string "usepackage"
860− -- skip options
860+ -- skip options
861− skipMany $ try $ char '[' *> (manyTill anyChar (char ']'))
861+ skipMany $ try $ char '[' *> (manyTill anyChar (char ']'))
862− fs <- (map trim . splitBy (==',')) <$> braced'
862+ fs <- (map trim . splitBy (==',')) <$> braced'
863+ return $ if name == "usepackage"
864+ then map (flip replaceExtension ".sty") fs
865+ else map (flip replaceExtension ".tex") fs
863 pos <- getPosition
866 pos <- getPosition
864− let fs' = if name == "usepackage"
865− then map (flip replaceExtension ".sty") fs
866− else map (flip replaceExtension ".tex") fs
867 containers <- getState
867 containers <- getState
868 let fn = case containers of
868 let fn = case containers of
869 (f':_) -> f'
869 (f':_) -> f'