From f5d41a0c3f0809f2838dafa22e2404e6010eac7e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 13 Feb 2025 14:35:08 -0800 Subject: [PATCH] Powerpoint writer: avoid extra blank lines before author. (In the case where there is no subtitle.) Closes #10619. --- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 4 +++- .../output.pptx | Bin 28585 -> 28579 bytes .../templated.pptx | Bin 41671 -> 41666 bytes test/pptx/footer/basic/output.pptx | Bin 52724 -> 52718 bytes test/pptx/footer/fixed-date/output.pptx | Bin 51349 -> 51344 bytes .../footer/higher-slide-number/output.pptx | Bin 52735 -> 52729 bytes test/pptx/footer/no-title-slide/output.pptx | Bin 52309 -> 52303 bytes test/pptx/layouts/deleted.pptx | Bin 55691 -> 55630 bytes test/pptx/layouts/moved.pptx | Bin 66426 -> 66365 bytes .../speaker-notes-after-metadata/output.pptx | Bin 31580 -> 31575 bytes .../templated.pptx | Bin 44666 -> 44659 bytes 11 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index 63d302ed4349..c0d1f2eba1c2 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -1752,7 +1752,9 @@ metadataToElement layout titleElems subtitleElems authorsElems dateElems , Just cSld <- findChild (elemName ns "p" "cSld") layout , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do let combinedAuthorElems = intercalate [Break] authorsElems - subtitleAndAuthorElems = intercalate [Break, Break] [subtitleElems, combinedAuthorElems] + subtitleAndAuthorElems = intercalate [Break, Break] $ + filter (not . null) + [subtitleElems, combinedAuthorElems] (titleId, titleElement) <- nonBodyTextToElement layout [PHType "ctrTitle"] titleElems (subtitleId, subtitleElement) <- nonBodyTextToElement layout [PHType "subTitle"] subtitleAndAuthorElems (dateId, dateElement) <- nonBodyTextToElement layout [PHType "dt"] dateElems diff --git a/test/pptx/document-properties-short-desc/output.pptx b/test/pptx/document-properties-short-desc/output.pptx index fc28a31e39ade450d8b0e9ac9ebc0a83cc2f4329..6e80cd6018f752a7827e965e9044e011b1504041 100644 GIT binary patch delta 2463 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 DoIk1L diff --git a/test/pptx/document-properties-short-desc/templated.pptx b/test/pptx/document-properties-short-desc/templated.pptx index 4feccdac7e7b044a255884de080dfcb27f49ed8b..d8fe3017d4644c37f3b21e2e1a2a9d179177a2c3 100644 GIT binary patch delta 2009 zcmY+EdpJ~i7{|{!GgB&Z8$-vqG&L?mC={c{Ee|o%3abn)x`@$W%+~H|b_ey)MdtF; z#DoxKTeb`J?2ACI!8dc_d*{ zROZ+}-6J~c)eCm*s&JbWd$|t_*X^|M6Dj_=eQtcnmejF3{m%!L)S;}XWWn{TnK!9r z^+Uo%4qem3)^PO!X@2pETd&k>Mh1F{(HFKX`-)3)Lfw#1rP!ht?(J5s_HXvRQs{8x zotsKz#v6Re|CupUAKPFX#8&5OseRmRb(eo@@h$@@5Ke*Gd%x=|2N zMQJJdhlgIXoSa~lUP>rsr!Kh=YkkqF-SkmxE4wr;a=Ef7%8?QIFr>1+?K@ShKoi

