diff options
author | John MacFarlane <jgm@berkeley.edu> | 2017-03-13 11:38:19 +0100 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2017-03-13 11:38:19 +0100 |
commit | db37b71d9a12bbd9370d68a472a0553f07661aec (patch) | |
tree | ca44f880078cbfde9a76fc6598c6a4d36f1c4dbc /src/Text/Pandoc/Writers/Docx.hs | |
parent | efcb51bcb01b5f07d0957fdac7f73e366d9f8c85 (diff) |
Highlighting: highlighting now returns an Either rather than Maybe.
This allows us to display error information returned by the
skylighting library.
Display a warning if the highlighting library throws an error.
Diffstat (limited to 'src/Text/Pandoc/Writers/Docx.hs')
-rw-r--r-- | src/Text/Pandoc/Writers/Docx.hs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index c182d42a3..04daf3b4b 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -1156,9 +1156,13 @@ inlineToOpenXML' opts (Code attrs str) = do [ rCustomStyle (show toktype) ] , mknode "w:t" [("xml:space","preserve")] (T.unpack tok) ] withTextProp (rCustomStyle "VerbatimChar") - $ case writerHighlightStyle opts >> highlight formatOpenXML attrs str of - Just h -> return h - Nothing -> unhighlighted + $ if isNothing (writerHighlightStyle opts) + then unhighlighted + else case highlight formatOpenXML attrs str of + Right h -> return h + Left msg -> do + unless (null msg) $ report $ CouldNotHighlight msg + unhighlighted inlineToOpenXML' opts (Note bs) = do notes <- gets stFootnotes notenum <- (lift . lift) getUniqueId |