diff options
| author | schrieveslaach <schrieveslaach@online.de> | 2017-06-12 15:52:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-12 15:52:29 +0200 |
| commit | 635f299b441e238ccd34e3ad61c5e36f0ca30067 (patch) | |
| tree | 11cfc34402975bad208f9a48d075fe2ace959e70 /src/Text/Pandoc/Readers/EPUB.hs | |
| parent | 181c56d4003aa83abed23b95a452c4890aa3797c (diff) | |
| parent | 23f3c2d7b4796d1af742a74999ce67924bf2abb3 (diff) | |
| download | pandoc-635f299b441e238ccd34e3ad61c5e36f0ca30067.tar.gz | |
Merge branch 'master' into textcolor-support
Diffstat (limited to 'src/Text/Pandoc/Readers/EPUB.hs')
| -rw-r--r-- | src/Text/Pandoc/Readers/EPUB.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Readers/EPUB.hs b/src/Text/Pandoc/Readers/EPUB.hs index db58e9654..c0d8029dc 100644 --- a/src/Text/Pandoc/Readers/EPUB.hs +++ b/src/Text/Pandoc/Readers/EPUB.hs @@ -13,6 +13,8 @@ import Control.DeepSeq (NFData, deepseq) import Control.Monad (guard, liftM) import Control.Monad.Except (throwError) import qualified Data.ByteString.Lazy as BL (ByteString) +import qualified Data.Text.Lazy.Encoding as TL +import qualified Data.Text.Lazy as TL import Data.List (isInfixOf, isPrefixOf) import qualified Data.Map as M (Map, elems, fromList, lookup) import Data.Maybe (fromMaybe, mapMaybe) @@ -73,7 +75,7 @@ archiveToEPUB os archive = do mimeToReader "application/xhtml+xml" (unEscapeString -> root) (unEscapeString -> path) = do fname <- findEntryByPathE (root </> path) archive - html <- readHtml os' . UTF8.toStringLazy $ fromEntry fname + html <- readHtml os' . TL.toStrict . TL.decodeUtf8 $ fromEntry fname return $ fixInternalReferences path html mimeToReader s _ (unEscapeString -> path) | s `elem` imageMimes = return $ imageToPandoc path |