From 7f8105159cab909fa9c803a73276c4b4981c8ebf Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 22 Jun 2020 17:56:05 -0700
Subject: [PATCH] Handle native Underline in Powerpoint writer.

(Instead of old Span with underline class.
Spans with `underline` will no longer be rendered
as underlined text.)
---
 .../Pandoc/Writers/Powerpoint/Presentation.hs |   2 +-
 test/pptx/inline_formatting.pptx              | Bin 26166 -> 26156 bytes
 test/pptx/inline_formatting_templated.pptx    | Bin 393457 -> 393447 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

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 bbe525cd89101fc78b1eae9de4b102ecf18a662e..926c8ff3f7d7974b481fc8f91f9a41bc46f2f013 100644
GIT binary patch
delta 2449
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
J(vxzP@P8F@Q)2)C

delta 2326
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

diff --git a/test/pptx/inline_formatting_templated.pptx b/test/pptx/inline_formatting_templated.pptx
index 08fb4e793a73a9d3c51e5ea9bffe973ade5c199a..16f48e18267e2d5272e194af51689e1bb1448a47 100644
GIT binary patch
delta 1708
zcmZ9Mdpwj`7{}**IYJ|sXh<2kw3_KMy0~m|X(G3E4H>DBr3*^CHcLCMBO)Y@!75o1
zZSGmtq@k5%l_Ww*v#yJk%OKZ%$Gd$#)%(x$e1FgLJJ08H&Uw#7sQh54JjupFNLZGD
zii#3~L^^CF2|`zNQ34?^kwj+3chRIcvrb2K%k8+^3LL3rMRo?WMO`Yz4$tZpu0(pc
zDADU`#&xWe&%v;K^D!i7RH24FoBB$-;`^M=4SJNbTRYR;GBs(f8yfFz?W}n6EPP}%
zV4hbWXG@B8m$>$a8kK(D<Ed?mjo2o}8dk8y2vyp9*s1zGZ;jiLwD?Kp;^xAL-OfQh
zC;WSMLi5_gRBgG`1VcS<={&3L$#v_RUBd?Sl(~Cz<IU4#_ULvPXFNafV~96<j5I#r
zJD@mQ7cju4nEo8AV9Ql&lJ`5{bBvMhQ!=+c!oe%%0%zJGBU-88D}}q9vnEQ~S?etC
zxOR4@^mh#2_WUqhd8tSJ9h37o@mT(QCr78v1(NN;GSSUt2{sJZ5U*^Zm)Fp$AZkZL
zta?nGM)ah<nwYeglO3yyl(eb(gy_HhYxzMgqwX=F`Lt8)K33qX)27r8V&4mwH?;c^
zHGV`-af*JLMC|}~qc`7stu;ML@y-vup<?q!J1Dsb+qFcVoM!*Ti+SXUN|l2Y!%R=E
z+k~Sp_FyP{hv{&sX|1eROPjrAfOB%4s=>J0a`)F%J!b=v!uB?%x8qd(>le!L<s(KK
z!@uj%vyG#R14=1OYN~8o#Zj?eCD}a6*URL}7RU3>`+YT{IvO8U>Q~*{BJ_s7ax8M(
zaE0Y|FxxZI^Ec;P(~YL!)UI)>5-CwzmYJ43r+F&)nfG@rtL6M*(rcafgWSSN{Q$~{
z<TNizF+O*JP3}?dIbcy87?^8-e155tBG3V0!R;#b6&gZB1=%}e9zW?gATyhNYiUvu
z<CkL^W*=K=<dq!MDdV-7C!4>_*KRugNM$*Z<I_8KRz}pA*Ph<7XCbgXfb%L{Yavvs
zy!4{ohS*albL_i(2l_6T|3z-NU0IMb*a|L5Jf#~-Xj)v>@*f^Nb#+KL$JUp7<)~WJ
zH@q&ON=tU5a}xF!BMeQgY!Rl7MrfE)XeBwiFXD**q51Ka8G`z@vXhV8fAO?!y-M1W
zdZ{$aX;~+(K0GSDy;P@a);7NW{z!~(tBd{e^`9Q<)$p?ix=dsp(bH$tb<dp3x;yO2
zcHA9eNMel@n^shY(+9(1%qsJ()=M0>aW=1wdhONkF*#SpxPHf7uBmhTj>4_f`nj^c
z7Yl`dYdS5FZkhR2wXY~=B6Qx!+m=Q2i;c_^slYeVV~q@gXMv)YD4zW(z6aOBh%6$)
zBBCs!5Q`}MfCw1<5}*Ct&}#x{t(sug1lWk2gVhsY7cPto1V<=72~@}*Pl}8X2&UMp
zAWiu6I|wZ%fimv$o5WlRFa~qsLXkkQfK6CfUB)!5V^m4-un-9Z*-uv?xIy75po+Vw
zQ<$q5noNP6tFC4Lm=r&3xQfu1!-rtf6wpUluyqO;2~`FI*c%LFA!Qm+kQC@Jjn%B-
zjcH(nej5oj`CvV~83`1j_zaMOa(rwGAJX{13f&hEFU$jV7!nV}VIdz-P`!jzC1nQe
zMd^uxTn)x0VpYsbLCvn?N|~T+orJ@>SqvO*;BfQC$6l9YT&We5-BNJaGzaz~UeI<9
zIHNwPxYmMc=tZ^w)Zs%m5QG1Gz-9%e;Y#EOtQ?Y#L$3g$GH}>Gk1ci$o}UK{G&%GC
zhD>b!!aU~BxQQ#43s_e+3|#=$NDh212vu;)BCtkh3SsdQP=X1IfQD>_Tueh+q4W|K
z5~14?utILZA}pYpjd-KdGT4Q>H{;+VfcjP(ss*6bj>Fm&44B<GFa)skEe>}D!0p3f
hP5?E7tB`zHgof&l;5ihbA;ZZHBB~;XCIEI@{sUr)-}nFk

delta 1820
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
F{{X`c32OiV