From 3fca434737f0eee706c02fba6a2a2629338a1065 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Tue, 26 Feb 2013 22:01:47 -0800
Subject: [PATCH] Changed style names in reference docx.
FootnoteReference -> FootnoteRef.
Hyperlink -> Link.
Why? Because the old names got changed by Word when the
reference.docx was edited. I don't understand why, but this
fixes things.
Closes #414.
---
data/reference.docx | Bin 9763 -> 9757 bytes
src/Text/Pandoc/Writers/Docx.hs | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/reference.docx b/data/reference.docx
index 9caa9c21aa55b5c48144ed61922c913a9b2c55b8..b1d0ab15dc3c22d7fa08a2f7ba903c72ee57bb42 100644
GIT binary patch
delta 1370
zcmV-g1*Q6<Or1=yn-hQOty)6ngQke51ONcFA^-pn02}~!Z*pWWb98xZWpgfgZERIk
z2>=7;oh?!3oh?yycnbgl1oZ&`00a~O008Y-UvuI%5P#=Wc>JCN6OvLU<c5%Dl9}|H
zE2MoEvW#`HC0CL|=%?>Ww!t>G;RwxLGQ6SP)&BkMN){KNU&4RDdL}|r&W5)0sbgD&
zVeV2kAKJ0<PWrYb6=E(5I3q)QNu>SxvURZ-NVN=zv|vAz12MFHrJ_N*EwN8RBtP+p
zFyMJygh;_s%-h`aC??k&$01>=-R*SF+kym0fo<v2NZPGL+hP}O3ohJ9a7?5GXTu=T
z7b42+%a&z<hc17|*Th3{proc4ns^W?Eg@yZY?Z8UI8)ME43NZ>PQe9;Jfw_^+Yyu0
zUdb*71W7fL6m1Ft)7L*5w_~Yt>?`WRzIMSE`7ek)qhM%vdz-wmtmg)Z%`+}xCyx_5
z=WmWQ1FJ(DiId4Fr{bcW%S*Z_WDYDuRmqG>$&?Yo)Ode_JVgK~P^XfeC~v2zR8vZI
zG@&U#&?G@12oUd{<0s-y6flN%$4-ckcMpPcLDf>zT2?}xkdWR|*Ci|`$$aXPzkR|U
zC2`mEuQvv9tL>P_3|8G=&eIUGMgX2#MqoQa0?h@A{8WQ>8yZWmjNlz;|Du%!_9~AI
zg(Ry~%FBNe1l)fTA5wemRL^$fD|1t-0#a=)Vdad?5XAontM`VH7qz3WWjMg<iIC`v
z*3d2y?<s>)=BaDk%n0;7MAz$^vScvo6=1X&e8ZVv7{Ecq+OGn{3hiFo?C4vmTQ^%>
zi~N?-HoCoH|GL*Tv()Q4^~Ke=m=4SXF0uemduM;6{zw}&D#w}!EsS;G&f213PJHBo
z(W|qfwe?&%Juh?CQzggC4TOC_IEt0eg{+2Q#{3aD+XXiJ1bhvns5)B1`ADJO5~ME-
zPIb5`*K!UxXJVR7_Dts2A2fzaLx{&J03G+wLFQQJIEQ|wIh3NY+l<xj+hH{>Ts__j
z#O8kzwmXQO4-DeoP2ah?t^;u$Si22i?H(Acr_EqJJ%aTJ)+Vra`}JVW@eTvlUNcyG
zN3b5j+6dNO16X?p2J2ZfSkI1NecxcE#nn3n>s7$<)7O~SeNY;{l?eR&fZar)Q$V59
zd4HcwC1B+M(rExl=lcPIeLx5{-|mIy#g>0nczZ|~4;h+to@(AA5=m<%Y8lyF@#N~c
zbW8D@9am_kUm9!QM5mg+{bAIaCVKYpuLhiI78F1Q>pSLx)kXRYocQm)pkgIKZcKvU
zcT{}tRy^9W*N6qgQ;D3@={HKwxKcdaMW>*1f4fp$rn2uT?G=w*#G{PrKXRr-gtdQA
zOJyu0wC|)^>#=KR%wC7$#wpl5eP#!m?zwoj<ZaiK?RCa*cR7WO)toTEwG8`vss^`*
zr@RKOU<?DSzHS@EaJrS{*z0c)JvqiGs?W5MuriUiiZnX~3uj<;*cB+G2SVXph~~}N
zF%lm>JB0%l#}a0*`JZv~kS#>g+%<nzIoeXnD$naJ3EZjIcaP>TB4$X@us)hhVp}kE
z6>hq_4ec>!k_Skxu48#p&E0B`cedRVa>Kb|aHIZ{c-8sH1S~D_+H^b<p+*6nueQlJ
zB0^$8BlUkq3FqNcb$EvJ+OYQc!m18(^;2H9{sT};0|W{H00000PN5}2005Ic0}7M-
z1_`sO7!(W*>8)Bq=7Xk)rvv~1wUf&vDFo)7Em4#2AsdqpArKD>02lxO0000001yD}
cL4lJpB~SszlY=E%0XLK0B|ioRAOHXW0J)`vDF6Tf
delta 1348
zcmV-K1-ts4OruP&n-hO0mnK3ejXm_O1ONcbA^-pn02}~!Z*pWWb98xZWpgfgZERIk
z2>=6%IqFc3IqFb#cnbgl1oZ&`00a~O008Y--E-nL5P#>d@c2CkCM2ay$PFRQBs1wX
zS4jITWEtxsORgk`(7(Pbe}HXl!x5UhWOzfntNr}#N){KNUjlz-Jrk*@;6vN_)UhqX
zv2ZD$5A8^MCw<#e8gUmf!O75G5@mnBY+Wn{N-r5v7VPJ0AcwZEbvS6Z74}Jh)F%-V
z4m?lD0BKmtd0TiM#pGJxC?H(7yPeK?TM~ve*j7FbmEB6TEq2ki5Yi2$z(gr<HeiXq
z08wsVwk!)gbOnFDCLW5IR)!MO<bzCU2`M9Ht7Ls6xK`F;fE1>53NAq80p&v8j<}-s
zN_H_INa>NHXj2H7zWLF(9V?w<Ur`tKwF|zee?jaSv7z1VZSuydp34xQXI#Qh9w&Cr
z-yCTMR);o{CzDZ5#YH=pmvm9c99Rgek{OngsX~Nl><NGJGy$MMol17Xyq%&_Ln+lU
z4ow4sCJ6#TfOz);KM{ALfibi@c0zo-dyrH}s+We=vJ&cq1oW1=F5x*z?o*fi?Gyf}
zh`XkLy@?UG+KxrUVb%TRJPjdh1mNjq2)08c(Oja?Pc;~~p|Q*=7Q6%PUyM>_uky%I
zK(b1uyexk~!2KujA+^^|^=vo3GB>4~k!ouRD`#wmApSpiy*He^=pB76!vR)LgoIy=
zhIWZ~PdSt_PhI0?MxgH@x?VpnO9rD}0Y;0#H=Ox}0USiG{VG7L(C)R(j=q(;b+grt
z$ZsiaquVR?uY27vOTBJVUtEog>A->snFV;-I~#xXN5*KZa%_0e!q^1vtS!dOiH}?`
zdUaN`ww^1e=Vi`%s^oaNfv^t<N0Ii0RMjxdm_Gt%yTE3jfUjW`RYx0hK2oT+1epti
zQyp%~wVVUanTTeSJ(KzM2aTc95E7AQpyU3TWsY@@bLeN9Ln#`&%~<We9af{l)#I%|
z9AAIJb_cQZfkE86={r}~bs(+-YqtTc-2;R5v>B|YN3b5j+62~azaFeP-eJJnYX)oY
z2-YK58^PLZ0Bi5SU_EOF>)8>k?;EVNxO%5xy<!4CeT_uj2W8B+5`mu|u$w4!3Mh0s
z@9&eT1gsoDIt>8nd_O?24+z2Ww|n7vv1NZ1-X0RhLxv`kr<%8jMABM`TCr@dcxv@r
zx~2Hdj%zeCFO9WtqEo}){xE7y6FqzQR|8HxV+Byb`i{F`b&);;C;q!Hs8~sm8xzKU
zN5$uEEy68(V=+cNoya+zexu|}Xf1+WbV@q+w<|SeD*K+&Uh&vPJj$v0BWFrvPz!&x
zRK|*h_MKE~J$CJk+3Qf;I0c)h&+I_cJr~cGyzQE@z0MfnE~k*OniB@NR?PmMs=@8y
zDX+mO7{dUouiHj3oNi?~_WB#dOpY-M>oXloSeeLMMVg(0g)^`^><Sdp1EKIPK=bD8
z#1bDqJB0%lM+#<d{6FL7AzO%~xodx{a<rwCRi4*d61Y>Z?;g!xM9z?=L47ot#I|7S
zD%^B;8`@*Rm0(D%u48#p&E0B`cedRVawCN1aHIZ{ctjG8Ywq5en6;LBZEBv0)FVdc
zt8FR@iBwq9Q2(D1--5g}P^<YUUa?;r;2z&y)#0vws>{}YP)h>@3IG5A006U#7%dD9
zCzmEdD2+Yztpor7%ag?<DFli+>QIwVAS;t!A`StElPo1r0nC$qC0YSJlh`Fc1`Hqo
G0001f*>e~G
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index c3148aae4..39b5a716d 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -655,7 +655,7 @@ inlineToOpenXML opts (Note bs) = do
notes <- gets stFootnotes
notenum <- getUniqueId
let notemarker = mknode "w:r" []
- [ mknode "w:rPr" [] (rStyle "FootnoteReference")
+ [ mknode "w:rPr" [] (rStyle "FootnoteRef")
, mknode "w:footnoteRef" [] () ]
let notemarkerXml = RawInline "openxml" $ ppElement notemarker
let insertNoteRef (Plain ils : xs) = Plain (notemarkerXml : ils) : xs
@@ -672,15 +672,15 @@ inlineToOpenXML opts (Note bs) = do
let newnote = mknode "w:footnote" [("w:id", notenum)] $ contents
modify $ \s -> s{ stFootnotes = newnote : notes }
return [ mknode "w:r" []
- [ mknode "w:rPr" [] (rStyle "FootnoteReference")
+ [ mknode "w:rPr" [] (rStyle "FootnoteRef")
, mknode "w:footnoteReference" [("w:id", notenum)] () ] ]
-- internal link:
inlineToOpenXML opts (Link txt ('#':xs,_)) = do
- contents <- withTextProp (rStyle "Hyperlink") $ inlinesToOpenXML opts txt
+ contents <- withTextProp (rStyle "Link") $ inlinesToOpenXML opts txt
return [ mknode "w:hyperlink" [("w:anchor",xs)] contents ]
-- external link:
inlineToOpenXML opts (Link txt (src,_)) = do
- contents <- withTextProp (rStyle "Hyperlink") $ inlinesToOpenXML opts txt
+ contents <- withTextProp (rStyle "Link") $ inlinesToOpenXML opts txt
extlinks <- gets stExternalLinks
id' <- case M.lookup src extlinks of
Just i -> return i