git.iko.soy/typeable/pandoc
on master help sign in
Class: remove stFontFiles in PureState, 'glob' searches stFiles.
commitf8fef1ebb053c3e5a66c1a9a91f3e04940a6fdd6 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 14 Jul 2017, 16:35 (9 years ago) parentf140784
1 file changed+2−4
src/Text/Pandoc/Class.hs+2−4
src/Text/Pandoc/Class.hs+2−4
@@ -438,7 +438,6 @@ data PureState = PureState { stStdGen :: StdGen
438438 , stFiles :: FileTree
439439 , stUserDataDir :: FileTree
440440 , stCabalDataDir :: FileTree
441− , stFontFiles :: [FilePath]
442441 }
443442
444443instance Default PureState where
@@ -453,7 +452,6 @@ instance Default PureState where
453452 , stFiles = mempty
454453 , stUserDataDir = mempty
455454 , stCabalDataDir = mempty
456− , stFontFiles = []
457455 }
458456
459457
@@ -550,8 +548,8 @@ instance PandocMonad PandocPure where
550548 Nothing -> readDataFile Nothing fname
551549
552550 glob s = do
553− fontFiles <- getsPureState stFontFiles
554− return (filter (match (compile s)) fontFiles)
551+ FileTree ftmap <- getsPureState stFiles
552+ return $ filter (match (compile s)) $ M.keys ftmap
555553
556554 getModificationTime fp = do
557555 fps <- getsPureState stFiles