From 891e613e4a757798754754cae0c8269eb80158d8 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 19 Sep 2025 23:17:01 +0200 Subject: Docx writer: fix regression (3.8) in highlighted code. We added DefaultHighlighting in commit 6475725 but didn't adjust the pattern-match here. Closes #11156. --- src/Text/Pandoc/Writers/Docx/OpenXML.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Text/Pandoc/Writers/Docx/OpenXML.hs b/src/Text/Pandoc/Writers/Docx/OpenXML.hs index f9203a1e6..c9c1bc80f 100644 --- a/src/Text/Pandoc/Writers/Docx/OpenXML.hs +++ b/src/Text/Pandoc/Writers/Docx/OpenXML.hs @@ -888,14 +888,16 @@ inlineToOpenXML' opts (Code attrs str) = do [ mknode "w:rPr" [] $ maybeToList (lookup toktype tokTypesMap) , mknode "w:t" [("xml:space","preserve")] tok ] - withTextPropM (rStyleM "Verbatim Char") - $ case writerHighlightMethod opts of - Skylighting _ -> - case highlight (writerSyntaxMap opts) formatOpenXML attrs str of + let highlighted = + case highlight (writerSyntaxMap opts) formatOpenXML attrs str of Right h -> return (map Elem h) Left msg -> do unless (T.null msg) $ report $ CouldNotHighlight msg unhighlighted + withTextPropM (rStyleM "Verbatim Char") + $ case writerHighlightMethod opts of + DefaultHighlighting -> highlighted + Skylighting _ -> highlighted _ -> unhighlighted inlineToOpenXML' opts (Note bs) = do notes <- gets stFootnotes -- cgit v1.2.3