From 33a051d00d01974f3cdc3942e647bdd85979e96c Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Tue, 29 Jul 2014 20:39:59 -0700
Subject: [PATCH] Docx writer:  Print subtitle from metadata if present.

Use Subtitle style.

See #1451.
---
 README                          |   6 +++---
 data/reference.docx             | Bin 8553 -> 8592 bytes
 src/Text/Pandoc/Writers/Docx.hs |  12 +++++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README b/README
index 40d638f92900..2dfd5bb3d9ec 100644
--- a/README
+++ b/README
@@ -541,9 +541,9 @@ Options affecting specific writers
     for a file `reference.docx` in the user data directory (see
     `--data-dir`). If this is not found either, sensible defaults will be
     used. The following styles are used by pandoc: [paragraph]
-    Normal, Compact, Title, Authors, Date, Abstract, Heading 1, Heading 2,
-    Heading 3, Heading 4, Heading 5, Block Quote, Definition Term, Definition,
-    Body Text, Table Caption, Image Caption; [character] Default
+    Normal, Compact, Title, Subtitle, Authors, Date, Abstract, Heading 1,
+    Heading 2, Heading 3, Heading 4, Heading 5, Block Quote, Definition Term,
+    Definition, Body Text, Table Caption, Image Caption; [character] Default
     Paragraph Font, Body Text Char, Verbatim Char, Footnote Ref,
     Link.
 
diff --git a/data/reference.docx b/data/reference.docx
index d61eadf99045b32e7c9bcd30999c3fcfa6be5c84..08059eb3c8cf27f54c27f5eabfe24b6d601c20bf 100644
GIT binary patch
delta 1715
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
JjvW91004kMLy7<Z

