diff --git a/lhs2TeX-hl.cabal b/lhs2TeX-hl.cabal index 3f8dd2b..45b5611 100644 --- a/lhs2TeX-hl.cabal +++ b/lhs2TeX-hl.cabal @@ -1,5 +1,5 @@ Name: lhs2TeX-hl -Version: 0.1.4.4 +Version: 0.1.4.5 Cabal-Version: >= 1.6 License: MIT Author: Alessandro Vermeulen @@ -29,6 +29,8 @@ Executable lhs2TeX-hl , haskell-src-exts == 1.11.1 , syb >= 0.1.0.1 , cmdargs >= 0.1 + , filepath == 1.2.0.0 + , uu-parsinglib >= 2.7 hs-source-dirs: src Other-Modules: Data.Data, Data.List.Utils, Data.String.Utils, Language.LaTeX, Language.Markup, Literate.Agda, diff --git a/src/Base/Common.hs b/src/Base/Common.hs index 219add2..f0445a6 100644 --- a/src/Base/Common.hs +++ b/src/Base/Common.hs @@ -1,4 +1,4 @@ module Base.Common where -programVersion = "0.1.4.3" +programVersion = "0.1.4.5" programName = "lhs2TeX-hl" \ No newline at end of file diff --git a/src/LiterateHighlighter.hs b/src/LiterateHighlighter.hs index cccdb4f..4893de4 100644 --- a/src/LiterateHighlighter.hs +++ b/src/LiterateHighlighter.hs @@ -61,10 +61,7 @@ main = do args <- cmdArgsRun standard hSetEncoding stderr utf8 discoverFiles :: FilePath -> IO [FilePath] -discoverFiles fp = do contents <- fmap ( map ((base ++) . fromJust) - . filter isJust - . map runPInclude - . lines) +discoverFiles fp = do contents <- fmap (\xs -> [base ++ x | Just x <- map runPInclude (lines xs)]) (readFile fp) files <- mapM discoverFiles contents return (nub $ fp : concat files) @@ -75,7 +72,8 @@ discoverFiles fp = do contents <- fmap ( map ((base ++) . fromJust) runPInclude = runParse pInclude runParse :: Show t => Parser t -> String -> Maybe t -runParse p inp = let r@(a, errors) = PCC.parse ( (,) <$> p <*> pEnd) (createStr (LineColPos 0 0 0) inp) +runParse p inp = let r@(a, errors) = PCC.parse ( (,) <$> p <*> pEnd) + (createStr (LineColPos 0 0 0) inp) in if null errors then Just a else