Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Docx writer: Default to user login and time of change if not given.

Browse source
This commit is contained in:
Jesse Rosenthal 2014-08-25 14:03:35 -04:00
parent e1bb28a388
commit 21253b59e8
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Text/Pandoc/Writers/Docx.hs
View file

@ -38,6 +38,10 @@ import qualified Text.Pandoc.UTF8 as UTF8
import Text.Pandoc.Compat.Monoid ((<>)) import Text.Pandoc.Compat.Monoid ((<>))
import Codec.Archive.Zip import Codec.Archive.Zip
import Data.Time.Clock.POSIX import Data.Time.Clock.POSIX
import Data.Time.Clock
import Data.Time.Format
import System.Environment
import System.Locale
import Text.Pandoc.Definition import Text.Pandoc.Definition
import Text.Pandoc.Generic import Text.Pandoc.Generic
import Text.Pandoc.ImageSize import Text.Pandoc.ImageSize
@ -97,6 +101,8 @@ data WriterState = WriterState{
, stInsId :: Int , stInsId :: Int
, stDelId :: Int , stDelId :: Int
, stInDel :: Bool , stInDel :: Bool
, stChangesAuthor :: String
, stChangesDate :: String
} }
defaultWriterState :: WriterState defaultWriterState :: WriterState
@ -113,6 +119,8 @@ defaultWriterState = WriterState{
, stInsId = 1 , stInsId = 1
, stDelId = 1 , stDelId = 1
, stInDel = False , stInDel = False
, stChangesAuthor = "unknown"
, stChangesDate = "1969-12-31T19:00:00Z"
} }
type WS a = StateT WriterState IO a type WS a = StateT WriterState IO a
@ -141,6 +149,8 @@ writeDocx :: WriterOptions -- ^ Writer options
writeDocx opts doc@(Pandoc meta _) = do writeDocx opts doc@(Pandoc meta _) = do
let datadir = writerUserDataDir opts let datadir = writerUserDataDir opts
let doc' = walk fixDisplayMath doc let doc' = walk fixDisplayMath doc
username <- lookupEnv "USERNAME"
utctime <- getCurrentTime
refArchive <- liftM (toArchive . toLazy) $ refArchive <- liftM (toArchive . toLazy) $
case writerReferenceDocx opts of case writerReferenceDocx opts of
Just f -> B.readFile f Just f -> B.readFile f
@ -148,8 +158,9 @@ writeDocx opts doc@(Pandoc meta _) = do
distArchive <- liftM (toArchive . toLazy) $ readDataFile Nothing "reference.docx" distArchive <- liftM (toArchive . toLazy) $ readDataFile Nothing "reference.docx"
((contents, footnotes), st) <- runStateT (writeOpenXML opts{writerWrapText = False} doc') ((contents, footnotes), st) <- runStateT (writeOpenXML opts{writerWrapText = False} doc')
defaultWriterState defaultWriterState{ stChangesAuthor = fromMaybe "unknown" username
epochtime <- floor `fmap` getPOSIXTime , stChangesDate = formatTime defaultTimeLocale "%FT%XZ" utctime}
let epochtime = floor $ utcTimeToPOSIXSeconds utctime
let imgs = M.elems $ stImages st let imgs = M.elems $ stImages st
-- create entries for images in word/media/... -- create entries for images in word/media/...
@ -753,8 +764,10 @@ inlineToOpenXML _ (Str str) = formattedString str
inlineToOpenXML opts Space = inlineToOpenXML opts (Str " ") inlineToOpenXML opts Space = inlineToOpenXML opts (Str " ")
inlineToOpenXML opts (Span (_,classes,kvs) ils) inlineToOpenXML opts (Span (_,classes,kvs) ils)
| "insertion" `elem` classes = do | "insertion" `elem` classes = do
let author = fromMaybe "unknown" (lookup "author" kvs) defaultAuthor <- gets stChangesAuthor
date = fromMaybe "1969-12-31T19:00:00Z" (lookup "date" kvs) defaultDate <- gets stChangesDate
let author = fromMaybe defaultAuthor (lookup "author" kvs)
date = fromMaybe defaultDate (lookup "date" kvs)
insId <- gets stInsId insId <- gets stInsId
modify $ \s -> s{stInsId = (insId + 1)} modify $ \s -> s{stInsId = (insId + 1)}
x <- inlinesToOpenXML opts ils x <- inlinesToOpenXML opts ils
@ -763,8 +776,10 @@ inlineToOpenXML opts (Span (_,classes,kvs) ils)
("w:date", date)] ("w:date", date)]
x ] x ]
| "deletion" `elem` classes = do | "deletion" `elem` classes = do
let author = fromMaybe "unknown" (lookup "author" kvs) defaultAuthor <- gets stChangesAuthor
date = fromMaybe "1969-12-31T19:00:00Z" (lookup "date" kvs) defaultDate <- gets stChangesDate
let author = fromMaybe defaultAuthor (lookup "author" kvs)
date = fromMaybe defaultDate (lookup "date" kvs)
delId <- gets stDelId delId <- gets stDelId
modify $ \s -> s{stDelId = (delId + 1)} modify $ \s -> s{stDelId = (delId + 1)}
modify $ \s -> s{stInDel = True} modify $ \s -> s{stInDel = True}