delta 1675
zcmV;626Xw5L+L`Wqz8ZMwfaOOgOyd^1pok6FaQ7#02}~!Z*pWWb98xZWpgfgZERIk
z2>=6VlGIaZlGIamcnbgl1oZ&`00a~O008Y;U3c0z5Pi?D@bP<#F(jcmr9Fg{)0|Dy
z4@mngYym2^<dsA|_Sf&owv26LL%^G+-8==)9ZPpcS0h=<+xLI>VPM^2E(oK2yZzd+
zElfS;6FTqPH<Qt;p8fva(c8N-As+%PEO4jdjQ8z@l+jtMCA<X=k$BA_OaYrQ9wG^k
zeBNTS8S(H1^Hw3IvgJC?NsHqEN$5%}NF?mEwYyzfyJOssIP<U&z%2}t_CiFc{qD%J
zfT7R43p_)sKnj0liEaD~Pi=`w8}(E2JYrM|>+TE*kB|vaz<oO;l<|)PDu@jTMnVn*
zK}K+)ei#u?$ej6{_+V`n`WF9y+bs(Ew%gsrhN2n`5S?oj(^og+JkOkI3cdDi#9xgE
zxhCGWa(PG}3Ymf)B2)6BQu0KEJQ6cOGl@YMFfOHjqI`cp#YUB-G;VQd5)?B|6bBA?
zcE!9U_Qw){zU|nF@#gXiCyW#Mu(pkHNInwZ$28|h7sSUu7MR`$?62)#N3p(AgU41B
ze!Hh9DSa(^z~n;&{YHqRIY-eVeP2<AIisFp$4hAYS~VHiSq>=*u^y!q)5!t!?}S0l
zl1pzPxl?}(lL0uidokHG*YQ)UkX)VBn9=qyGU7uPLTA#<T!T5HQv|vEOq-0YbCL_K
zbJA2~6Cwj_jw^v46BWhxa{ri@7)RHtg;vRUMJPzURhyn}Vd&j%VVd2Y{q!_14<--h
zru3D|UuE$_KWmDg0zag-jrv!3b6x+Gxm5pDx{H5L!(s|N7BH@Z>U56>y@6^pZgQwF
zC~KYyww;;B3*<w0=f}l<)>SqqtBo34k{sV(a)XszFfPoZ)8MaA)h;60C*TVx%;sog
z<WCB9Fcp$lR>}<hO^Qm#$rqK5V_Z)RWh1w5ajIvO>ohf^K4PTyq-}H7Q`BlVnD!OX
zy9<Bq^X3<o`ci_~N(Ruz)oq}O?K)`xw_5Mk)OxpJWxDmsbe~R{tHO5osU+(<kCJTr
z50h+n)N7w#R7&<42((i#(9VlMUj$kfsN1Vq+j|WQv|BIG?u$TQ1iB&6ZjC^@4GZ+R
zUZBS>0{#62N{UavsX)&I<}JUjSk*^(j9Y(+!}AxZ;ncIBy!OstslT@NmBjSapUfl1
zB!v;5z#y7sp*^hFWnW<w`e|Ao^?`c}qz+ru;ZEg=e0sO=MdwIKqT;A3@w75mEB4J%
z6WQ&;mO$!hOEgu-&XtrW3g3Q{U`>*C_TX1B59Kr{%pZ8Zq(1a|mtK-2{QY}W6fl4I
z4RH{BLdClw$)YXq#%=+g$;7Yi^lCk)OiC8+(k3VK#r8(kFqOHdwgb*W@r+QSZaF8I
zhm}%GeXQ7N-?_JL$F3}=d#(8!i+p{doi<dna`9}*+pa0wYdK~9Lv__u=;JFUY>t-s
z7E}X6C|}j%wlNrOx3Sy4xN;0pRGok6*u&B;PZg<N@C(bmIc$RpNkb~U4AHzkJF&+f
zpPj<;>a7IS-uP0!yj~UJsGl=dIo49bjH~sQ^zAg$ca7yc=2Ij|SRIS@*cM9F=+<pf
z)m1wcEI=aLd*)3Q+sQqS3U^J1-rRk|vn_i_<#A{-ZZVgGfXuVk#45sEc$|Mk^1q7_
z*1@GYxEMJ!s69R+%^}uTubKeIY{fn3%ZJayQiKU)#TfKnSHViNuP{*(Sk)f*qyAOv
z2hh@<Y!)j+SEqGEdym*(_(63tVattxa*#0|18ttrE{v1ooH|KmO?NkXNE%>&fh3y1
z8z%aB>=6EMfPM0r+$3@AeMf(Rk#>e0Lb~f9NPEMi&w<LdiE{=#JIbSgA!(wV0nd)I
z>eIwn+Ycjr3X~frJeC|bRVK=7<k^uPvQYgmtufJS=n&c`Kzgd{9%+{SXIS!#BFTV;
zDt2>}2LbFzOq4U=5X!Teql<Loi_B<6z4#2mR7P^xK`B3Rd#AYJlz%S6bD;JK@ugWT
zW&9BVq(l!S_<?g~WR?NXRTIfx&P08U?43^iOT0V!7f?$B1e3oX8nXuuX%P<UwfaOO
zgOyd^1pok6Fq3{CC<ADc)RU<nIsw9y<R3o)&66Y`J^|K~V<0^NXp^BJLIJds<RCu*
Vf0HC3J^`7NV<9I7XB_|l0027vCsqIe

diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index 8629becffc8e..2a1731c1ec47 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -485,9 +485,15 @@ writeOpenXML opts (Pandoc meta blocks) = do
                        Just (MetaBlocks bs) -> bs
                        Just (MetaInlines ils) -> [Plain ils]
                        _ -> []
+  let subtitle' = case lookupMeta "subtitle" meta of
+                       Just (MetaBlocks [Plain xs]) -> xs
+                       Just (MetaBlocks [Para  xs]) -> xs
+                       Just (MetaInlines xs)        -> xs
+                       _ -> []
   title <- withParaProp (pStyle "Title") $ blocksToOpenXML opts [Para tit | not (null tit)]
-  authors <- withParaProp (pStyle "Authors") $ blocksToOpenXML opts
-                 [Para (intercalate [LineBreak] auths) | not (null auths)]
+  subtitle <- withParaProp (pStyle "Subtitle") $ blocksToOpenXML opts [Para subtitle' | not (null subtitle')]
+  authors <- withParaProp (pStyle "Author") $ blocksToOpenXML opts $
+       map Para auths
   date <- withParaProp (pStyle "Date") $ blocksToOpenXML opts [Para dat | not (null dat)]
   abstract <- if null abstract'
                  then return []
@@ -498,7 +504,7 @@ writeOpenXML opts (Pandoc meta blocks) = do
   let blocks' = bottomUp convertSpace $ blocks
   doc' <- blocksToOpenXML opts blocks'
   notes' <- reverse `fmap` gets stFootnotes
-  let meta' = title ++ authors ++ date ++ abstract
+  let meta' = title ++ subtitle ++ authors ++ date ++ abstract
   return (meta' ++ doc', notes')
 
 -- | Convert a list of Pandoc blocks to OpenXML.