3 files changed, 30 insertions, 26 deletions
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index 5e4fe7731..fcc8551a4 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -1181,7 +1181,8 @@ inlineToOpenXML' opts (Code attrs str) = do
   withTextProp (rCustomStyle "VerbatimChar")
     $ if isNothing (writerHighlightStyle opts)
           then unhighlighted
-          else case highlight formatOpenXML attrs str of
+          else case highlight (writerSyntaxMap opts)
+                      formatOpenXML attrs str of
                     Right h  -> return h
                     Left msg -> do
                       unless (null msg) $ report $ CouldNotHighlight msg
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index 10b782de7..42726bc61 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -642,7 +642,7 @@ blockToHtml opts (CodeBlock (id',classes,keyvals) rawCode) = do
                     then unlines . map ("> " ++) . lines $ rawCode
                     else rawCode
       hlCode   = if isJust (writerHighlightStyle opts)
-                    then highlight formatHtmlBlock
+                    then highlight (writerSyntaxMap opts) formatHtmlBlock
                             (id',classes',keyvals) adjCode
                     else Left ""
   case hlCode of
@@ -885,8 +885,9 @@ inlineToHtml opts inline = do
                                return $ addAttrs opts (id',[],keyvals) h
                         where (id',_,keyvals) = attr
                               hlCode = if isJust (writerHighlightStyle opts)
-                                          then highlight formatHtmlInline
-                                                   attr str
+                                          then highlight
+                                                 (writerSyntaxMap opts)
+                                                 formatHtmlInline attr str
                                           else Left ""
     (Strikeout lst)  -> inlineListToHtml opts lst >>=
                         return . H.del
diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs
index 44c00df24..eb38485de 100644
--- a/src/Text/Pandoc/Writers/LaTeX.hs
+++ b/src/Text/Pandoc/Writers/LaTeX.hs
@@ -548,7 +548,8 @@ blockToLaTeX (CodeBlock (identifier,classes,keyvalAttr) str) = do
         return $ flush ("\\begin{lstlisting}" <> printParams $$ text str $$
                  "\\end{lstlisting}") $$ cr
   let highlightedCodeBlock =
-        case highlight formatLaTeXBlock ("",classes,keyvalAttr) str of
+        case highlight (writerSyntaxMap opts)
+                 formatLaTeXBlock ("",classes,keyvalAttr) str of
                Left msg -> do
                  unless (null msg) $
                    report $ CouldNotHighlight msg
@@ -953,32 +954,33 @@ inlineToLaTeX (Cite cits lst) = do
 inlineToLaTeX (Code (_,classes,_) str) = do
   opts <- gets stOptions
   inHeading <- gets stInHeading
+  let listingsCode = do
+        let listingsopt = case getListingsLanguage classes of
+                               Just l -> "[language=" ++ mbBraced l ++ "]"
+                               Nothing -> ""
+        inNote <- gets stInNote
+        when inNote $ modify $ \s -> s{ stVerbInNote = True }
+        let chr = case "!\"&'()*,-./:;?@_" \\ str of
+                       (c:_) -> c
+                       []    -> '!'
+        return $ text $ "\\lstinline" ++ listingsopt ++ [chr] ++ str ++ [chr]
+  let rawCode = liftM (text . (\s -> "\\texttt{" ++ escapeSpaces s ++ "}"))
+                 $ stringToLaTeX CodeString str
+                where escapeSpaces =  concatMap
+                         (\c -> if c == ' ' then "\\ " else [c])
+  let highlightCode = do
+        case highlight (writerSyntaxMap opts)
+                 formatLaTeXInline ("",classes,[]) str of
+               Left msg -> do
+                 unless (null msg) $ report $ CouldNotHighlight msg
+                 rawCode
+               Right h -> modify (\st -> st{ stHighlighting = True }) >>
+                          return (text (T.unpack h))
   case () of
      _ | writerListings opts  && not inHeading      -> listingsCode
        | isJust (writerHighlightStyle opts) && not (null classes)
                                                     -> highlightCode
        | otherwise                                  -> rawCode
-   where listingsCode = do
-           let listingsopt = case getListingsLanguage classes of
-                                  Just l -> "[language=" ++ mbBraced l ++ "]"
-                                  Nothing -> ""
-           inNote <- gets stInNote
-           when inNote $ modify $ \s -> s{ stVerbInNote = True }
-           let chr = case "!\"&'()*,-./:;?@_" \\ str of
-                          (c:_) -> c
-                          []    -> '!'
-           return $ text $ "\\lstinline" ++ listingsopt ++ [chr] ++ str ++ [chr]
-         highlightCode = do
-           case highlight formatLaTeXInline ("",classes,[]) str of
-                  Left msg -> do
-                    unless (null msg) $ report $ CouldNotHighlight msg
-                    rawCode
-                  Right h -> modify (\st -> st{ stHighlighting = True }) >>
-                             return (text (T.unpack h))
-         rawCode = liftM (text . (\s -> "\\texttt{" ++ escapeSpaces s ++ "}"))
-                          $ stringToLaTeX CodeString str
-           where
-             escapeSpaces =  concatMap (\c -> if c == ' ' then "\\ " else [c])
 inlineToLaTeX (Quoted qt lst) = do
   contents <- inlineListToLaTeX lst
   csquotes <- liftM stCsquotes get