Switch Readers.Docx to Text

8 files changed, 201 insertions, 200 deletions

diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs
index 01d9cc2be..49adf4f31 100644
--- a/src/Text/Pandoc/Readers/Docx.hs
+++ b/src/Text/Pandoc/Readers/Docx.hs
@@ -4,6 +4,7 @@
 {-# LANGUAGE PatternGuards     #-}
 {-# LANGUAGE MultiWayIf        #-}
 {-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE ViewPatterns      #-}
 {- |
    Module      : Text.Pandoc.Readers.Docx
    Copyright   : Copyright (C) 2014-2019 Jesse Rosenthal
@@ -73,28 +74,20 @@ import Data.Maybe (isJust, fromMaybe)
 import Data.Sequence (ViewL (..), viewl)
 import qualified Data.Sequence as Seq
 import qualified Data.Set as Set
-import Text.Pandoc.Legacy.Builder -- TODO text: remove Legacy
--- import Text.Pandoc.Definition
-import Text.Pandoc.Legacy.MediaBag (MediaBag)
-import Text.Pandoc.Legacy.Options
+import Text.Pandoc.Builder
+import Text.Pandoc.MediaBag (MediaBag)
+import Text.Pandoc.Options
 import Text.Pandoc.Readers.Docx.Combine
 import Text.Pandoc.Readers.Docx.Lists
 import Text.Pandoc.Readers.Docx.Parse
-import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
+import Text.Pandoc.Shared
 import Text.Pandoc.Walk
--- import Text.TeXMath (writeTeX) -- TODO text: restore
+import Text.TeXMath (writeTeX)
 import Control.Monad.Except (throwError)
-import Text.Pandoc.Legacy.Class (PandocMonad)
-import qualified Text.Pandoc.Legacy.Class as P
-import Text.Pandoc.Legacy.Error
-import Text.Pandoc.Legacy.Logging
-
--- TODO text: remove
-import qualified Text.TeXMath as TM
-
-writeTeX :: [TM.Exp] -> String
-writeTeX = T.unpack . TM.writeTeX
---
+import Text.Pandoc.Class (PandocMonad)
+import qualified Text.Pandoc.Class as P
+import Text.Pandoc.Error
+import Text.Pandoc.Logging
 
 readDocx :: PandocMonad m
          => ReaderOptions
@@ -109,14 +102,14 @@ readDocx opts bytes
 readDocx _ _ =
   throwError $ PandocSomeError "couldn't parse docx file"
 
-data DState = DState { docxAnchorMap :: M.Map String String
-                     , docxAnchorSet :: Set.Set String
-                     , docxImmedPrevAnchor :: Maybe String
+data DState = DState { docxAnchorMap :: M.Map T.Text T.Text
+                     , docxAnchorSet :: Set.Set T.Text
+                     , docxImmedPrevAnchor :: Maybe T.Text
                      , docxMediaBag  :: MediaBag
                      , docxDropCap   :: Inlines
                      -- keep track of (numId, lvl) values for
                      -- restarting
-                     , docxListState :: M.Map (String, String) Integer
+                     , docxListState :: M.Map (T.Text, T.Text) Integer
                      , docxPrevPara  :: Inlines
                      }
 
@@ -150,7 +143,7 @@ spansToKeep = []
 divsToKeep :: [ParaStyleName]
 divsToKeep = ["Definition", "Definition Term"]
 
-metaStyles :: M.Map ParaStyleName String
+metaStyles :: M.Map ParaStyleName T.Text
 metaStyles = M.fromList [ ("Title", "title")
                         , ("Subtitle", "subtitle")
                         , ("Author", "author")
@@ -175,7 +168,7 @@ isEmptyPar (Paragraph _ parParts) =
     isEmptyElem _           = True
 isEmptyPar _ = False
 
-bodyPartsToMeta' :: PandocMonad m => [BodyPart] -> DocxContext m (M.Map String MetaValue)
+bodyPartsToMeta' :: PandocMonad m => [BodyPart] -> DocxContext m (M.Map T.Text MetaValue)
 bodyPartsToMeta' [] = return M.empty
 bodyPartsToMeta' (bp : bps)
   | (Paragraph pPr parParts) <- bp
@@ -240,22 +233,22 @@ runElemToInlines Tab           = space
 runElemToInlines SoftHyphen    = text "\xad"
 runElemToInlines NoBreakHyphen = text "\x2011"
 
-runElemToString :: RunElem -> String
-runElemToString (TextRun s)   = s
-runElemToString LnBrk         = ['\n']
-runElemToString Tab           = ['\t']
-runElemToString SoftHyphen    = ['\xad']
-runElemToString NoBreakHyphen = ['\x2011']
+runElemToText :: RunElem -> T.Text
+runElemToText (TextRun s)   = s
+runElemToText LnBrk         = T.singleton '\n'
+runElemToText Tab           = T.singleton '\t'
+runElemToText SoftHyphen    = T.singleton '\xad'
+runElemToText NoBreakHyphen = T.singleton '\x2011'
 
-runToString :: Run -> String
-runToString (Run _ runElems) = concatMap runElemToString runElems
-runToString _                = ""
+runToText :: Run -> T.Text
+runToText (Run _ runElems) = T.concat $ map runElemToText runElems
+runToText _                = ""
 
-parPartToString :: ParPart -> String
-parPartToString (PlainRun run)             = runToString run
-parPartToString (InternalHyperLink _ runs) = concatMap runToString runs
-parPartToString (ExternalHyperLink _ runs) = concatMap runToString runs
-parPartToString _                          = ""
+parPartToText :: ParPart -> T.Text
+parPartToText (PlainRun run)             = runToText run
+parPartToText (InternalHyperLink _ runs) = T.concat $ map runToText runs
+parPartToText (ExternalHyperLink _ runs) = T.concat $ map runToText runs
+parPartToText _                          = ""
 
 blacklistedCharStyles :: [CharStyleName]
 blacklistedCharStyles = ["Hyperlink"]
@@ -318,7 +311,7 @@ runToInlines :: PandocMonad m => Run -> DocxContext m Inlines
 runToInlines (Run rs runElems)
   | maybe False isCodeCharStyle $ rParentStyle rs = do
       rPr <- resolveDependentRunStyle rs
-      let codeString = code $ concatMap runElemToString runElems
+      let codeString = code $ T.concat $ map runElemToText runElems
       return $ case rVertAlign rPr of
         Just SupScrpt -> superscript codeString
         Just SubScrpt -> subscript codeString
@@ -336,17 +329,17 @@ runToInlines (Endnote bps) = do
   return $ note blksList
 runToInlines (InlineDrawing fp title alt bs ext) = do
   (lift . lift) $ P.insertMedia fp Nothing bs
-  return $ imageWith (extentToAttr ext) fp title $ text alt
+  return $ imageWith (extentToAttr ext) (T.pack fp) title $ text alt
 runToInlines InlineChart = return $ spanWith ("", ["chart"], []) $ text "[CHART]"
 
 extentToAttr :: Extent -> Attr
 extentToAttr (Just (w, h)) =
   ("", [], [("width", showDim w), ("height", showDim h)] )
   where
-    showDim d = show (d / 914400) ++ "in"
+    showDim d = T.pack $ show (d / 914400) ++ "in"
 extentToAttr _ = nullAttr
 
-blocksToInlinesWarn :: PandocMonad m => String -> Blocks -> DocxContext m Inlines
+blocksToInlinesWarn :: PandocMonad m => T.Text -> Blocks -> DocxContext m Inlines
 blocksToInlinesWarn cmtId blks = do
   let blkList = toList blks
       notParaOrPlain :: Block -> Bool
@@ -355,7 +348,7 @@ blocksToInlinesWarn cmtId blks = do
       notParaOrPlain _         = True
   unless ( not (any notParaOrPlain blkList)) $
     lift $ P.report $ DocxParserWarning $
-      "Docx comment " ++ cmtId ++ " will not retain formatting"
+      "Docx comment " <> cmtId <> " will not retain formatting"
   return $ blocksToInlines' blkList
 
 -- The majority of work in this function is done in the primed
@@ -448,12 +441,12 @@ parPartToInlines' (BookMark _ anchor) =
         return $ spanWith (newAnchor, ["anchor"], []) mempty
 parPartToInlines' (Drawing fp title alt bs ext) = do
   (lift . lift) $ P.insertMedia fp Nothing bs
-  return $ imageWith (extentToAttr ext) fp title $ text alt
+  return $ imageWith (extentToAttr ext) (T.pack fp) title $ text alt
 parPartToInlines' Chart =
   return $ spanWith ("", ["chart"], []) $ text "[CHART]"
 parPartToInlines' (InternalHyperLink anchor runs) = do
   ils <- smushInlines <$> mapM runToInlines runs
-  return $ link ('#' : anchor) "" ils
+  return $ link ("#" <> anchor) "" ils
 parPartToInlines' (ExternalHyperLink target runs) = do
   ils <- smushInlines <$> mapM runToInlines runs
   return $ link target "" ils
@@ -471,7 +464,7 @@ isAnchorSpan (Span (_, classes, kvs) _) =
   null kvs
 isAnchorSpan _ = False
 
-dummyAnchors :: [String]
+dummyAnchors :: [T.Text]
 dummyAnchors = ["_GoBack"]
 
 makeHeaderAnchor :: PandocMonad m => Blocks -> DocxContext m Blocks
@@ -485,7 +478,7 @@ makeHeaderAnchor' (Header n (ident, classes, kvs) ils)
   , (Span (anchIdent, ["anchor"], _) cIls) <- c = do
     hdrIDMap <- gets docxAnchorMap
     exts <- readerExtensions <$> asks docxOptions
-    let newIdent = if null ident
+    let newIdent = if T.null ident
                    then uniqueIdent exts ils (Set.fromList $ M.elems hdrIDMap)
                    else ident
         newIls = concatMap f ils where f il | il == c   = cIls
@@ -498,7 +491,7 @@ makeHeaderAnchor' (Header n (ident, classes, kvs) ils) =
   do
     hdrIDMap <- gets docxAnchorMap
     exts <- readerExtensions <$> asks docxOptions
-    let newIdent = if null ident
+    let newIdent = if T.null ident
                    then uniqueIdent exts ils (Set.fromList $ M.elems hdrIDMap)
                    else ident
     modify $ \s -> s {docxAnchorMap = M.insert newIdent newIdent hdrIDMap}
@@ -566,8 +559,8 @@ parStyleToTransform pPr
              else transform
 parStyleToTransform _ = return id
 
-normalizeToClassName :: (FromStyleName a) => a -> String
-normalizeToClassName = map go . fromStyleName
+normalizeToClassName :: (FromStyleName a) => a -> T.Text
+normalizeToClassName = T.map go . fromStyleName
   where go c | isSpace c = '-'
              | otherwise = c
 
@@ -582,7 +575,8 @@ bodyPartToBlocks (Paragraph pPr parparts)
       return $
         transform $
         codeBlock $
-        concatMap parPartToString parparts
+        T.concat $
+        map parPartToText parparts
   | Just (style, n) <- pHeading pPr = do
     ils <-local (\s-> s{docxInHeaderBlock=True})
            (smushInlines <$> mapM parPartToInlines parparts)
@@ -654,7 +648,7 @@ bodyPartToBlocks (ListItem pPr numId lvl (Just levelInfo) parparts) = do
             , ("num-id", numId)
             , ("format", fmt)
             , ("text", txt)
-            , ("start", show start)
+            , ("start", T.pack $ show start)
             ]
   modify $ \st -> st{ docxListState =
     -- expire all the continuation data for lists of level > this one:
@@ -713,12 +707,12 @@ bodyPartToBlocks (OMathPara e) =
 
 -- replace targets with generated anchors.
 rewriteLink' :: PandocMonad m => Inline -> DocxContext m Inline
-rewriteLink' l@(Link attr ils ('#':target, title)) = do
+rewriteLink' l@(Link attr ils (T.uncons -> Just ('#',target), title)) = do
   anchorMap <- gets docxAnchorMap
   case M.lookup target anchorMap of
     Just newTarget -> do
       modify $ \s -> s{docxAnchorSet = Set.insert newTarget (docxAnchorSet s)}
-      return $ Link attr ils ('#':newTarget, title)
+      return $ Link attr ils ("#" <> newTarget, title)
     Nothing        -> do
       modify $ \s -> s{docxAnchorSet = Set.insert target (docxAnchorSet s)}
       return l
diff --git a/src/Text/Pandoc/Readers/Docx/Combine.hs b/src/Text/Pandoc/Readers/Docx/Combine.hs
index 4830c32bd..82791d669 100644
--- a/src/Text/Pandoc/Readers/Docx/Combine.hs
+++ b/src/Text/Pandoc/Readers/Docx/Combine.hs
@@ -1,7 +1,8 @@
-{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoImplicitPrelude    #-}
 {-# LANGUAGE FlexibleInstances    #-}
 {-# LANGUAGE PatternGuards        #-}
 {-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE OverloadedStrings    #-}
 {- |
    Module      : Text.Pandoc.Readers.Docx.Combine
    Copyright   : © 2014-2019 Jesse Rosenthal <[email protected]>,
@@ -63,7 +64,7 @@ import Prelude
 import Data.List
 import Data.Sequence (ViewL (..), ViewR (..), viewl, viewr, (><), (|>))
 import qualified Data.Sequence as Seq (null)
-import Text.Pandoc.Legacy.Builder -- TODO text: remove
+import Text.Pandoc.Builder
 
 data Modifier a = Modifier (a -> a)
                 | AttrModifier (Attr -> a -> a) Attr
diff --git a/src/Text/Pandoc/Readers/Docx/Fields.hs b/src/Text/Pandoc/Readers/Docx/Fields.hs
index e7a916f1c..05d9dd697 100644
--- a/src/Text/Pandoc/Readers/Docx/Fields.hs
+++ b/src/Text/Pandoc/Readers/Docx/Fields.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
 {- |
    Module      : Text.Pandoc.Readers.Docx.Fields
    Copyright   : Copyright (C) 2014-2019 Jesse Rosenthal
@@ -16,16 +17,18 @@ module Text.Pandoc.Readers.Docx.Fields ( FieldInfo(..)
                                        ) where
 
 import Prelude
+import Data.Functor (($>))
+import qualified Data.Text as T
 import Text.Parsec
-import Text.Parsec.String (Parser)
+import Text.Parsec.Text (Parser)
 
-type URL = String
+type URL = T.Text
 
 data FieldInfo = HyperlinkField URL
                | UnknownField
                deriving (Show)
 
-parseFieldInfo :: String -> Either ParseError FieldInfo
+parseFieldInfo :: T.Text -> Either ParseError FieldInfo
 parseFieldInfo = parse fieldInfo ""
 
 fieldInfo :: Parser FieldInfo
@@ -34,31 +37,31 @@ fieldInfo =
   <|>
   return UnknownField
 
-escapedQuote :: Parser String
-escapedQuote = string "\\\""
+escapedQuote :: Parser T.Text
+escapedQuote = string "\\\"" $> "\\\""
 
-inQuotes :: Parser String
+inQuotes :: Parser T.Text
 inQuotes =
-  (try escapedQuote) <|> (anyChar >>= (\c -> return [c]))
+  (try escapedQuote) <|> (anyChar >>= (\c -> return $ T.singleton c))
 
-quotedString :: Parser String
+quotedString :: Parser T.Text
 quotedString = do
   char '"'
-  concat <$> manyTill inQuotes (try (char '"'))
+  T.concat <$> manyTill inQuotes (try (char '"'))
 
-unquotedString :: Parser String
-unquotedString = manyTill anyChar (try $ lookAhead space *> return () <|> eof)
+unquotedString :: Parser T.Text
+unquotedString = T.pack <$> manyTill anyChar (try $ lookAhead space *> return () <|> eof)
 
-fieldArgument :: Parser String
+fieldArgument :: Parser T.Text
 fieldArgument = quotedString <|> unquotedString
 
 -- there are other switches, but this is the only one I've seen in the wild so far, so it's the first one I'll implement. See §17.16.5.25
-hyperlinkSwitch :: Parser (String, String)
+hyperlinkSwitch :: Parser (T.Text, T.Text)
 hyperlinkSwitch = do
   sw <- string "\\l"
   spaces
   farg <- fieldArgument
-  return (sw, farg)
+  return (T.pack sw, farg)
 
 hyperlink :: Parser URL
 hyperlink = do
@@ -68,6 +71,6 @@ hyperlink = do
   farg <- fieldArgument
   switches <- spaces *> many hyperlinkSwitch
   let url = case switches of
-              ("\\l", s) : _ -> farg ++ ('#': s)
+              ("\\l", s) : _ -> farg <> "#" <> s
               _              -> farg
   return url
diff --git a/src/Text/Pandoc/Readers/Docx/Parse.hs b/src/Text/Pandoc/Readers/Docx/Parse.hs
index 2dbabe838..8598ada6f 100644
--- a/src/Text/Pandoc/Readers/Docx/Parse.hs
+++ b/src/Text/Pandoc/Readers/Docx/Parse.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE ViewPatterns      #-}
+{-# LANGUAGE OverloadedStrings #-}
 {- |
  Module : Text.Pandoc.Readers.Docx.Parse
  Copyright : Copyright (C) 2014-2019 Jesse Rosenthal
@@ -68,26 +69,14 @@ import Data.Maybe
 import System.FilePath
 import Text.Pandoc.Readers.Docx.Util
 import Text.Pandoc.Readers.Docx.Fields
-import Text.Pandoc.Legacy.Shared (filteredFilesFromArchive, safeRead) -- TODO text: remove Legacy
+import Text.Pandoc.Shared (filteredFilesFromArchive, safeRead)
 import qualified Text.Pandoc.UTF8 as UTF8
 import Text.TeXMath (Exp)
--- import Text.TeXMath.Readers.OMML (readOMML) TODO text: restore
--- import Text.TeXMath.Unicode.Fonts (Font (..), getUnicode, textToFont) TODO text: restore
+import Text.TeXMath.Readers.OMML (readOMML)
+import Text.TeXMath.Unicode.Fonts (Font (..), getUnicode, textToFont)
 import Text.XML.Light
 import qualified Text.XML.Light.Cursor as XMLC
 
--- TODO text: remove
-import Text.TeXMath.Unicode.Fonts (Font, getUnicode)
-import qualified Text.TeXMath.Readers.OMML as TM
-import qualified Text.TeXMath.Unicode.Fonts as TM
-
-readOMML :: String -> Either T.Text [Exp]
-readOMML = TM.readOMML . T.pack
-
-stringToFont :: String -> Maybe Font
-stringToFont = TM.textToFont . T.pack
---
-
 data ReaderEnv = ReaderEnv { envNotes         :: Notes
                            , envComments      :: Comments
                            , envNumbering     :: Numbering
@@ -101,7 +90,7 @@ data ReaderEnv = ReaderEnv { envNotes         :: Notes
                            }
                deriving Show
 
-data ReaderState = ReaderState { stateWarnings :: [String]
+data ReaderState = ReaderState { stateWarnings :: [T.Text]
                                , stateFldCharState :: FldCharState
                                }
                  deriving Show
@@ -132,7 +121,6 @@ eitherToD (Left _)  = throwError DocxError
 concatMapM        :: (Monad m) => (a -> m [b]) -> [a] -> m [b]
 concatMapM f xs   =  liftM concat (mapM f xs)
 
-
 -- This is similar to `mapMaybe`: it maps a function returning the D
 -- monad over a list, and only keeps the non-erroring return values.
 mapD :: (a -> D b) -> [a] -> D [b]
@@ -191,18 +179,18 @@ type ParStyleMap = M.Map ParaStyleId ParStyle
 data Numbering = Numbering NameSpaces [Numb] [AbstractNumb]
                  deriving Show
 
-data Numb = Numb String String [LevelOverride]
+data Numb = Numb T.Text T.Text [LevelOverride]
             deriving Show
 
 --                                 ilvl    startOverride   lvl
-data LevelOverride = LevelOverride String (Maybe Integer) (Maybe Level)
+data LevelOverride = LevelOverride T.Text (Maybe Integer) (Maybe Level)
   deriving Show
 
-data AbstractNumb = AbstractNumb String [Level]
+data AbstractNumb = AbstractNumb T.Text [Level]
                     deriving Show
 
 --                 ilvl   format string  start
-data Level = Level String String String (Maybe Integer)
+data Level = Level T.Text T.Text T.Text (Maybe Integer)
   deriving Show
 
 data DocumentLocation = InDocument | InFootnote | InEndnote
@@ -212,11 +200,11 @@ data Relationship = Relationship DocumentLocation RelId Target
                   deriving Show
 
 data Notes = Notes NameSpaces
-             (Maybe (M.Map String Element))
-             (Maybe (M.Map String Element))
+             (Maybe (M.Map T.Text Element))
+             (Maybe (M.Map T.Text Element))
            deriving Show
 
-data Comments = Comments NameSpaces (M.Map String Element)
+data Comments = Comments NameSpaces (M.Map T.Text Element)
               deriving Show
 
 data ParIndentation = ParIndentation { leftParIndent    :: Maybe Integer
@@ -251,8 +239,8 @@ defaultParagraphStyle = ParagraphStyle { pStyle = []
 
 
 data BodyPart = Paragraph ParagraphStyle [ParPart]
-              | ListItem ParagraphStyle String String (Maybe Level) [ParPart]
-              | Tbl String TblGrid TblLook [Row]
+              | ListItem ParagraphStyle T.Text T.Text (Maybe Level) [ParPart]
+              | Tbl T.Text TblGrid TblLook [Row]
               | OMathPara [Exp]
               deriving Show
 
@@ -292,7 +280,7 @@ data ParPart = PlainRun Run
              | BookMark BookMarkId Anchor
              | InternalHyperLink Anchor [Run]
              | ExternalHyperLink URL [Run]
-             | Drawing FilePath String String B.ByteString Extent -- title, alt
+             | Drawing FilePath T.Text T.Text B.ByteString Extent -- title, alt
              | Chart                                              -- placeholder for now
              | PlainOMath [Exp]
              | Field FieldInfo [Run]
@@ -303,28 +291,28 @@ data ParPart = PlainRun Run
 data Run = Run RunStyle [RunElem]
          | Footnote [BodyPart]
          | Endnote [BodyPart]
-         | InlineDrawing FilePath String String B.ByteString Extent -- title, alt
+         | InlineDrawing FilePath T.Text T.Text B.ByteString Extent -- title, alt
          | InlineChart          -- placeholder
            deriving Show
 
-data RunElem = TextRun String | LnBrk | Tab | SoftHyphen | NoBreakHyphen
+data RunElem = TextRun T.Text | LnBrk | Tab | SoftHyphen | NoBreakHyphen
              deriving Show
 
-type Target = String
-type Anchor = String
-type URL = String
-type BookMarkId = String
-type RelId = String
-type ChangeId = String
-type CommentId = String
-type Author = String
-type ChangeDate = String
-type CommentDate = String
+type Target = T.Text
+type Anchor = T.Text
+type URL = T.Text
+type BookMarkId = T.Text
+type RelId = T.Text
+type ChangeId = T.Text
+type CommentId = T.Text
+type Author = T.Text
+type ChangeDate = T.Text
+type CommentDate = T.Text
 
 archiveToDocx :: Archive -> Either DocxError Docx
 archiveToDocx archive = fst <$> archiveToDocxWithWarnings archive
 
-archiveToDocxWithWarnings :: Archive -> Either DocxError (Docx, [String])
+archiveToDocxWithWarnings :: Archive -> Either DocxError (Docx, [T.Text])
 archiveToDocxWithWarnings archive = do
   docXmlPath <- case getDocumentXmlPath archive of
     Just fp -> Right fp
@@ -354,7 +342,7 @@ archiveToDocxWithWarnings archive = do
     Right doc -> Right (Docx doc, stateWarnings st)
     Left e    -> Left e
 
-getDocumentXmlPath :: Archive -> Maybe String
+getDocumentXmlPath :: Archive -> Maybe FilePath
 getDocumentXmlPath zf = do
   entry <- findEntryByPath "_rels/.rels" zf
   relsElem <- (parseXMLDoc . UTF8.toStringLazy . fromEntry) entry
@@ -407,7 +395,7 @@ constructBogusParStyleData stName = ParStyle
   , numInfo = Nothing
   , psParentStyle = Nothing
   , pStyleName = stName
-  , pStyleId = ParaStyleId . filter (/=' ') . fromStyleName $ stName
+  , pStyleId = ParaStyleId . T.filter (/=' ') . fromStyleName $ stName
   }
 
 archiveToNotes :: Archive -> Notes
@@ -454,8 +442,8 @@ filePathToRelType path docXmlPath =
 relElemToRelationship :: DocumentLocation -> Element -> Maybe Relationship
 relElemToRelationship relType element | qName (elName element) == "Relationship" =
   do
-    relId <- findAttr (QName "Id" Nothing Nothing) element
-    target <- findAttr (QName "Target" Nothing Nothing) element
+    relId <- findAttrText (QName "Id" Nothing Nothing) element
+    target <- findAttrText (QName "Target" Nothing Nothing) element
     return $ Relationship relType relId target
 relElemToRelationship _ _ = Nothing
 
@@ -477,7 +465,7 @@ filePathIsMedia fp =
   in
    (dir == "word/media/")
 
-lookupLevel :: String -> String -> Numbering -> Maybe Level
+lookupLevel :: T.Text -> T.Text -> Numbering -> Maybe Level
 lookupLevel numId ilvl (Numbering _ numbs absNumbs) = do
   (absNumId, ovrrides) <- lookup numId $
                           map (\(Numb nid absnumid ovrRides) -> (nid, (absnumid, ovrRides))) numbs
@@ -496,7 +484,7 @@ lookupLevel numId ilvl (Numbering _ numbs absNumbs) = do
 loElemToLevelOverride :: NameSpaces -> Element -> Maybe LevelOverride
 loElemToLevelOverride ns element
   | isElem ns "w" "lvlOverride" element = do
-      ilvl <- findAttrByName ns "w" "ilvl" element
+      ilvl <- findAttrTextByName ns "w" "ilvl" element
       let startOverride = findChildByName ns "w" "startOverride" element
                           >>= findAttrByName ns "w" "val"
                           >>= (\s -> listToMaybe (map fst (reads s :: [(Integer, String)])))
@@ -508,9 +496,9 @@ loElemToLevelOverride _ _ = Nothing
 numElemToNum :: NameSpaces -> Element -> Maybe Numb
 numElemToNum ns element
   | isElem ns "w" "num" element = do
-      numId <- findAttrByName ns "w" "numId" element
+      numId <- findAttrTextByName ns "w" "numId" element
       absNumId <- findChildByName ns "w" "abstractNumId" element
-                  >>= findAttrByName ns "w" "val"
+                  >>= findAttrTextByName ns "w" "val"
       let lvlOverrides = mapMaybe
                          (loElemToLevelOverride ns)
                          (findChildrenByName ns "w" "lvlOverride" element)
@@ -520,7 +508,7 @@ numElemToNum _ _ = Nothing
 absNumElemToAbsNum :: NameSpaces -> Element -> Maybe AbstractNumb
 absNumElemToAbsNum ns element
   | isElem ns "w" "abstractNum" element = do
-      absNumId <- findAttrByName ns "w" "abstractNumId" element
+      absNumId <- findAttrTextByName ns "w" "abstractNumId" element
       let levelElems = findChildrenByName ns "w" "lvl" element
           levels = mapMaybe (levelElemToLevel ns) levelElems
       return $ AbstractNumb absNumId levels
@@ -529,11 +517,11 @@ absNumElemToAbsNum _ _ = Nothing
 levelElemToLevel :: NameSpaces -> Element -> Maybe Level
 levelElemToLevel ns element
   | isElem ns "w" "lvl" element = do
-      ilvl <- findAttrByName ns "w" "ilvl" element
+      ilvl <- findAttrTextByName ns "w" "ilvl" element
       fmt <- findChildByName ns "w" "numFmt" element
-             >>= findAttrByName ns "w" "val"
+             >>= findAttrTextByName ns "w" "val"
       txt <- findChildByName ns "w" "lvlText" element
-             >>= findAttrByName ns "w" "val"
+             >>= findAttrTextByName ns "w" "val"
       let start = findChildByName ns "w" "start" element
                   >>= findAttrByName ns "w" "val"
                   >>= (\s -> listToMaybe (map fst (reads s :: [(Integer, String)])))
@@ -557,11 +545,11 @@ archiveToNumbering :: Archive -> Numbering
 archiveToNumbering archive =
   fromMaybe (Numbering [] [] []) (archiveToNumbering' archive)
 
-elemToNotes :: NameSpaces -> String -> Element -> Maybe (M.Map String Element)
+elemToNotes :: NameSpaces -> String -> Element -> Maybe (M.Map T.Text Element)
 elemToNotes ns notetype element
-  | isElem ns "w" (notetype ++ "s") element =
+  | isElem ns "w" (notetype <> "s") element =
       let pairs = mapMaybe
-                  (\e -> findAttrByName ns "w" "id" e >>=
+                  (\e -> findAttrTextByName ns "w" "id" e >>=
                          (\a -> Just (a, e)))
                   (findChildrenByName ns "w" notetype element)
       in
@@ -569,11 +557,11 @@ elemToNotes ns notetype element
        M.fromList pairs
 elemToNotes _ _ _ = Nothing
 
-elemToComments :: NameSpaces -> Element -> M.Map String Element
+elemToComments :: NameSpaces -> Element -> M.Map T.Text Element
 elemToComments ns element
   | isElem ns "w" "comments" element =
       let pairs = mapMaybe
-                  (\e -> findAttrByName ns "w" "id" e >>=
+                  (\e -> findAttrTextByName ns "w" "id" e >>=
                          (\a -> Just (a, e)))
                   (findChildrenByName ns "w" "comment" element)
       in
@@ -645,7 +633,7 @@ testBitMask bitMaskS n =
 pHeading :: ParagraphStyle -> Maybe (ParaStyleName, Int)
 pHeading = getParStyleField headingLev . pStyle
 
-pNumInfo :: ParagraphStyle -> Maybe (String, String)
+pNumInfo :: ParagraphStyle -> Maybe (T.Text, T.Text)
 pNumInfo = getParStyleField numInfo . pStyle
 
 elemToBodyPart :: NameSpaces -> Element -> D BodyPart
@@ -653,7 +641,7 @@ elemToBodyPart ns element
   | isElem ns "w" "p" element
   , (c:_) <- findChildrenByName ns "m" "oMathPara" element =
       do
-        expsLst <- eitherToD $ readOMML $ showElement c
+        expsLst <- eitherToD $ readOMML $ T.pack $ showElement c
         return $ OMathPara expsLst
 elemToBodyPart ns element
   | isElem ns "w" "p" element
@@ -677,7 +665,7 @@ elemToBodyPart ns element
   | isElem ns "w" "tbl" element = do
     let caption' = findChildByName ns "w" "tblPr" element
                    >>= findChildByName ns "w" "tblCaption"
-                   >>= findAttrByName ns "w" "val"
+                   >>= findAttrTextByName ns "w" "val"
         caption = fromMaybe "" caption'
         grid' = case findChildByName ns "w" "tblGrid" element of
           Just g  -> elemToTblGrid ns g
@@ -700,10 +688,10 @@ lookupRelationship docLocation relid rels =
   where
     pairs = map (\(Relationship loc relid' target) -> ((loc, relid'), target)) rels
 
-expandDrawingId :: String -> D (FilePath, B.ByteString)
+expandDrawingId :: T.Text -> D (FilePath, B.ByteString)
 expandDrawingId s = do
   location <- asks envLocation
-  target <- asks (lookupRelationship location s . envRelationships)
+  target <- asks (fmap T.unpack . lookupRelationship location s . envRelationships)
   case target of
     Just filepath -> do
       bytes <- asks (lookup ("word/" ++ filepath) . envMedia)
@@ -712,12 +700,12 @@ expandDrawingId s = do
         Nothing -> throwError DocxError
     Nothing -> throwError DocxError
 
-getTitleAndAlt :: NameSpaces -> Element -> (String, String)
+getTitleAndAlt :: NameSpaces -> Element -> (T.Text, T.Text)
 getTitleAndAlt ns element =
   let mbDocPr = findChildByName ns "wp" "inline" element >>=
                 findChildByName ns "wp" "docPr"
-      title = fromMaybe "" (mbDocPr >>= findAttrByName ns "" "title")
-      alt = fromMaybe "" (mbDocPr >>= findAttrByName ns "" "descr")
+      title = fromMaybe "" (mbDocPr >>= findAttrTextByName ns "" "title")
+      alt = fromMaybe "" (mbDocPr >>= findAttrTextByName ns "" "descr")
   in (title, alt)
 
 elemToParPart :: NameSpaces -> Element -> D ParPart
@@ -729,7 +717,7 @@ elemToParPart ns element
   = let (title, alt) = getTitleAndAlt ns drawingElem
         a_ns = "http://schemas.openxmlformats.org/drawingml/2006/main"
         drawing = findElement (QName "blip" (Just a_ns) (Just "a")) picElem
-                  >>= findAttrByName ns "r" "embed"
+                  >>= findAttrTextByName ns "r" "embed"
     in
      case drawing of
        Just s -> expandDrawingId s >>= (\(fp, bs) -> return $ Drawing fp title alt bs $ elemToExtent drawingElem)
@@ -739,7 +727,7 @@ elemToParPart ns element
   | isElem ns "w" "r" element
   , Just _ <- findChildByName ns "w" "pict" element =
     let drawing = findElement (elemName ns "v" "imagedata") element
-                  >>= findAttrByName ns "r" "id"
+                  >>= findAttrTextByName ns "r" "id"
     in
      case drawing of
        -- Todo: check out title and attr for deprecated format.
@@ -808,7 +796,7 @@ elemToParPart ns element
       fldCharState <- gets stateFldCharState
       case fldCharState of
         FldCharOpen -> do
-          info <- eitherToD $ parseFieldInfo $ strContent instrText
+          info <- eitherToD $ parseFieldInfo $ T.pack $ strContent instrText
           modify $ \st -> st{stateFldCharState = FldCharFieldInfo info}
           return NullParPart
         _ -> return NullParPart
@@ -829,56 +817,56 @@ elemToParPart ns element
       return $ ChangedRuns change runs
 elemToParPart ns element
   | isElem ns "w" "bookmarkStart" element
-  , Just bmId <- findAttrByName ns "w" "id" element
-  , Just bmName <- findAttrByName ns "w" "name" element =
+  , Just bmId <- findAttrTextByName ns "w" "id" element
+  , Just bmName <- findAttrTextByName ns "w" "name" element =
     return $ BookMark bmId bmName
 elemToParPart ns element
   | isElem ns "w" "hyperlink" element
-  , Just relId <- findAttrByName ns "r" "id" element = do
+  , Just relId <- findAttrTextByName ns "r" "id" element = do
     location <- asks envLocation
     runs <- mapD (elemToRun ns) (elChildren element)
     rels <- asks envRelationships
     case lookupRelationship location relId rels of
       Just target ->
-         case findAttrByName ns "w" "anchor" element of
-             Just anchor -> return $ ExternalHyperLink (target ++ '#':anchor) runs
+         case findAttrTextByName ns "w" "anchor" element of
+             Just anchor -> return $ ExternalHyperLink (target <> "#" <> anchor) runs
              Nothing -> return $ ExternalHyperLink target runs
       Nothing     -> return $ ExternalHyperLink "" runs
 elemToParPart ns element
   | isElem ns "w" "hyperlink" element
-  , Just anchor <- findAttrByName ns "w" "anchor" element = do
+  , Just anchor <- findAttrTextByName ns "w" "anchor" element = do
     runs <- mapD (elemToRun ns) (elChildren element)
     return $ InternalHyperLink anchor runs
 elemToParPart ns element
   | isElem ns "w" "commentRangeStart" element
-  , Just cmtId <- findAttrByName ns "w" "id" element = do
+  , Just cmtId <- findAttrTextByName ns "w" "id" element = do
       (Comments _ commentMap) <- asks envComments
       case M.lookup cmtId commentMap of
         Just cmtElem -> elemToCommentStart ns cmtElem
         Nothing      -> throwError WrongElem
 elemToParPart ns element
   | isElem ns "w" "commentRangeEnd" element
-  , Just cmtId <- findAttrByName ns "w" "id" element =
+  , Just cmtId <- findAttrTextByName ns "w" "id" element =
     return $ CommentEnd cmtId
 elemToParPart ns element
   | isElem ns "m" "oMath" element =
-    fmap PlainOMath (eitherToD $ readOMML $ showElement element)
+    fmap PlainOMath (eitherToD $ readOMML $ T.pack $ showElement element)
 elemToParPart _ _ = throwError WrongElem
 
 elemToCommentStart :: NameSpaces -> Element -> D ParPart
 elemToCommentStart ns element
   | isElem ns "w" "comment" element
-  , Just cmtId <- findAttrByName ns "w" "id" element
-  , Just cmtAuthor <- findAttrByName ns "w" "author" element
-  , Just cmtDate <- findAttrByName ns "w" "date" element = do
+  , Just cmtId <- findAttrTextByName ns "w" "id" element
+  , Just cmtAuthor <- findAttrTextByName ns "w" "author" element
+  , Just cmtDate <- findAttrTextByName ns "w" "date" element = do
       bps <- mapD (elemToBodyPart ns) (elChildren element)
       return $ CommentStart cmtId cmtAuthor cmtDate bps
 elemToCommentStart _ _ = throwError WrongElem
 
-lookupFootnote :: String -> Notes -> Maybe Element
+lookupFootnote :: T.Text -> Notes -> Maybe Element
 lookupFootnote s (Notes _ fns _) = fns >>= M.lookup s
 
-lookupEndnote :: String -> Notes -> Maybe Element
+lookupEndnote :: T.Text -> Notes -> Maybe Element
 lookupEndnote s (Notes _ _ ens) = ens >>= M.lookup s
 
 elemToExtent :: Element -> Extent
@@ -889,7 +877,7 @@ elemToExtent drawingElem =
     where
       wp_ns  = "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
       getDim at = findElement (QName "extent" (Just wp_ns) (Just "wp")) drawingElem
-                    >>= findAttr (QName at Nothing Nothing) >>= safeRead
+                    >>= findAttr (QName at Nothing Nothing) >>= safeRead . T.pack
 
 
 childElemToRun :: NameSpaces -> Element -> D Run
@@ -900,7 +888,7 @@ childElemToRun ns element
   = let (title, alt) = getTitleAndAlt ns element
         a_ns = "http://schemas.openxmlformats.org/drawingml/2006/main"
         drawing = findElement (QName "blip" (Just a_ns) (Just "a")) picElem
-                  >>= findAttr (QName "embed" (lookup "r" ns) (Just "r"))
+                  >>= findAttrText (QName "embed" (lookup "r" ns) (Just "r"))
     in
      case drawing of
        Just s -> expandDrawingId s >>=
@@ -913,7 +901,7 @@ childElemToRun ns element
   = return InlineChart
 childElemToRun ns element
   | isElem ns "w" "footnoteReference" element
-  , Just fnId <- findAttrByName ns "w" "id" element = do
+  , Just fnId <- findAttrTextByName ns "w" "id" element = do
     notes <- asks envNotes
     case lookupFootnote fnId notes of
       Just e -> do bps <- local (\r -> r {envLocation=InFootnote}) $ mapD (elemToBodyPart ns) (elChildren e)
@@ -921,7 +909,7 @@ childElemToRun ns element
       Nothing  -> return $ Footnote []
 childElemToRun ns element
   | isElem ns "w" "endnoteReference" element
-  , Just enId <- findAttrByName ns "w" "id" element = do
+  , Just enId <- findAttrTextByName ns "w" "id" element = do
     notes <- asks envNotes
     case lookupEndnote enId notes of
       Just e -> do bps <- local (\r -> r {envLocation=InEndnote}) $ mapD (elemToBodyPart ns) (elChildren e)
@@ -974,15 +962,15 @@ getParStyleField _ _ = Nothing
 getTrackedChange :: NameSpaces -> Element -> Maybe TrackedChange
 getTrackedChange ns element
   | isElem ns "w" "ins" element || isElem ns "w" "moveTo" element
-  , Just cId <- findAttrByName ns "w" "id" element
-  , Just cAuthor <- findAttrByName ns "w" "author" element
-  , Just cDate <- findAttrByName ns "w" "date" element =
+  , Just cId <- findAttrTextByName ns "w" "id" element
+  , Just cAuthor <- findAttrTextByName ns "w" "author" element
+  , Just cDate <- findAttrTextByName ns "w" "date" element =
       Just $ TrackedChange Insertion (ChangeInfo cId cAuthor cDate)
 getTrackedChange ns element
   | isElem ns "w" "del" element || isElem ns "w" "moveFrom" element
-  , Just cId <- findAttrByName ns "w" "id" element
-  , Just cAuthor <- findAttrByName ns "w" "author" element
-  , Just cDate <- findAttrByName ns "w" "date" element =
+  , Just cId <- findAttrTextByName ns "w" "id" element
+  , Just cAuthor <- findAttrTextByName ns "w" "author" element
+  , Just cDate <- findAttrTextByName ns "w" "date" element =
       Just $ TrackedChange Deletion (ChangeInfo cId cAuthor cDate)
 getTrackedChange _ _ = Nothing
 
@@ -991,7 +979,7 @@ elemToParagraphStyle ns element sty
   | Just pPr <- findChildByName ns "w" "pPr" element =
     let style =
           mapMaybe
-          (fmap ParaStyleId . findAttrByName ns "w" "val")
+          (fmap ParaStyleId . findAttrTextByName ns "w" "val")
           (findChildrenByName ns "w" "pStyle" pPr)
     in ParagraphStyle
       {pStyle = mapMaybe (`M.lookup` sty) style
@@ -1023,7 +1011,7 @@ elemToRunStyleD ns element
     charStyles <- asks envCharStyles
     let parentSty =
           findChildByName ns "w" "rStyle" rPr >>=
-          findAttrByName ns "w" "val" >>=
+          findAttrTextByName ns "w" "val" >>=
           flip M.lookup charStyles . CharStyleId
     return $ elemToRunStyle ns element parentSty
 elemToRunStyleD _ _ = return defaultRunStyle
@@ -1033,12 +1021,12 @@ elemToRunElem ns element
   | isElem ns "w" "t" element
     || isElem ns "w" "delText" element
     || isElem ns "m" "t" element = do
-    let str = strContent element
+    let str = T.pack $ strContent element
     font <- asks envFont
     case font of
       Nothing -> return $ TextRun str
       Just f  -> return . TextRun $
-                  map (\x -> fromMaybe x . getUnicode f . lowerFromPrivate $ x) str
+                  T.map (\x -> fromMaybe x . getUnicode f . lowerFromPrivate $ x) str
   | isElem ns "w" "br" element = return LnBrk
   | isElem ns "w" "tab" element = return Tab
   | isElem ns "w" "softHyphen" element = return SoftHyphen
@@ -1056,11 +1044,11 @@ getSymChar ns element
   | Just s <- lowerFromPrivate <$> getCodepoint
   , Just font <- getFont =
     case readLitChar ("\\x" ++ s) of
-         [(char, _)] -> TextRun . maybe "" (:[]) $ getUnicode font char
+         [(char, _)] -> TextRun . maybe "" T.singleton $ getUnicode font char
          _           -> TextRun ""
   where
     getCodepoint = findAttrByName ns "w" "char" element
-    getFont = stringToFont =<< findAttrByName ns "w" "font" element
+    getFont = textToFont . T.pack =<< findAttrByName ns "w" "font" element
     lowerFromPrivate ('F':xs) = '0':xs
     lowerFromPrivate xs       = xs
 getSymChar _ _ = TextRun ""
@@ -1072,7 +1060,7 @@ elemToRunElems ns element
        let qualName = elemName ns "w"
        let font = do
                     fontElem <- findElement (qualName "rFonts") element
-                    stringToFont =<<
+                    textToFont . T.pack =<<
                        foldr ((<|>) . (flip findAttr fontElem . qualName)) Nothing ["ascii", "hAnsi"]
        local (setFont font) (mapD (elemToRunElem ns) (elChildren element))
 elemToRunElems _ _ = throwError WrongElem
diff --git a/src/Text/Pandoc/Readers/Docx/Parse/Styles.hs b/src/Text/Pandoc/Readers/Docx/Parse/Styles.hs
index ac2d6fa07..beebe4f23 100644
--- a/src/Text/Pandoc/Readers/Docx/Parse/Styles.hs
+++ b/src/Text/Pandoc/Readers/Docx/Parse/Styles.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE TypeFamilies      #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE OverloadedStrings #-}
 {- |
  Module : Text.Pandoc.Readers.Docx.Parse.Styles
  Copyright : Copyright (C) 2014-2019 Jesse Rosenthal
@@ -46,20 +47,19 @@ import Prelude
 import Codec.Archive.Zip
 import Control.Applicative ((<|>))
 import Control.Monad.Except
-import Data.Char (toLower)
-import Data.List
 import Data.Function (on)
 import Data.String (IsString(..))
 import qualified Data.Map as M
+import qualified Data.Text as T
 import Data.Maybe
 import Data.Coerce
 import Text.Pandoc.Readers.Docx.Util
 import qualified Text.Pandoc.UTF8 as UTF8
 import Text.XML.Light
 
-newtype CharStyleId   = CharStyleId String
+newtype CharStyleId   = CharStyleId T.Text
   deriving (Show, Eq, Ord, IsString, FromStyleId)
-newtype ParaStyleId   = ParaStyleId String
+newtype ParaStyleId   = ParaStyleId T.Text
   deriving (Show, Eq, Ord, IsString, FromStyleId)
 
 newtype CharStyleName = CharStyleName CIString
@@ -68,25 +68,31 @@ newtype ParaStyleName = ParaStyleName CIString
   deriving (Show, Eq, Ord, IsString, FromStyleName)
 
 -- Case-insensitive comparisons
-newtype CIString = CIString String deriving (Show, IsString, FromStyleName)
+newtype CIString = CIString T.Text deriving (Show, IsString, FromStyleName)
 
 class FromStyleName a where
-  fromStyleName :: a -> String
+  fromStyleName :: a -> T.Text
 
 instance FromStyleName String where
+  fromStyleName = T.pack
+
+instance FromStyleName T.Text where
   fromStyleName = id
 
 class FromStyleId a where
-  fromStyleId :: a -> String
+  fromStyleId :: a -> T.Text
 
 instance FromStyleId String where
+  fromStyleId = T.pack
+
+instance FromStyleId T.Text where
   fromStyleId = id
 
 instance Eq CIString where
-   (==) = (==) `on` map toLower . coerce
+   (==) = (==) `on` T.toCaseFold . coerce
 
 instance Ord CIString where
-  compare = compare `on` map toLower . coerce
+  compare = compare `on` T.toCaseFold . coerce
 
 data VertAlign = BaseLn | SupScrpt | SubScrpt
                deriving Show
@@ -108,7 +114,7 @@ data RunStyle = RunStyle { isBold       :: Maybe Bool
                 deriving Show
 
 data ParStyle = ParStyle { headingLev    :: Maybe (ParaStyleName, Int)
-                         , numInfo       :: Maybe (String, String)
+                         , numInfo       :: Maybe (T.Text, T.Text)
                          , psParentStyle :: Maybe ParStyle
                          , pStyleName    :: ParaStyleName
                          , pStyleId      :: ParaStyleId
@@ -146,7 +152,7 @@ isBasedOnStyle ns element parentStyle
   , Just styleType <- findAttrByName ns "w" "type" element
   , styleType == cStyleType parentStyle
   , Just basedOnVal <- findChildByName ns "w" "basedOn" element >>=
-                       findAttrByName ns "w" "val"
+                       findAttrTextByName ns "w" "val"
   , Just ps <- parentStyle = basedOnVal == fromStyleId (getStyleId ps)
   | isElem ns "w" "style" element
   , Just styleType <- findAttrByName ns "w" "type" element
@@ -234,7 +240,7 @@ checkOnOff _ _ _ = Nothing
 elemToCharStyle :: NameSpaces
                 -> Element -> Maybe CharStyle -> Maybe CharStyle
 elemToCharStyle ns element parentStyle
-  = CharStyle <$> (CharStyleId <$> findAttrByName ns "w" "styleId" element)
+  = CharStyle <$> (CharStyleId <$> findAttrTextByName ns "w" "styleId" element)
               <*> getElementStyleName ns element
               <*> (Just $ elemToRunStyle ns element parentStyle)
 
@@ -267,32 +273,32 @@ elemToRunStyle _ _ _ = defaultRunStyle
 getHeaderLevel :: NameSpaces -> Element -> Maybe (ParaStyleName, Int)
 getHeaderLevel ns element
   | Just styleName <- getElementStyleName ns element
-  , Just n <- stringToInteger =<<
-              (stripPrefix "heading " . map toLower $
+  , Just n <- stringToInteger . T.unpack =<< -- TODO text: change stringToInteger?
+              (T.stripPrefix "heading " . T.toLower $
                 fromStyleName styleName)
   , n > 0 = Just (styleName, fromInteger n)
 getHeaderLevel _ _ = Nothing
 
-getElementStyleName :: Coercible String a => NameSpaces -> Element -> Maybe a
+getElementStyleName :: Coercible T.Text a => NameSpaces -> Element -> Maybe a
 getElementStyleName ns el = coerce <$>
-  ((findChildByName ns "w" "name" el >>= findAttrByName ns "w" "val")
-  <|> findAttrByName ns "w" "styleId" el)
+  ((findChildByName ns "w" "name" el >>= findAttrTextByName ns "w" "val")
+  <|> findAttrTextByName ns "w" "styleId" el)
 
-getNumInfo :: NameSpaces -> Element -> Maybe (String, String)
+getNumInfo :: NameSpaces -> Element -> Maybe (T.Text, T.Text)
 getNumInfo ns element = do
   let numPr = findChildByName ns "w" "pPr" element >>=
               findChildByName ns "w" "numPr"
       lvl = fromMaybe "0" (numPr >>=
                            findChildByName ns "w" "ilvl" >>=
-                           findAttrByName ns "w" "val")
+                           findAttrTextByName ns "w" "val")
   numId <- numPr >>=
            findChildByName ns "w" "numId" >>=
-           findAttrByName ns "w" "val"
+           findAttrTextByName ns "w" "val"
   return (numId, lvl)
 
 elemToParStyleData :: NameSpaces -> Element -> Maybe ParStyle -> Maybe ParStyle
 elemToParStyleData ns element parentStyle
-  | Just styleId <- findAttrByName ns "w" "styleId" element
+  | Just styleId <- findAttrTextByName ns "w" "styleId" element
   , Just styleName <- getElementStyleName ns element
   = Just $ ParStyle
       {
diff --git a/src/Text/Pandoc/Readers/Docx/Util.hs b/src/Text/Pandoc/Readers/Docx/Util.hs
index f4855efd2..0de1114bd 100644
--- a/src/Text/Pandoc/Readers/Docx/Util.hs
+++ b/src/Text/Pandoc/Readers/Docx/Util.hs
@@ -19,11 +19,14 @@ module Text.Pandoc.Readers.Docx.Util (
                                       , elemToNameSpaces
                                       , findChildByName
                                       , findChildrenByName
+                                      , findAttrText
                                       , findAttrByName
+                                      , findAttrTextByName
                                       ) where
 
 import Prelude
 import Data.Maybe (mapMaybe)
+import qualified Data.Text as T
 import Text.XML.Light
 
 type NameSpaces = [(String, String)]
@@ -55,7 +58,13 @@ findChildrenByName ns pref name el =
   let ns' = ns ++ elemToNameSpaces el
   in  findChildren (elemName ns' pref name) el
 
+findAttrText :: QName -> Element -> Maybe T.Text
+findAttrText x = fmap T.pack . findAttr x
+
 findAttrByName :: NameSpaces -> String -> String -> Element -> Maybe String
 findAttrByName ns pref name el =
   let ns' = ns ++ elemToNameSpaces el
   in  findAttr (elemName ns' pref name) el
+
+findAttrTextByName :: NameSpaces -> String -> String -> Element -> Maybe T.Text
+findAttrTextByName a b c = fmap T.pack . findAttrByName a b c
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index d9e1528f6..dd2f9101a 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -618,25 +618,24 @@ writeDocx opts doc@(Pandoc meta _) = do
                   miscRelEntries ++ otherMediaEntries
   return $ fromArchive archive
 
-
 newParaPropToOpenXml :: ParaStyleName -> Element
 newParaPropToOpenXml (fromStyleName -> s) =
-  let styleId = filter (not . isSpace) s
+  let styleId = T.filter (not . isSpace) s
   in mknode "w:style" [ ("w:type", "paragraph")
                       , ("w:customStyle", "1")
-                      , ("w:styleId", styleId)]
-     [ mknode "w:name" [("w:val", s)] ()
+                      , ("w:styleId", T.unpack styleId)]
+     [ mknode "w:name" [("w:val", T.unpack s)] ()
      , mknode "w:basedOn" [("w:val","BodyText")] ()
      , mknode "w:qFormat" [] ()
      ]
 
 newTextPropToOpenXml :: CharStyleName -> Element
 newTextPropToOpenXml (fromStyleName -> s) =
-  let styleId = filter (not . isSpace) s
+  let styleId = T.filter (not . isSpace) s
   in mknode "w:style" [ ("w:type", "character")
                       , ("w:customStyle", "1")
-                      , ("w:styleId", styleId)]
-     [ mknode "w:name" [("w:val", s)] ()
+                      , ("w:styleId", T.unpack styleId)]
+     [ mknode "w:name" [("w:val", T.unpack s)] ()
      , mknode "w:basedOn" [("w:val","BodyTextChar")] ()
      ]
 
@@ -862,13 +861,13 @@ pStyleM :: (PandocMonad m) => ParaStyleName -> WS m XML.Element
 pStyleM styleName = do
   pStyleMap <- gets (smParaStyle . stStyleMaps)
   let sty' = getStyleIdFromName styleName pStyleMap
-  return $ mknode "w:pStyle" [("w:val", fromStyleId sty')] ()
+  return $ mknode "w:pStyle" [("w:val", T.unpack $ fromStyleId sty')] ()
 
 rStyleM :: (PandocMonad m) => CharStyleName -> WS m XML.Element
 rStyleM styleName = do
   cStyleMap <- gets (smCharStyle . stStyleMaps)
   let sty' = getStyleIdFromName styleName cStyleMap
-  return $ mknode "w:rStyle" [("w:val", fromStyleId sty')] ()
+  return $ mknode "w:rStyle" [("w:val", T.unpack $ fromStyleId sty')] ()
 
 getUniqueId :: (PandocMonad m) => WS m String
 -- the + 20 is to ensure that there are no clashes with the rIds
diff --git a/src/Text/Pandoc/Writers/Docx/StyleMap.hs b/src/Text/Pandoc/Writers/Docx/StyleMap.hs
index 4f0b0c3f9..18956ee52 100644
--- a/src/Text/Pandoc/Writers/Docx/StyleMap.hs
+++ b/src/Text/Pandoc/Writers/Docx/StyleMap.hs
@@ -27,6 +27,7 @@ module Text.Pandoc.Writers.Docx.StyleMap ( StyleMaps(..)
 import Text.Pandoc.Readers.Docx.Parse.Styles
 import Codec.Archive.Zip
 import qualified Data.Map as M
+import qualified Data.Text as T
 import Data.String
 import Data.Char (isSpace)
 import Prelude
@@ -38,7 +39,7 @@ type CharStyleNameMap = M.Map CharStyleName CharStyle
 getStyleIdFromName :: (Ord sn, FromStyleName sn, IsString (StyleId sty), HasStyleId sty)
                    => sn -> M.Map sn sty -> StyleId sty
 getStyleIdFromName s = maybe (fallback s) getStyleId . M.lookup s
-  where fallback = fromString . filter (not . isSpace) . fromStyleName
+  where fallback = fromString . T.unpack . T.filter (not . isSpace) . fromStyleName
 
 hasStyleName :: (Ord sn, HasStyleId sty)
              => sn -> M.Map sn sty -> Bool