From 418bda81282c82325c5a296a3c486fdc5ab1dfe0 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 12 Aug 2017 22:42:51 -0700
Subject: [PATCH] Docx writer:  pass through comments.

We assume that comments are defined as parsed by the
docx reader:

    I want <span class="comment-start" id="0" author="Jesse Rosenthal"
    date="2016-05-09T16:13:00Z">I left a comment.</span>some text to
    have a comment <span class="comment-end" id="0"></span>on it.

We assume also that the id attributes are unique and properly
matched between comment-start and comment-end.

Closes #2994.
---
 pandoc.cabal                    |   1 +
 src/Text/Pandoc/Writers/Docx.hs |  55 +++++++++++++++++++++++++++-----
 test/command/2994.docx          | Bin 0 -> 9701 bytes
 test/command/2994.md            |   7 ++++
 4 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 test/command/2994.docx
 create mode 100644 test/command/2994.md

diff --git a/pandoc.cabal b/pandoc.cabal
index 9392b4430..39a390dd6 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -138,6 +138,7 @@ Extra-Source-Files:
                  test/*.native
                  test/command/*.md
                  test/command/3533-rst-csv-tables.csv
+                 test/command/2994.docx
                  test/command/abbrevs
                  test/command/SVG_logo-without-xml-declaration.svg
                  test/command/SVG_logo.svg
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index 8b19f3740..51e4ffb98 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -123,6 +123,7 @@ defaultWriterEnv = WriterEnv{ envTextProperties = []
 
 data WriterState = WriterState{
          stFootnotes      :: [Element]
+       , stComments       :: [([(String,String)], [Inline])]
        , stSectionIds     :: Set.Set String
        , stExternalLinks  :: M.Map String String
        , stImages         :: M.Map FilePath (String, String, Maybe MimeType, Element, B.ByteString)
@@ -139,6 +140,7 @@ data WriterState = WriterState{
 defaultWriterState :: WriterState
 defaultWriterState = WriterState{
         stFootnotes      = defaultFootnotes
+      , stComments       = []
       , stSectionIds     = Set.empty
       , stExternalLinks  = M.empty
       , stImages         = M.empty
@@ -305,11 +307,11 @@ writeDocx opts doc@(Pandoc meta _) = do
         }
 
 
-  ((contents, footnotes), st) <- runStateT
-                                 (runReaderT
-                                  (writeOpenXML opts{writerWrapText = WrapNone} doc')
-                                  env)
-                                 initialSt
+  ((contents, footnotes, comments), st) <- runStateT
+                         (runReaderT
+                          (writeOpenXML opts{writerWrapText = WrapNone} doc')
+                          env)
+                         initialSt
   let epochtime = floor $ utcTimeToPOSIXSeconds utctime
   let imgs = M.elems $ stImages st
 
@@ -370,6 +372,8 @@ writeDocx opts doc@(Pandoc meta _) = do
                     "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml")
                   ,("/word/document.xml",
                     "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml")
+                  ,("/word/comments.xml",
+                    "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml")
                   ,("/word/footnotes.xml",
                     "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml")
                   ] ++
@@ -416,6 +420,9 @@ writeDocx opts doc@(Pandoc meta _) = do
                     ,("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes",
                       "rId7",
                       "footnotes.xml")
+                    ,("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments",
+                      "rId8",
+                      "comments.xml")
                     ]
 
   let idMap = renumIdMap (length baserels' + 1) (headers ++ footers)
@@ -461,6 +468,10 @@ writeDocx opts doc@(Pandoc meta _) = do
         $ renderXml $ mknode "Relationships" [("xmlns","http://schemas.openxmlformats.org/package/2006/relationships")]
         linkrels
 
+  -- comments
+  let commentsEntry = toEntry "word/comments.xml" epochtime
+        $ renderXml $ mknode "w:comments" stdAttributes comments
+
   -- styles
 
   -- We only want to inject paragraph and text properties that
@@ -564,6 +575,7 @@ writeDocx opts doc@(Pandoc meta _) = do
   let archive = foldr addEntryToArchive emptyArchive $
                   contentTypesEntry : relsEntry : contentEntry : relEntry :
                   footnoteRelEntry : numEntry : styleEntry : footnotesEntry :
+                  commentsEntry :
                   docPropsEntry : docPropsAppEntry : themeEntry :
                   fontTableEntry : settingsEntry : webSettingsEntry :
                   imageEntries ++ headerFooterEntries ++
@@ -762,7 +774,7 @@ makeTOC _ = return []
 
 -- | Convert Pandoc document to two lists of
 -- OpenXML elements (the main document and footnotes).
-writeOpenXML :: (PandocMonad m) => WriterOptions -> Pandoc -> WS m ([Element], [Element])
+writeOpenXML :: (PandocMonad m) => WriterOptions -> Pandoc -> WS m ([Element], [Element],[Element])
 writeOpenXML opts (Pandoc meta blocks) = do
   let tit = docTitle meta ++ case lookupMeta "subtitle" meta of
                                   Just (MetaBlocks [Plain xs]) -> LineBreak : xs
@@ -791,10 +803,27 @@ writeOpenXML opts (Pandoc meta blocks) = do
       convertSpace xs                           = xs
   let blocks' = bottomUp convertSpace blocks
   doc' <- (setFirstPara >> blocksToOpenXML opts blocks')
-  notes' <- reverse `fmap` gets stFootnotes
+  notes' <- reverse <$> gets stFootnotes
+  comments <- reverse <$> gets stComments
+  let toComment (kvs, ils) = do
+        annotation <- inlinesToOpenXML opts ils
+        return $
+          mknode "w:comment" [('w':':':k,v) | (k,v) <- kvs]
+            [ mknode "w:p" [] $
+              [ mknode "w:pPr" []
+                [ mknode "w:pStyle" [("w:val", "CommentText")] () ]
+              , mknode "w:r" []
+                [ mknode "w:rPr" []
+                  [ mknode "w:rStyle" [("w:val", "CommentReference")] ()
+                  , mknode "w:annotationRef" [] ()
+                  ]
+                ]
+              ] ++ annotation
+            ]
+  comments' <- mapM toComment comments
   toc <- makeTOC opts
   let meta' = title ++ subtitle ++ authors ++ date ++ abstract ++ toc
-  return (meta' ++ doc', notes')
+  return (meta' ++ doc', notes', comments')
 
 -- | Convert a list of Pandoc blocks to OpenXML.
 blocksToOpenXML :: (PandocMonad m) => WriterOptions -> [Block] -> WS m [Element]
@@ -1101,6 +1130,16 @@ inlineToOpenXML' _ (Str str) =
   formattedString str
 inlineToOpenXML' opts Space = inlineToOpenXML opts (Str " ")
 inlineToOpenXML' opts SoftBreak = inlineToOpenXML opts (Str " ")
+inlineToOpenXML' _ (Span (ident,["comment-start"],kvs) ils) = do
+  modify $ \st -> st{ stComments = (("id",ident):kvs, ils) : stComments st }
+  return [ mknode "w:commentRangeStart" [("w:id", ident)] () ]
+inlineToOpenXML' _ (Span (ident,["comment-end"],_) _) = do
+  return [ mknode "w:commentRangeEnd" [("w:id", ident)] ()
+         , mknode "w:r" []
+           [ mknode "w:rPr" []
+             [ mknode "w:rStyle" [("w:val", "CommentReference")] () ]
+           , mknode "w:commentReference" [("w:id", ident)] () ]
+         ]
 inlineToOpenXML' opts (Span (ident,classes,kvs) ils) = do
   stylemod <- case lookup dynamicStyleKey kvs of
                    Just sty -> do
diff --git a/test/command/2994.docx b/test/command/2994.docx
new file mode 100644
index 0000000000000000000000000000000000000000..44118e9bd9e8d8723c689b266bb1d1b4039bc481
GIT binary patch
literal 9701
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

literal 0
HcmV?d00001

diff --git a/test/command/2994.md b/test/command/2994.md
new file mode 100644
index 000000000..b7d267d29
--- /dev/null
+++ b/test/command/2994.md
@@ -0,0 +1,7 @@
+```
+% pandoc --track-changes=all -t markdown command/2994.docx
+^D
+I want [I left a comment.]{.comment-start id="0"
+author="Jesse Rosenthal" date="2016-05-09T16:13:00Z"}some text to have a
+comment []{.comment-end id="0"}on it.
+```