From ba59e5447ffe8d15dd7fee69a7aa03706ce3c49b Mon Sep 17 00:00:00 2001
From: Jesse Rosenthal <jrosenthal@jhu.edu>
Date: Thu, 12 Feb 2015 08:52:40 -0500
Subject: [PATCH] Docx writer: Add footnotes id -1 and 0.

Word uses, by default, footnotes with id -1 and 0 for separators. If a
user modifies reference.docx, they will end up with a settings.xml file
that references these footnotes, but no such footnotes in the
document. This will produce a corruption error. Here we add these to the
document and settings.xml file, so future modifications won't break the file.
---
 data/reference.docx             | Bin 8393 -> 8474 bytes
 src/Text/Pandoc/Writers/Docx.hs |  18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/data/reference.docx b/data/reference.docx
index 39f4fc19e958739789adc14f3afeebe42d264394..c2e5075b11253700e3bcdf65e739f7dfd4c3f00b 100644
GIT binary patch
delta 970
zcmX@<ILm3nQ;B*81`dXaZa!`gr#8OhU}j+O=U`wEWRPJf&o4^RFHS8f$;?YH)~m?P
z2@T<7U{>02Cj^8`E4UdLS-vqcFtCU)Ffhywi!EMcAX58&eL+Q>_K(h<ZJV=l<!{aP
z%lvNJ(w*kRG1(>Z_v`PASYB+4N}sRt{7&)C_?;Fz|0-A1XR~`5&-9ahf2%ZVLXhO<
z64TOqanp0}@7%j{){{oIWPvNXB1^0$1gEdQ<Z#)PW6|xVK-H~2KC`_9PpBk{oRVK2
zvSQ_CGc|6jxj`km#vT*Bmk1qs5V+RL{iM^SwGCHFcCE91qw(NKLPgbCqujln|G&09
zxn*^8u6L69j;*I{zc<yF6t8^bRp?pKst`P>=~_hO!Q2L&t$8N<kDQ-al`>H&>wZB|
z@zt!v=l7P1thG7e5V+>h70Kj&YgKloCW|}S%t@NTi?x{^Px8#@V4U)b$HLx+<*9?g
zE}IBVC6++Zq|#e&ENv!>OlxPD-Xk55v0r&c*Xvz>Z<$QIwB*u(%~}oo^#WWGHl?@X
zGXIK3re6GcUG&zmPt#4-cU?F;`Hth<FdojEMW4MET{v;(nCUAsFCpzo$?Lv%9pw+&
zSgynUFwsq;DeQuDo$e3bQwG0!EiX%||GxEo(Y5;zeeZ-{{k3G{JN<wQrU&0_{FbUw
zTr+jjohZ3i#?zI8Eoyq-O_aSRP{#AAKHcqXn4{~%wvN)P-H*OBxvsaime|c*e&tPg
z;^h~6o}c}DGjm`4b=mV(%YVNA)BopR(u4WW{vN#`KkuXc=l0DPAMn_}|J`l;XOH=t
zzGKUO?w)7<<7W1moX`uM99>I8Vw)dt+|j377-FBN+3oo{ZlX!sFHxnAD{04qvc(wl
zTJ?X_7f44=F5B&y?PwAIXikKcVoZHO0M9+9Nt12rm9j$JADCH|ww)F|8FwQqS4zVB
ztg`U6nEb^BvrSDk^R@@GP4?T|5mD2uE!ZVxH|dw0)2%vg>GGD<8zSa@aM|>xB6jgq
z^U?~z8R0pW&C6%3IQvjw?Jm{pwgq>U%Pj<=-h^$@3zpAXlfAJm_I%P_sn^kK;**)X
zd9!jdHYPT%{l4Q`p=tgH>qL2On~8Hy%RFkI^`FJ`8h1e3Vu5$AA?rI{&wB1NTfpd!
zhFjR_KgS#O)o%VX-Ldl*_vW9{wk*MN%%GfsEptf##TgiYd52+J<9#3pOIBlrWHq#G
YHn~tii^)i4@>~TaE*2J`ep!$~02Oq!0ssI2

delta 889
zcmbQ`bkcFdQ;B*e4i1LZGKX9)%@1RI&BVa)iJgH#kb!}rJijPKzc{s|Br`9)Sg#^C
zXKtu({v!i{z2C!KEcI1u+Bu?h18zC*cJkd_etc#_tE~GrMeq8*ehPk@vKD6e-*|sk
zx?g?X@hAWKADok$l4dk_*WBpyr3y=p(q2}*+P7afdS7*Yx$((*X5M28D`Z8MSWO5n
zUw+BqGB3xX=%zr`tv){8UV<l75=BnQZx30qa<`!x_pP@<CECUw6TO!R9eEJ8_O|*-
zr%Q7iu58&o&pb!_!I6Z@s>4RPn>+uXZF_P|?PmP0BXI@N)64g0ubb^H8s3$CN}FZo
zB#|x0&T-{&r>yi{{L{43?@GOKw@6^S+oavn#}Dd%S6o`~NrBmQBX@9l&;1>-MG8tC
zhnvk5rWu*;Qre(5v!zYKVdc4o&yTwo$Z&*BXU}$RQCQ`)#&0%ryQpVkrB1=g9gM9X
ztDC|<+N_UnKlW+5Nq*Obx7~M~YfE@IZx()bTXf;XnJo9aZZ|h7Szi0RBI1uqz3A@)
zmpJ*2odmZu-TRPzFh8K}V*a6-=PWF*>=fVnk8%0afV(dyA6vHH$<dr8zyGhM_sqwE
zUPaQCZ_dYb`8;IKESd2pacRPNg?PiPGA=Ey<rdeD?z*+tEA!Pm{$uwJNl#t5YR0ka
zFH4^Ndt-CI{zYH<-p_x^f4bMz8-6(d`CrnDdVc*U^M4+`nNiR<|NGygtabOK%iJG-
z{^Pvf_($gX`CFuU=XNYG=$ooFb$PC#QJ=-i`Q=lN9;pmb>0M~&#4_>LxrnU8N(WB<
zZQ?JV$eX!!))ujr&#L=`z13S@*9(d8=QEy+oVQ<K>pJZZv*zqN@U$ysea>D(-kzn;
zW^zieD-YaJe|pv|5!n|p2bSE;Q8K%~AlLEY;q;*Mic8jh-(aX5)7rZCAos~lmv^|m
zK6mA*YvSBPojmW77HvE3yXD=qnC~Y_{qGbyXFRNzh}FwllfBU`=6up#sn^kK;**)X
zd9!jdHYPUa@@4GJm>>P6Xt&M>mm<C5j`>;tgs*H6U%)fpsX{<1FjsK9>G_#viYYHN
z+``&^KRzL@fAe4M{lBc6jbv<DtQi<Y7;xngU^an*`x01k%;ZA~T1-EsC%;or;(Ei(
Kz;Ij!q#6L01E7uo

diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index 8d1721f4d..441392918 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -114,7 +114,7 @@ defaultWriterState :: WriterState
 defaultWriterState = WriterState{
         stTextProperties = []
       , stParaProperties = []
-      , stFootnotes      = []
+      , stFootnotes      = defaultFootnotes
       , stSectionIds     = []
       , stExternalLinks  = M.empty
       , stImages         = M.empty
@@ -1073,6 +1073,22 @@ inlineToOpenXML opts (Image alt (src, tit)) = do
 br :: Element
 br = mknode "w:r" [] [mknode "w:br" [("w:type","textWrapping")] () ]
 
+-- Word will insert these footnotes into the settings.xml file
+-- (whether or not they're visible in the document). If they're in the
+-- file, but not in the footnotes.xml file, it will produce
+-- problems. So we want to make sure we insert them into our document.
+defaultFootnotes :: [Element]
+defaultFootnotes = [ mknode "w:footnote"
+                     [("w:type", "separator"), ("w:id", "-1")] $
+                     [ mknode "w:p" [] $
+                       [mknode "w:r" [] $
+                        [ mknode "w:separator" [] ()]]]
+                   , mknode "w:footnote"
+                     [("w:type", "continuationSeparator"), ("w:id", "0")] $
+                     [ mknode "w:p" [] $
+                       [ mknode "w:r" [] $
+                         [ mknode "w:continuationSeparator" [] ()]]]]
+                    
 parseXml :: Archive -> Archive -> String -> IO Element
 parseXml refArchive distArchive relpath =
   case ((findEntryByPath relpath refArchive `mplus`