From 2ffd630a43749794bf72591f41d6b523676bd5b1 Mon Sep 17 00:00:00 2001
From: Jesse Rosenthal <jrosenthal@jhu.edu>
Date: Sat, 19 Nov 2016 06:03:54 -0500
Subject: Free: Remove readFileUTF8.

This is just defined in term of a bytestring, so we convert when necessary.
---
 src/Text/Pandoc/Free.hs         | 12 ------------
 src/Text/Pandoc/Writers/EPUB.hs |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/Text')

diff --git a/src/Text/Pandoc/Free.hs b/src/Text/Pandoc/Free.hs
index 4294384d4..3a62270a7 100644
--- a/src/Text/Pandoc/Free.hs
+++ b/src/Text/Pandoc/Free.hs
@@ -46,7 +46,6 @@ module Text.Pandoc.Free ( PandocActionF(..)
                         , newStdGen
                         , newUniqueHash
                         , readFileLazy
-                        , readFileUTF8
                         , readDataFile
                         , fetchItem
                         , fetchItem'
@@ -79,7 +78,6 @@ import qualified Data.ByteString.Lazy as BL
 import Control.Monad.Free
 import qualified Control.Exception as E
 import qualified System.Environment as IO (lookupEnv)
-import qualified Text.Pandoc.UTF8 as UTF8 (readFile, toString)
 import System.FilePath.Glob (match, compile)
 import System.FilePath ((</>))
 import qualified System.FilePath.Glob as IO (glob)
@@ -97,7 +95,6 @@ data PandocActionF nxt =
   | NewStdGen (StdGen -> nxt)
   | NewUniqueHash (Int -> nxt)
   | ReadFileLazy FilePath (BL.ByteString -> nxt)
-  | ReadFileUTF8 FilePath (String -> nxt)
   | ReadDataFile (Maybe FilePath) FilePath (B.ByteString -> nxt)
   | FetchItem (Maybe String) (String)
     (Either E.SomeException (B.ByteString, Maybe MimeType) -> nxt)
@@ -134,9 +131,6 @@ newUniqueHash = liftF $ NewUniqueHash id
 readFileLazy :: FilePath -> PandocAction BL.ByteString
 readFileLazy fp = liftF $ ReadFileLazy fp id
 
-readFileUTF8 :: FilePath -> PandocAction String
-readFileUTF8 fp = liftF $ ReadFileUTF8 fp id
-
 readDataFile :: Maybe FilePath -> FilePath -> PandocAction B.ByteString
 readDataFile mfp fp = liftF $ ReadDataFile mfp fp id
 
@@ -172,7 +166,6 @@ runIO (Free (GetDefaultReferenceODT mfp f)) =
 runIO (Free (NewStdGen f)) = IO.newStdGen >>= runIO . f
 runIO (Free (NewUniqueHash f)) = hashUnique <$> IO.newUnique >>= runIO . f
 runIO (Free (ReadFileLazy fp f)) = BL.readFile fp >>= runIO . f
-runIO (Free (ReadFileUTF8 fp f)) = UTF8.readFile fp >>= runIO . f
 runIO (Free (ReadDataFile mfp fp f)) = IO.readDataFile mfp fp >>= runIO . f
 runIO (Free (Fail s)) = M.fail s
 runIO (Free (FetchItem sourceUrl nm f)) =
@@ -241,11 +234,6 @@ runTest (Free (ReadFileLazy fp f)) = do
   case lookup fp fps of
     Just bs -> return (BL.fromStrict bs) >>= runTest . f
     Nothing -> error "openFile: does not exist"
-runTest (Free (ReadFileUTF8 fp f)) = do
-  fps <- asks envFiles
-  case lookup fp fps of
-    Just bs -> return (UTF8.toString bs) >>= runTest . f
-    Nothing -> error "openFile: does not exist"
 -- A few different cases of readDataFile to reimplement, for when
 -- there is no filepath and it falls through to readDefaultDataFile
 runTest (Free (ReadDataFile Nothing "reference.docx" f)) = do
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs
index 35724dfef..a0991e27b 100644
--- a/src/Text/Pandoc/Writers/EPUB.hs
+++ b/src/Text/Pandoc/Writers/EPUB.hs
@@ -710,7 +710,7 @@ pandocToEPUB opts doc@(Pandoc meta _) = do
 
   -- stylesheet
   stylesheet <- case epubStylesheet metadata of
-                   Just (StylesheetPath fp)    -> lift $ P.readFileUTF8 fp
+                   Just (StylesheetPath fp)    -> UTF8.toStringLazy <$> (lift $ P.readFileLazy fp)
                    Just (StylesheetContents s) -> return s
                    Nothing -> UTF8.toString `fmap`
                               (lift $ P.readDataFile (writerUserDataDir opts) "epub.css")
-- 
cgit v1.2.3