git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #1492 from jkr/nodocxenv
56f2c61John MacFarlane
src/Text/Pandoc/Readers/Docx.hs+3−5
compare with master
unifiedsplit
@@ -112,8 +112,7 @@ defaultDState = DState { docxAnchorMap = M.empty
112 , docxMediaBag = mempty
112 , docxMediaBag = mempty
113 , docxInHeaderBlock = False}
113 , docxInHeaderBlock = False}
114
114
115−data DEnv = DEnv { docxOptions :: ReaderOptions
115+data DEnv = DEnv { docxOptions :: ReaderOptions}
116− , docxDocument :: Docx}
117
116
118type DocxContext = ReaderT DEnv (State DState)
117type DocxContext = ReaderT DEnv (State DState)
119
118
@@ -717,10 +716,9 @@ bodyToOutput (Body bps) = do
717 mediaBag)
716 mediaBag)
718
717
719docxToOutput :: ReaderOptions -> Docx -> (Meta, [Block], MediaBag)
718docxToOutput :: ReaderOptions -> Docx -> (Meta, [Block], MediaBag)
720−docxToOutput opts d@(Docx (Document _ body)) =
719+docxToOutput opts (Docx (Document _ body)) =
721 let dState = defaultDState
720 let dState = defaultDState
722− dEnv = DEnv { docxOptions = opts
721+ dEnv = DEnv { docxOptions = opts }
723− , docxDocument = d}
724 in
722 in
725 evalDocxContext (bodyToOutput body) dEnv dState
723 evalDocxContext (bodyToOutput body) dEnv dState
726
724