From 2610de0159cb73948d8972a59bbdcbb8ebc6f468 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Sat, 26 Jul 2014 22:55:31 -0700
Subject: [PATCH] Docx writer:  include abstract with Abstract style.

Addresses docx part of #1451.
---
 README                          |   4 ++--
 data/reference.docx             | Bin 8473 -> 8553 bytes
 src/Text/Pandoc/Writers/Docx.hs |   9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/README b/README
index edb490a57848..40d638f92900 100644
--- a/README
+++ b/README
@@ -541,8 +541,8 @@ 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, Heading 1, Heading 2, Heading 3,
-    Heading 4, Heading 5, Block Quote, Definition Term, Definition,
+    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
     Paragraph Font, Body Text Char, Verbatim Char, Footnote Ref,
     Link.
diff --git a/data/reference.docx b/data/reference.docx
index 7efc62458ea938076c1331748095ce255c3975e8..d61eadf99045b32e7c9bcd30999c3fcfa6be5c84 100644
GIT binary patch
delta 1741
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

delta 1668
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
O3e*Dt052T?0002}oeqcq

diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index de31e462ec8c..3d9586348166 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -481,17 +481,24 @@ writeOpenXML opts (Pandoc meta blocks) = do
                                   _ -> []
   let auths = docAuthors meta
   let dat = docDate meta
+  let abstract' = case lookupMeta "abstract" meta of
+                       Just (MetaBlocks bs) -> bs
+                       Just (MetaInlines ils) -> [Plain ils]
+                       Nothing -> []
   title <- withParaProp (pStyle "Title") $ blocksToOpenXML opts [Para tit | not (null tit)]
   authors <- withParaProp (pStyle "Authors") $ blocksToOpenXML opts
                  [Para (intercalate [LineBreak] auths) | not (null auths)]
   date <- withParaProp (pStyle "Date") $ blocksToOpenXML opts [Para dat | not (null dat)]
+  abstract <- if null abstract'
+                 then return []
+                 else withParaProp (pStyle "Abstract") $ blocksToOpenXML opts abstract'
   let convertSpace (Str x : Space : Str y : xs) = Str (x ++ " " ++ y) : xs
       convertSpace (Str x : Str y : xs) = Str (x ++ y) : xs
       convertSpace xs = xs
   let blocks' = bottomUp convertSpace $ blocks
   doc' <- blocksToOpenXML opts blocks'
   notes' <- reverse `fmap` gets stFootnotes
-  let meta' = title ++ authors ++ date
+  let meta' = title ++ authors ++ date ++ abstract
   return (meta' ++ doc', notes')
 
 -- | Convert a list of Pandoc blocks to OpenXML.