9c299d2 · typeable/pandoc

git.iko.soy/typeable/pandoc

Added Text.Pandoc.Data (non-exported) if embed_data_files selected.

This module just exports the association list of embedded data files, which is used by Shared.

commit9c299d282f943fd4db076b09b1901309e19308bd authorJohn MacFarlane <fiddlosopher@gmail.com> dateWed 23 Jan 2013, 08:14 (14 years ago) parent7a0062a

3 files changed+12−7

compare with master

unifiedsplit

pandoc.cabal+3 src/Text/Pandoc/Data.hs+7 src/Text/Pandoc/Shared.hs+2−7

pandoc.cabal+3

@@ -314,6 +314,9 @@ Library

314314 Text.Pandoc.Slides,

315315 Paths_pandoc

316316

317+ if flag(embed_data_files)

318+ Other-Modules: Text.Pandoc.Data

319+

317320 Buildable: True

318321

319322Executable pandoc

src/Text/Pandoc/Data.hsnew file+7

@@ -0,0 +1,7 @@

1+{-# LANGUAGE TemplateHaskell #-}

2+module Text.Pandoc.Data (dataFiles) where

3+import Data.FileEmbed

4+import qualified Data.ByteString as B

6+dataFiles :: [(FilePath, B.ByteString)]

7+dataFiles = $(embedDir "data")

src/Text/Pandoc/Shared.hs+2−7

@@ -1,4 +1,4 @@

1−{-# LANGUAGE DeriveDataTypeable, CPP, TemplateHaskell #-}

1+{-# LANGUAGE DeriveDataTypeable, CPP #-}

22{-

@@ -103,7 +103,7 @@ import qualified Data.ByteString as B

103103import Network.HTTP (findHeader, rspBody, simpleHTTP, RequestMethod(..),

104104 HeaderName(..), mkRequest)

105105#ifdef EMBED_DATA_FILES

106−import Data.FileEmbed

106+import Text.Pandoc.Data (dataFiles)

107107#else

108108import Paths_pandoc (getDataFileName)

109109#endif

@@ -515,11 +515,6 @@ inDirectory path action = do

515515 setCurrentDirectory oldDir

516516 return result

517517

518−#ifdef EMBED_DATA_FILES

519−dataFiles :: [(FilePath, B.ByteString)]

520−dataFiles = $(embedDir "data")

521−#endif

522−

523518readDefaultDataFile :: FilePath -> IO B.ByteString

524519readDefaultDataFile fname =

525520#ifdef EMBED_DATA_FILES