From 481e14469c2377bb5c4beb9b081dd9160f58f8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Mon, 18 Dec 2023 20:51:10 +0000 Subject: [PATCH] fix(docx): fix validation error on w:annotationRef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit annotationRef is not valid for `w:rPr`, only for `w:r` according to wml.xsd. See https://github.com/jgm/pandoc/issues/9269 Signed-off-by: Edwin Török --- src/Text/Pandoc/Writers/Docx.hs | 2 +- test/docx/golden/comments.docx | Bin 10140 -> 10135 bytes .../track_changes_scrubbed_metadata.docx | Bin 9914 -> 9911 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index 264926f292b5..b8f8cf58a27b 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -885,8 +885,8 @@ writeOpenXML opts (Pandoc meta blocks) = do , mknode "w:r" [] [ mknode "w:rPr" [] [ mknode "w:rStyle" [("w:val", "CommentReference")] () - , mknode "w:annotationRef" [] () ] + , mknode "w:annotationRef" [] () ] ] ++ annotation ] diff --git a/test/docx/golden/comments.docx b/test/docx/golden/comments.docx index 202cbe2e40dd09dbbd1013698f70f975c44ba050..341a5dba046404efcffc99d7d39c73207b66c221 100644 GIT binary patch delta 1110 zcmbQ^Ki!`vz?+#xgn@~JgW>w>jXawenXa$ie1MS;OkZG9Vgm8Mu-Jh3la1Jxfw;HW zs=?CX9A7y=d_O@KM$YT2CxyR{<(+$W@@ygd`nPZQ>zDc53f-MMDY}Yr&CKtul@fby z?)7M7+t8OC`mkndBFn0ay5a3y^(*aF-has3E$O*}hWWFblJ|tStXS|o z9f3!*min^}uC4O@x37G7Wazbh z_LnK;GSj}!H}SvF$lK4bsK9fXSEjwW&xwwOlNZk~5KPYy=F8Es*uebYt-H#C&mD`F zzPq~QQ{e1#s!Pk-u%;~p6R8A#vFe2t}WtfkM$B!1vlAA zdq3Q1;l0najpzQGo!`zg*ze|^xL)5OPR%ut{od=}(oXxXpUC8#*ZTkZ(!UkuymLOe zJya0j`{(-N`K{b~2IM3#DLnnyk~foQi)gbbtXN|*`ILxaedHV8>3tn@UxFnNy+-l*CRZPTo;=ki#eS zMu7ekznq4!)JlKe1p!Q~woJwLf+smwK56-Kf1xykSI~*3ibNr``=yT`L9ixfAReE=i3vn#N6&U4fY+EI<-n;Jm zhfOOa6#)f=|s~>09xrA;Fm9=a$0Au=%BEJ2?3liEjrbcWntTHV|Dd zR|3i%liwVpmQA{efAj(n214MPJc!H>FDs~`BOw}4h1*_U2 z<(^rpX7ZrC1d0Y3Mg|6VCI$vU24v7O`Ms(FNTZ;d4CDF9dTR0@jz5r-I5|g63B;KI z)s?|&s_%GM Z%?3JYA14EY5Q>^rlMB^V*-Di`f&kYr*);$F delta 1046 zcmbR4KgXXZz?+#xgn@~JgJH_7jXawenWoIze1MS;OkZG9Vgm8Mu-Jh3la1Jxfw;HW zs=?CX9A7y=d_O@KM$Rd-CWRZ8`N?0JJX^@V{_)%W`ei=1R^82e6kR2`A?=>{GsZnP z_j)w;CCFZ1b?B$oVUCc+(d+m`{{_{1+gup0x!#@|YLyO}Co!Xn6qd3(wsX z(nESyPODl`F!5>Xq`T@je_QE$?o*5WR%&D%{3B=i!<+Tu0`(^DT3UZ9qL#IZ_XqB} zyX5(<;2F>BFWWe>o7phUXi2R0%CwK2GGXRkwOXmO#~!%H9Fe@$!Yj?q_eSu;H)Wv< zl`a?We9sE`xx#n3*d^ns_KZ*eTQ6w$V7vIy)FNfYQg(0N;_I8Vrft}@TQSV^F<&NY zM__x3zKwa}!RrlYAI|P|IlU+KKhK8ULO*|TJxL7`DSfba-+sj>)xC43J&62KA6qT| ze%b-ed=WmThYxg}?4RfTW=2j2lfvz|VwX&wCZf%v6tYHT@=+1R`nWf~)Biej+`8Ge zVUdbt#LFq$X1DEGKkernom){=da(`HAK0*55!iesO?mo0#b}rFn!QEbZby_XbA+zz zNi?qHk$%;Br<3=>DxLQ$8AZGnEO1YFr>*OdAu%F0xUhxnWdEuEF|rRh|VkliyoZTZc|mtUQ)a`Gvw65OK+zz>$iU#v#K0iPfDAe(zfx5IY2;CpVZ1U~Q%xSk@d9$vCa0?@ xfjHejj{M{mYAPVkIUpx{@@qA)9$s}B#)p%&)RjRp{y@(9$vNt(Y*or28vr)}ymw>jXawenXa$ie1MS;OkZF+1*Ye)*nsHCw^)~fq?_2P z!NUL9zjA>1-vnG3>#wh#6uwDr{zX?t28I%51_nU}28Qzdq7?n){M_8sypm$Qirk#J zlTK$HHV|;FKYG<};$G_@(Vc4f^v&ZRo2rs_C*4lJl*QXtBlP81dTsr=ET!p%?^1cA zerzpGa9Y1<1#7Fn&BuF5FE4m~uzOH)`2FQC6SEic%r^Wb)w5Ph^kptu=**{pr5G!e%}u^0lMtm57)yM=eJ&Sft)fft8%*owY1D=&Bv8(^pzel>H^MQ$x`&mS{>uc^7x z@4s3#bM>ZG#bHl#wyly_?_Kx(L#fTPRsWexUV2{tC4a;?!Kdc0^sRW*pkPe#b4y`l z*vu~44o1-vnG3>!-|`6z;1!{i6pX149Wj1A`y~14DU!QHp+Yer|4RUP-ZDMQ+aA zN%`J~4Frzu_d5GqcW#qMr1g=9*%v$4J6FXrpOx3UURGCqd5a{MR&xHkb$4v{f7zL` z+xn%RG{fFa%Ti{So-;DIbnTRk_qV!=INJ@eTV=U3x3W3gaeqE0o?L%2N-4bHT`G6f zkFBK%PU|9nDP)bx zJ@}r~h^6xOKB_!y*;Qh?i5g&2HPXe%jADI=7;#^kN&XKd@oBBCz>Nn)390 ziqS6THG7M=-Hs?(<_KNalW1JYBmJuNPABh$RXXoiGKzRDSm2)UPF=}Taq652|Ex=x z9Xz>YB{oQCYD?^`5Nzr+mu7p~e>uaZVn?QJ_vC8%uPOC!e(!sc-fa3b{mbX4KXWBa zubVB}AmkCPeKIhaJ=a(N^p;7CEV~Ty{9SjQm6fRy5Ait_S~@G^OVgT@x+)@}B zHnWJfgVSuU*mh7Fbrbhu1JRRYOPGN4WDbQhAnrAV(_mGLmFz*HPn66-l&rEXh>B76 z08z`7Jwen*WjhdMsA3JG@>J|N;Yoh-RuwaO5YLV)c8Lry1GqCmG5|0SK*93KT&fBn zjXJ6_jGrcZs>*{nSwK$9|hTstSnn4#?@8%&i92qpK#v_