1 files changed, 18 insertions, 15 deletions
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