From 7272735b3d413a644fd9ab01eeae8ae9cd5a925b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 23 Sep 2012 22:12:21 -0700 Subject: More intelligent handling of text encodings. Previously, UTF-8 was enforced for both input and output. The new system: * For input, UTF-8 is tried first; if an error is raised, the locale encoding is tried. * For output, the locale encoding is always used. --- src/Text/Pandoc/Writers/Docx.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/Text/Pandoc/Writers') diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index 84bf95dfb..211f8946b 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -33,8 +33,7 @@ import System.FilePath ( () ) import qualified Data.ByteString.Lazy as B import qualified Data.Map as M import Data.ByteString.Lazy.UTF8 ( fromString, toString ) -import Text.Pandoc.UTF8 as UTF8 -import System.IO ( stderr ) +import System.IO ( stderr, hPutStrLn ) import Codec.Archive.Zip import Data.Time.Clock.POSIX import Paths_pandoc ( getDataFileName ) @@ -663,7 +662,7 @@ inlineToOpenXML opts (Image alt (src, tit)) = do , mknode "wp:docPr" [("descr",tit),("id","1"),("name","Picture")] () , graphic ] ] else do - liftIO $ UTF8.hPutStrLn stderr $ + liftIO $ hPutStrLn stderr $ "Could not find image `" ++ src ++ "', skipping..." inlinesToOpenXML opts alt -- cgit v1.2.3