diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-08-30 11:49:50 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-08-30 11:49:50 -0700 |
| commit | f70e3c3297bb0d8f953971a84a1a606351fdda40 (patch) | |
| tree | c95d0f44861578c828aabcade0d0584b25d5eb96 /src/Text/Pandoc/Writers/EPUB.hs | |
| parent | eb29aab9598eec04a8c2d37ef24f2eaa5ca1435d (diff) | |
| parent | 357172f13af7e7ddb6a01e16c664776d01f55565 (diff) | |
| download | pandoc-f70e3c3297bb0d8f953971a84a1a606351fdda40.tar.gz | |
Merge branch 'mime' of https://github.com/Aelve/John into Aelve-mime
Conflicts:
src/Text/Pandoc/Writers/Docx.hs
Diffstat (limited to 'src/Text/Pandoc/Writers/EPUB.hs')
| -rw-r--r-- | src/Text/Pandoc/Writers/EPUB.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs index 2df2b9087..ffd5bf101 100644 --- a/src/Text/Pandoc/Writers/EPUB.hs +++ b/src/Text/Pandoc/Writers/EPUB.hs @@ -65,7 +65,7 @@ import Text.Pandoc.UUID (getRandomUUID) import Text.Pandoc.Writers.HTML (writeHtmlString, writeHtml) import Data.Char ( toLower, isDigit, isAlphaNum ) import Network.URI ( unEscapeString ) -import Text.Pandoc.MIME (getMimeType) +import Text.Pandoc.MIME (MimeType, getMimeType) import qualified Control.Exception as E import Text.Blaze.Html.Renderer.Utf8 (renderHtml) import Text.HTML.TagSoup (Tag(TagOpen), fromAttrib, parseTags) @@ -849,7 +849,7 @@ ppTopElement = ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" ++) . unEntity . Nothing -> '&':'#':unEntity xs unEntity (x:xs) = x : unEntity xs -mediaTypeOf :: FilePath -> Maybe String +mediaTypeOf :: FilePath -> Maybe MimeType mediaTypeOf x = let mediaPrefixes = ["image", "video", "audio"] in case getMimeType x of |