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.
This commit is contained in:
John MacFarlane 2013-01-23 08:14:23 -08:00
parent 7a0062a8d5
commit 9c299d282f
3 changed files with 12 additions and 7 deletions

View file

@ -314,6 +314,9 @@ Library
Text.Pandoc.Slides,
Paths_pandoc
if flag(embed_data_files)
Other-Modules: Text.Pandoc.Data
Buildable: True
Executable pandoc

7
src/Text/Pandoc/Data.hs Normal file
View file

@ -0,0 +1,7 @@
{-# LANGUAGE TemplateHaskell #-}
module Text.Pandoc.Data (dataFiles) where
import Data.FileEmbed
import qualified Data.ByteString as B
dataFiles :: [(FilePath, B.ByteString)]
dataFiles = $(embedDir "data")

View file

@ -1,4 +1,4 @@
{-# LANGUAGE DeriveDataTypeable, CPP, TemplateHaskell #-}
{-# LANGUAGE DeriveDataTypeable, CPP #-}
{-
Copyright (C) 2006-2010 John MacFarlane <jgm@berkeley.edu>
@ -103,7 +103,7 @@ import qualified Data.ByteString as B
import Network.HTTP (findHeader, rspBody, simpleHTTP, RequestMethod(..),
HeaderName(..), mkRequest)
#ifdef EMBED_DATA_FILES
import Data.FileEmbed
import Text.Pandoc.Data (dataFiles)
#else
import Paths_pandoc (getDataFileName)
#endif
@ -515,11 +515,6 @@ inDirectory path action = do
setCurrentDirectory oldDir
return result
#ifdef EMBED_DATA_FILES
dataFiles :: [(FilePath, B.ByteString)]
dataFiles = $(embedDir "data")
#endif
readDefaultDataFile :: FilePath -> IO B.ByteString
readDefaultDataFile fname =
#ifdef EMBED_DATA_FILES