?yhdIY{t$AxQ7tJx+!);0 z{a22!O__p1@!{RIU2*v^lV9H)cOm&vYCQ8nW>_|-K+IS6Mb~%>2gmJ9x{ro4pIF8Q zOmp{a7+V#eZyt+kdV7W$d|7!+x5d`c5szNy(y2hZf5B|OSiyXI6I6|#) zDC+YlBc~}ja@XrKytntJB?Wi>ZLXUwR43hN*>=z0d4@3mSkW)&#}8w_Ip{TO)E!c; z`O>-Ll9R&_9UG>sn`6tYN*3zaB|BoK(YzZ2bQG^O&=PI0$R!k*3@jxpaW(LlpvWBp z_>({bUrG#h>^R0Q5iw>3UJw_9yYKlR#!E?{g|q^o(m5?dio#7GMCxa!El|^Vwz3`T zp8!(`GRJ2B;c*40r8HbKzsEi(AjlRxmfGW*_p4W7;rV%*ft^g3$9RkS+viyPSFBf; z{67uE2T3wix0J7BC?Y0Qn*&2qbjTA@H2O3iy{Xkb5p5uY?ZBt~9L+KLfcX z*$Cu@!(}HT5G!}gTnV5;5a7G#8A5<*oi~6d4Ykr;6{ZZ za4Qc*wuI>2Oa%#?Di1s-zFc{Ss4 zfwVFTX-(2=XOgJE?lc22P0=IX=}@FIP4AL;ST;-%!pD(zQNC57@L7;owFimbuh%WA z4uz+|mg*FQoj<2^!k130L6P-^ILa#2q4XM*;9CTN_#$UYWCUq}c4xe?*8uC9+G4Hu EA7afp1ONa4 delta 2019 zcmY*ZdpML?9R9vDgGrGrgD;uMr6gHOa;eE^Yeq=5rN(7TZLCW!+fuEVbxq1J9ZR_t zCaH)`q_kZYSt%=*c3f(aeY8<3W1B9T{hY6TcIW%+J@5N_-{0>$=RD_^CeYjj=5BPO z(RDDuU|{jNUwmolnxPoMF-)L>VY=`)k-o5LOP{EZtu>|F7?b$iUe9N=+JfQ8~$;7&PRy}jpmY@X(R5}F!|MQEkW30vU zeQzckh{xeCzCPDSNH<<|^SymXUtlb8UE@?9=(0I%T+<~=Dy?uV_8$C$Ssbz{+tjT~ z=znK0t1_%b?=a0oR?Uv(U7f*BtCdRaq8cQkZ(cKP&z03$bKY-t6B+c>)&!dGPuo25 zYB2A(&s)id$tN!**oEg2?18!x-6YIo#h1R)iTMYff3RG})U|t^ z*AKM%d2YQYckNo3bK{B~BdOIZufjoaEpFk|uJPWY$$ev0-@nv+QWLwPZIUrnGVtAb zp=}f^J2k}4>3n*u{0CWYswRKWsgk9~f^&8sDph}bAfLT!!UP0JNE7B;4fLz}87tsQ;DdS$ny_#@mTm(gWSx%OA*7WMNI| zE(2|0im!TW9%YZ+Pg1KJsb82wdmDPzZdk7zUMo~})ls7d7r6;4OK->6%pOlLXiaWO zs(l$;gCEs4e6_cxHR+_PZgGowR557s8$Qx|)NQXWPk4E8aNYI^-F911xbPepHsfvZ zX=pzt;)V;-9(060FI{G?lB{7~_TYi(`lsTxRd@YDpJsiw*|mReU8?2~e>~stc4<&? zKu1yB$D}x`uO45!ka8*d*AN_UbrTmgYE%KkcTZELj$LVnl{uZ_pdkPFlG-sFR z4rYsMvTx)bBh88Ygo7-ZKi~YwY;&hZ2XhuYJF?5D%60>^KGGmB<-e%5Z5xtZm~%*`N zCS%&%Klf)A&!oFw4a3;Z7&iaEL=qLkR~go*=Iq^I?&st~ z^=2l9St`|Bh0d8yR8L_hfiH!*na0S1ZXjuS3@~htlEoDEWwI%YB9j1DwPCxqF0>YZ z8r@k;;NLjw6w#AVk=|`^a%u^Was(hE-81O z2~Cc3Xr%@iykW2eZp_kxGD9u$moSVh$0YHi@cQxXw4Qkwd^OL4)aj_{zppji1PQzZ zhC(iW4_<@<(771;|7Z#|EltQ;3ovGhmZ!5kfQl7@&Q`{xVhAHv(IG2G9iInx{ul|C zTO%>TdRnvq9yVwhl2k#X zlP*LcaUg=KZ#hkX?a_!zkESR_?EmW(hmaUj!~>fW5KKv+aur1c;2uVlLopBM!1!V( K)pMfhq5lC>q%R%- diff --git a/test/pptx/footer/basic/output.pptx b/test/pptx/footer/basic/output.pptx index 68ed4c732758caac248a6e25a4d313f91f854498..2704c1d2f293f7d59cd34ead62b0d15e150b7477 100644 GIT binary patch delta 2508 zcmZ9NdpuNmAIHx*CSgXQ8e`U&!H8xslSQf4B`YarlS|kTDVwkqTbnXPa;N;XtyGGn zRUwwmFbv~9Y;I}A>nT)IZPP_wp0tnkocYZ>+siY5y+5Dd=li>y^ZlKfDO7n=s6yGX zU4^g`!PL}{r!^h{^$imaG7Lea>VTn1)>&(LG%B*sSH>ITt~{}d{TJ=hIY%fU_UUxh1Q2ACU)t8QRn%)v%+ui*~&z=jR`>TqWQPp|lSy_MHY9nQX z_puwpd{j@b330Zz()fMM@U*!_O!gn1L!m~q(`QD~GS>)C>A5^UoheAl**90U#boWL z4>Kmx!c816{dF&kJ5IArSMEy7wC4MJ*10Df44%AG`m_4F>6zsG4Ph^D_b^*$GeXC+ zyQaU23YX>g$RyA5ldM)erJTG<%_XUb63c$`I$Z5-{IN@%ZBRVHDvN(eJi5omiZFU` zv^840a{bl^5rUdazoE$j3I46szvq{k@JO|nq$klDkq)LgdtI)TRtYNJ2Jk+n6?Od(D0$^M z)^xC8!0Ywx+}2%X9(8YW?z>bHHj6Xf>je|<9UAG`^4dqTZQ3u-eYdXNZEfKT)j{!O zwc)+o;qXeT>_Tq1PeI6tUd(|l=lOSg-K1Ep!TnoS{pG#n!ce^TDp>u2@+n)aZR;~K4wreLT?(F=@;$N)XPw^?)1oPRzVH@vf z0To#bE@rDfwnsiMzI4Pdk)X0LZs5LosQUiyFJs30FA-uxk6k%otA2;8N9dOER};~n zFWA&+_C=%!7S!E)mrIRaUM%vVoQpa)xpyqZmmo8nu4|MAwyb)X66W>wK={OJ_L^NL zkyG!E-FVyUKwKGdD(}X`=AQ!7lf+xY*y&A{TC23J9qh_d&!^i@)R&c(sWc+q!S1wrC;V2^>f;jwB!swAtWN)cmsP$(fQfV z+GNKVl7(4+%ajrOU5e(D{N_lP0TBrN^{(PJ!?1pYJP(tG9)fprW3NGC+4dQz75uQXP;4Oon`3 zc5q5V^fvhMU$Gy`O=xH^QVISL8 z^p}7q4P@+~9`u8hKI~q(zmp36+e$x9DjSgJQ9Cfv$bl#Mr=3v*VSGL-P7J^ia^NG; zo*=z&#!ox41VQMFG6po@NHYXQLgl_Ig;eYc9f;`W^0UC=y9Xp6#+M?&21v~eMG3c=iq?Yd%|;3ti_2D!)l5~$a$F9B_GV*+eBDgN%B?`Jl_8)ulHeli zkFN;Yk1xW+n`7}JTEJUmkCobhP8&;bwTS>|Z6q)#qM|o}OvJ;AHi4E+WZ>1pLN9>C z7DqG=G`HBJ7U1s|C)5}?wmM-Oe8D*}6P)zb0D5gK%yAc#sMs3Y;s-Iy500Sj;H=mm z+Zh1O4`BkS42ErhYhApnWxDVP-_7TC~oh*!%V)x=90vt~yK%By{iVyJ}UlrK( zu&|FQP$u_qFp2@B)pL-&w`gY7PW*dpPePT;+Shk5|VULN-6b!b=g ja{<6wz*Ar|&=P#KW)8LRr#%RB79i2Ef0 delta 2564 zcmZ8heK=HUA3o;{6Ear5MiYjnsFN8(LnX_EKBR=59mI}=lCP*xp;58DXfM@MidaHJ zVJHeSV}?*NywoLD=~CHMZJ)BcmOkG1%$eD#?fh}B`@Vno^EE<6^tGuY4Xbjna*my*Gb(l5N5t$?S}Y z%j*EWiBGPdzH0Bsy7cbppRLnHEqIRO%XCT67CC3W$g>h5lOI`ooG!dAvr7%jh#J3!ww|T5IMUF3saqdiB;{ z7^luaUQLCubeoyV^dYZ9(teBIEfba{%oWPtE=7aOMX0A&#x=MSO!TcS=BGW*7&16r zc7f31^t`kw9S{;9Y}lE-t*7LQb%kTbgQagj7X9L+Ll_K8GV5QHT;H)JYL%Y*x6$&w zwl--w#nXPBzc>2qelWgwBn5dKcDrlS=*H&gp{jMS&&d5J0|z)fvSSTX95tt>xSnH-EuY$U;D2$AJ%ztm^xP5 za3W)^-#qz1O@8yoG0VXZ2@D|Y4Dw<=G@{#IH~Wu!RMrLY<8Nc;)=OMj#oK>$^Ioy5 z-810skY3%+S-p=9?87EYgfUi;Bl+EK$33|=cZM~0I2@USe-wfIPhY}ac?#b*wRHD{x^&zEn#TNr%fr=ux5ZJRCIZLVxiz3~cpu7BZ$ z@McG!EBf9|9r=@l2QXtQ?MGt`>%eWze6k?fp)A+`t=BGo$Z9Q(TLVWBa~H-{ByWIt2GpY&eeQKEGE21~$Qb(avIZS3i}3E?MGFP~1`tIm$`DZy zf;QMFqAAOX7}p{J3liDZ*Bi!~eg2nUyIaV8M}VMx24A<=)CU71nx$ff&$0d5gck^fYCmPe?955-i`@^>F9HX-I-nY(>jH3^5ugKFI#75MV0Hu{{z14{*TF&px8hK{lZEht zaTt!lh!6}e1|=cdid9JT4|s*##X=HzIK0f$0jXUmk{pT~d%IY0I)HC(MKZ&1K^CS1 zj^9L)-0c{(!Z1{ZTNGLOKmKV8fdBvi diff --git a/test/pptx/footer/fixed-date/output.pptx b/test/pptx/footer/fixed-date/output.pptx index 089de7a3a8205c2c646c1e5f2606943703f8e365..02a516997648a3a2a78c4e5f5875c75a03abd58b 100644 GIT binary patch delta 2446 zcmZ9Mc_5TqAIG2PVH(C*QpT8KtdVVoCPlJc-9q-|8cUYaBD&K{b(I@QQc`jX>Ef2e zt4qtwScV~F(3_BKk&2}IwlDOGuKUax_bokteSY8b`)@?md-hnz#{Qhghn@!F0+wvAcfpmh@RPv zfF>r%Q^|G&{4Xrkqxiuo2iuMLk*dKe)wSE-pB=XGcHgO_;iXmlucD{9mA&MI$aK?^ zC;r!iz69UliDt_3bI2dAq?|7I>JzF5ZHluh@^wpA$XIq_Fti)IAXwSv?;Go{HqYz0 zWVWooFUK$>m%1|}r(=@2JwsRY`>28JDdLw9HP&+@x#`(-+c&Ml!{pyqEzgqPXmEGK zK<959C3TUGo=d#vIPLNgu2FWqS;B3~L9_Oil;acj?*4Dui^i!_T8^?G!KK;6v*tNt zi|)K5@)=jFct`JAHMQTbo@v>z`DpAA%j?ikiq&ee&m)H~td<~OPLN#NtVO><+Jfc( zaYiP99(u&{^HoIu#Rta%_s5Z&IyAygDjv4%KgNEj;nUWXX?j21(Pf%eWY6?I2})Ei zrX6HhyLWF|s#AZ|YjJu<_d84H&yOtf48Clf7>VDX&s`g1_2TuLx_UwV^!0aFIxADw zsvkZdNQ_loxczlNu`N2^;apVeDyAUzx*q4iNILHIk3_N8!A%~4J3z>mj1f%xW&!XzZG_-ao3OF2-Yfnb$U8FAXs5+NOgsc3^piVzC-(kui} z@Kluu7Ui9VP?)VCf#quQz@2&-X71m&H5Lxg)r4>%@K|kB0xh)9lBJuM9FQzn=%|58 zqz&{ZL?Un6k)umOU`GDrL$d(&ZS|K&h=d9g3ip|A?005 zYu9XUAjsMri+-?Zm+E$Uk{sJ7ADBl3^W)DJLqXE*3IwKclNlD2(*K1SXfoV}+f zQ8Xnt!#_AkUhi5od1!}1YHt$I{6Q|Z+ZnABeQ==fCK^-M_c5it2Oj+wb<5k`*i8%Z z9S7;gsk&~CqN(Di-2HLUeyLe;QyHeuA_9C|*_ox9Qy=!#xBJenD;eqDHKs0dV!FkD zF?vq_&MJDwvU5jiZlW+pj;8nK3_vprpVJb}QxD0{dp>~*&q8u(?mQay8Uu<_szx3z zC~mi}kL_0jB8Up|?RNo`@pS3p8NV9w`HNOhk|i zwg{p%uVf`1_|bKYzrUU0+mZGRyoXP62x2_1fTj=D=$nc+B3a0@nuY=pRjmzs6aQ@5 zc%3`m-@P1U4uJST$^v08ZApVKY`>xW*3s2VB^h4I-CN%btOCICl0 z5K+GZYY2pD9j>+nK_mx@r(Fs{8x^qjV3-(llZD;i1o1A8gCP)?H?XjgP>9Jm{uu`G z5sq)eab)~|mQS1E$l5I=P|#?I{j~*#ZyQ+{VJk3e(EyH3OzhYWh-Yx@iGuhP#~m>c zS+|(jwW+L delta 2466 zcmZ9MdpuO>AIHx*SmRbxjLX;zv6&q+O zwpo=)A;Xx-jB)!}sZjm2UYqj!r9xZT)=RYg&YYS3wRQgZp7-rlvAO1#aTx+Z7j+aHD$S*n*KecztcZvIT# z0|%p`z1{tVp>DfyIuv14h`=xU`wa!~s*H-{lVG$+E?`N8Gnx5c%=+r{hJ=QxAb7f~ zcd}|OkNaQHcGwct<@f_8s8` zkk)gJf9iZ(mxc>X$-8Msy=&KT$gDRuthl%ns>X%4?ucpsu_K9db~2Gw#CE-m156!T zBmcVsa{q?b)SD@dj4E7N&vfC?sc?Q^a*`2qO%;A^!mLPg#yKI4-!REZSkk{q{t8kM z%=TG)JHs;H`EYb>a6G)oZB6$(pFz8|l)N~{mqybU^47oOQf)TQ+|QoKirW8g!dc_f z?T@SNkTtp~87+#*OUTd91w048fdQt&TA zt!y(d{-;9J<32(>8>+ar_W+O|Fx_{r%G1BrmGE(i7gI}_beSNU&II7`yKb{4Own6C+2iG)!pB0ob$fY zbC_9cE_#8XA)^cYG(JYfZRN*qyTBQq~hWmD^E z0jnf$(j#pZk!{&(t(r_xC77pKM+3tYD^8~a-iPzWYmW>ILRh%NvGDrhu%lr@anm$R zef)i@=wL^K;YRXuH~vJylYNVIr+x3P>KK9hNb2%4)R;#xT- zf*hxsW8b{=+r`=DhSTi5{T;Hxo!*GVjzWR+?FQbjOTwJ0sAE38=`|%WfpPcQky{Ls zt2$({Q=*&cBVoHqx+{rdm)3GmHK)n>DriSR5)Y_?Gi zPc#z|ffkTznE+X{zDm1|YDqY70B2$s><^>2?}z&sSD$OhLlq}o)qRZig8Fd*^y@Yx zWs@9av!iZkK+vk?pT@ig8S0qG!JEBQbe)*bK8<+^ny;&K8@o_zq;dR@8l zkQo-r7a6OnaaBY_+K8yO61)(pEA$ttiOj*ExfO70RcrpOM1*Mp0xYP2*rIQ#tc3hu z6&nTG5LE36K~{ek3VXYfKnTg2`e}K8?%(ZY4@1zL9t2T8nn1EeCl~@hTXW#vrvBol zHX>3^1`T8aIMAk#{RMWixNXL852$OiRQL)a83O5pS}`4qaoKMelZ3|D zpxvcj_c%p7DMwmJwTUJkjXe~ zSSV*8FXAyAMe)sc3>^~mfM+KKSxmr&C7ldJBN0Q7L_IVeJkU}QVO?OU2!c<7bksfo zGSsF4d{+>>0OC;l7F_3c>NFM<(2`fBnuGT zV~?yY$FLs7rIi>ipt$cmhOAzDWUdy&GbmCoV)zurZS^RUfJ+}8=7F7k)}JjlDVP5r D`-jv* diff --git a/test/pptx/footer/higher-slide-number/output.pptx b/test/pptx/footer/higher-slide-number/output.pptx index 36bb4683368d463eb1acabd86d3fc7726ffe8db6..4794808ff156a4ecaea5056a81fd6c6fd65c6436 100644 GIT binary patch delta 2644 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 LE!306@|^z%K3GWz delta 2783 zcmZXVdpy)xAIE?58{^Kn4}-^;p<1S4pJ;Wp+1zTg>S48#>tcmyl_HugPbso42U}$G zzCcmC#>wBwc;WGZ;~Tkx zl<&`PZL_#G)o1(m!PtH2MI*cC`;VfRZfx9q=j*4Yw^*4A(wR<9hv?TAUF;pS2CMik z8>n#yXp=8uQ%=tpEKD{{6d*;xVT_@F=cxY^X-(w)1!Nye zFmJsjv&!C6bM}=7++*(m@WVXP3y$(7ggc@QFv>nC$f4W#75V@*|grD5;-sBxIj<(bMX!rS)KhEdGvH4 z%zml_f~X@1!W$>Gk|f0Uf_IlZM_7D{Hd#^329jiMzeW+{x{Ua)fcjPnZ(e#9#l{qJ zUYTSZqJrKoE&IFBEe_AunQdzwITaS9n z6e$Fu>_iZK;OVKx%Q;vqg{gV}@Z3$vGrhD?EP%>KY)w$-W5o5|S0HRopY)I**L2wd_Mb4+Z_sG-hS^h1_t zF1q_0Nwap3?y`ZA59LQngLiuwCgp#dlGCi1p~1{A5~lw)6s{S#b)Bt^q|&I>rl`Ng zAFn=SG0iEsl9Ktyy`f8#w7kZ50SSBGZizS(K+E+q^ojUx#4u3nv*F&)xL2a|6067R zW%s>rGG3$(TZd-6n>}V$zxpx(sxKcu&K6%q;y54q_23ENl?V6|Oe-*%uu6k|k-%rz zAIl}<*5vVB1lt^;M!}iGnKuO66{CaefY*h2e9%4CO$E2=u5OpdEbwRkCh)9R7HrFJ z_yiU)Bc)&gZ*LK8A<-5QZ86c75N#>mR+gc}J|rtDh*)a)@Fm4+MYj4KVM*4Wmc!~{ z#k-o=V$KlD))pJAH{z2=!S5|BJW{z2>8@ZZl$AS8Bo&7!dxy_ z9bUhm93lu)9+2c|Y{$JMSg^~_ef&b3>>N~yskq>mzX=7>D8dtFT=K6E+Jq@Pil<(ovx*#?;yf#%ZIYm1>YNK~NhJcNAph>L5{FA5^!=V~a!~ z@iF({BBd}IBiJr~dYa%PjSZ^%iOKrybd;q9cC<6GiL0KB{Y^Zo>0gE3+==T@*Q-N0Ics|E^JbdZFe&;P|UKj3D z9h@n3)6wWNOWHl%gw_M{(3mBD^%F0JJm~@mxqxK}i#YO8Q!#+44Axy6aY8Hzie&-Y z9wXEv0qjiB0GE1}bkw{8GW;G?4Gj diff --git a/test/pptx/layouts/moved.pptx b/test/pptx/layouts/moved.pptx index 5ae045727c7e762e5ed657f96b5770b277470ba4..86798cb5027f63abc38a01d7aff581b9504aecb2 100644 GIT binary patch delta 2481 zcmZ8i3sh5A7Jaz{48QPAfE2^GSW<!Sbzz%J*LuH@$k1b8@$|_EGqen3$M#Pop{x>4lXB zIC<%}`vMYeTX6RJf)U~T6z4=)y6h8L=HA*Zr(6a4adCT(=Q?m@T|0^k>t)p4!uVdE z9j|0Gr$}lP?YqXy)&o!{mFLq^*K`mnQ!lU(#`Yu$1 zxBe!7%6#MZCbRc6ZN|SR^y9u&cW%2(Hh6MwM95!1>mvV+Gc{OP|LMN&H?glmytgQ0 z5-j=8!}1b!PKv&*w=Qg2>l`+HxAgeid?%;iWt&r&XO>C)^#@fuZmzu8lJ|z&ay>Qg zN#)?$UE`a4^ad@rh$KI;Q^0Ww*Y)WxlP?y!){d>3Z3L0H}V3naTew*xT zf69i=I6HD?ySKqdBF6KE=z&|!p4?8)qd)vovnjOy{5olJxj~;d?}KC36Vr-T1(TadQW&q7;kBRD1 zS{%Sp(JpIE@gSSCe<6aeL-Z*G8jeiXL}Q{j0H46`iew5bI><_A#&(4HhEzv+mG}j8 zlx}Qh);b<*WHJ=9m#}L-Lm@kdFZSCsOvYcI9k4nY*vTnwOv=kJ3uaZtHpY1D`lhkG z;?#lqw3O-2gV?zh>O@7G<^BcS=$l9rs7wt_~Mwl|=9w9%X)?QIM+g;o6IB zH+WKlJZzeLT^|*vi#~mo16)6tkkmy=ynR}xZu5qw43I*HnN}@j4{9u7R2~5I{whww*)oEexY&rU2KVr zj!-#jgm=)S^oz4=&|}?49kg3y%!hSjZn) zej7Uca$NHO*+?r0f$|V1`0Il98`6p*;k!sTxN)4AL;S$${malCSm+yJu_(VS2RFBlZ34Gicaz^jlow27ET* z=&3GY!t1a61I1sU5{8RPM16)~5lPYULU%Xy|I*};J;@-6p#LPXDTi#>AuG{TPb^#7 zQa_kI=|;5c0UA;TdnWA(s+wc~A3nUs$Gd_rVOr0_a)?%izZ}CH7EQ-10U0ge>8X!^ zl?Vz%bl5$`BAGz)^v7W681$aD!xKom-W!=l3B(NbuKoY3Bm=54=@2CP~w4Mo)Hk(S;d zxdYe73lvHo>*mjqSfKgIf+XHfLKf$C4L22ECZTw8r#3EA$6H=%IR_wKFV*rBYJRF; c%iGla$e@-x=#bn=I%1v<$w@D2SiKki3)M;Aga7~l delta 2394 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 Kn|wb}js63Iw!)(T delta 2663 zcmZuy2~<{oeh36_05Z04WyCVzb&UeJXg$VN%0O6{GROnUM??gFIwH* zb-XYpbFqIO@qJ~_j(Z_jU*vR38Sel+J728ls~;_wFHd^1#gOV zG=4+dzobp>>sVx}O^-bBJs*sWvsrN-yt*Pu=4Y-|^8ND+YBwG83I1;rQ}dybs3O*u zMjk6B7;QQ#TuDvctu`PyZp-Ax)$a?;*U3kpBmLEC88z0oEqIn*U!AgV@VQSluhx@=J{6kCAOE&kO z&lYCRU%&g&zz^p~nX4jX?E(D3suW6(XzAIEz={R>lcQH{Wc~L(Tw*^xIe6i>#KwMy zoAeC%#}coB^3QYX3*x_P%9$7@7`5czt}h66J=1rQ)|c+`)9D30I|t-WrEIdtH{NLo#h>r+rin#z2q)`lvs`V&=tcx5?#7w@FPngO7GhGb~ zZKbZp0%fJTy#$IvLb}jc2b|QSWj3y>V^Y82Sq*bU&r5feKj!R8^Q4?l* z5x(#Eh;tkWI`4Gwfkp+nape&TxOL_IsXH4#XeWmaj;b@4G#Hngi!qz5$5v{53m%e229&VIbq%p}Z*D=PfUYwgz7Bp)Z^ zW>)4Nk27bU?)~xFa&s{Qso0{42FGWysb6df&n*EFdS;TJ@;Tm=!!_-P^Wsz80*YGR zNHnsW(iU#cwJ+V!#F)3-|Lub)w^M;*Cp$e@Hn)7&_(p6>U4we}?_3vil{d*Ynv7X_ z+AQtD$8KlT#JYBZF=(W^Az(=V3fAEB2J`U-R~hP(FkAD&sivdGwfMeun2cf0Hq$1u z5`i+tL(G(A`6I4jyU0o%vu#?o9z&qi(GeWtk->Av+gMzw<0LM?n!o{j3app{PE){n z3b;%G*D2sO1>7+pE8|qCVd=MezroQ4t_i-Z1V4Y$e8mL$6g8BzsUe7~F$m{c$X>7Q z$GPo6UO1wKoWRlbf1e}iDx$Wp*Q%-}A&9jWf>;1%3|)4J*MLh$MBT&@BW4>On6rH| zQCkr>eHVfu{t9ftO9d#w1o#Lnu}{7LCB7vAO*IRUFVw}Jr$V(Al_jSp-81Th_;Xu4(rlY;pD)OZNjJkv2aI% zeUwlft+@UJ{0Wda^A~}pTIKG8VUOXfnxYR3@37z~Qs@NsNC%+56-LfeNpaQyL3rZm z_yl`9#qV5k5GXUA298fK+6Mwc!~I(FNloI`&Buql8Dm zRqUqRfVB3yasZppH$@P0l}egTL7yoDREn_;kWc0wDu#rg;j6l=LeL|&P?j^HRa%n) z%dvywq}n+NuuPyUInU(ALw~`9Cs0MxW_zE1SebO{_z)!?|hm%lZA#2*#${-0j?k(h7w&5$D3z&PoXV{>d&-bd9&m`E0bZJ}k~s0Mb9fIF zTMfl5REWV*O5#PFcvt8dy98Dyqt4BW#y}#&X6{+F>U6lPxZ8wq+F{JBXE(4*XQ+4Z H6{i0KbHmhr diff --git a/test/pptx/speaker-notes-after-metadata/templated.pptx b/test/pptx/speaker-notes-after-metadata/templated.pptx index 17f65fd30fcc92f6186f882d9c5ab4cb16eb9d47..d54d5b1ff03d4d4ad5c3028d04f9ea9dd02750d7 100644 GIT binary patch delta 2133 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