aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2020-06-22 17:56:05 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2020-06-22 17:56:28 -0700
commit7f8105159cab909fa9c803a73276c4b4981c8ebf (patch)
treeeabd6015de36d3ac02eba9e442ae42535b913e42
parentb1561d8e470a4b9ecc681d4749093fa14cb1bd37 (diff)
downloadpandoc-7f8105159cab909fa9c803a73276c4b4981c8ebf.tar.gz
Handle native Underline in Powerpoint writer.
(Instead of old Span with underline class. Spans with `underline` will no longer be rendered as underlined text.)
-rw-r--r--src/Text/Pandoc/Writers/Powerpoint/Presentation.hs2
-rw-r--r--test/pptx/inline_formatting.pptxbin26166 -> 26156 bytes
-rw-r--r--test/pptx/inline_formatting_templated.pptxbin393457 -> 393447 bytes
3 files changed, 1 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
index d225535cd..a75b04d2e 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
@@ -370,7 +370,7 @@ inlineToParElems (Note blks) = do
modify $ \st -> st { stNoteIds = M.insert curNoteId blks notes }
local (\env -> env{envRunProps = (envRunProps env){rLink = Just $ InternalTarget endNotesSlideId}}) $
inlineToParElems $ Superscript [Str $ tshow curNoteId]
-inlineToParElems (Span (_, ["underline"], _) ils) =
+inlineToParElems (Underline ils) =
local (\r -> r{envRunProps = (envRunProps r){rPropUnderline=True}}) $
inlinesToParElems ils
inlineToParElems (Span _ ils) = inlinesToParElems ils
diff --git a/test/pptx/inline_formatting.pptx b/test/pptx/inline_formatting.pptx
index bbe525cd8..926c8ff3f 100644
--- a/test/pptx/inline_formatting.pptx
+++ b/test/pptx/inline_formatting.pptx
Binary files differ
diff --git a/test/pptx/inline_formatting_templated.pptx b/test/pptx/inline_formatting_templated.pptx
index 08fb4e793..16f48e182 100644
--- a/test/pptx/inline_formatting_templated.pptx
+++ b/test/pptx/inline_formatting_templated.pptx
Binary files differ