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

Merge pull request #1381 from jkr/updateDState

Browse source 
Docx Reader: Update state properly
This commit is contained in:
John MacFarlane 2014-06-29 11:29:08 -07:00
commit 3c8f17b52c
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Text/Pandoc/Readers/Docx.hs
View file

@ -110,6 +110,11 @@ data DEnv = DEnv { docxOptions :: ReaderOptions
type DocxContext = ReaderT DEnv (State DState) type DocxContext = ReaderT DEnv (State DState)
updateDState :: (DState -> DState) -> DocxContext ()
updateDState f = do
st <- get
put $ f st
evalDocxContext :: DocxContext a -> DEnv -> DState -> a evalDocxContext :: DocxContext a -> DEnv -> DState -> a
evalDocxContext ctx env st = evalState (runReaderT ctx env) st evalDocxContext ctx env st = evalState (runReaderT ctx env) st
@ -289,7 +294,7 @@ parPartToInlines (BookMark _ anchor) =
let newAnchor = case anchor `elem` (M.elems anchorMap) of let newAnchor = case anchor `elem` (M.elems anchorMap) of
True -> uniqueIdent [Str anchor] (M.elems anchorMap) True -> uniqueIdent [Str anchor] (M.elems anchorMap)
False -> anchor False -> anchor
put DState{ docxAnchorMap = M.insert anchor newAnchor anchorMap} updateDState $ \s -> s { docxAnchorMap = M.insert anchor newAnchor anchorMap}
return [Span (anchor, ["anchor"], []) []] return [Span (anchor, ["anchor"], []) []]
parPartToInlines (Drawing relid) = do parPartToInlines (Drawing relid) = do
(Docx _ _ _ rels _) <- asks docxDocument (Docx _ _ _ rels _) <- asks docxDocument
@ -329,7 +334,7 @@ makeHeaderAnchor (Header n (_, classes, kvs) ils)
do do
hdrIDMap <- gets docxAnchorMap hdrIDMap <- gets docxAnchorMap
let newIdent = uniqueIdent ils (M.elems hdrIDMap) let newIdent = uniqueIdent ils (M.elems hdrIDMap)
put DState{docxAnchorMap = M.insert ident newIdent hdrIDMap} updateDState $ \s -> s {docxAnchorMap = M.insert ident newIdent hdrIDMap}
return $ Header n (newIdent, classes, kvs) (ils \\ (x:xs)) return $ Header n (newIdent, classes, kvs) (ils \\ (x:xs))
-- Otherwise we just give it a name, and register that name (associate -- Otherwise we just give it a name, and register that name (associate
-- it with itself.) -- it with itself.)
@ -337,7 +342,7 @@ makeHeaderAnchor (Header n (_, classes, kvs) ils) =
do do
hdrIDMap <- gets docxAnchorMap hdrIDMap <- gets docxAnchorMap
let newIdent = uniqueIdent ils (M.elems hdrIDMap) let newIdent = uniqueIdent ils (M.elems hdrIDMap)
put DState{docxAnchorMap = M.insert newIdent newIdent hdrIDMap} updateDState $ \s -> s {docxAnchorMap = M.insert newIdent newIdent hdrIDMap}
return $ Header n (newIdent, classes, kvs) ils return $ Header n (newIdent, classes, kvs) ils
makeHeaderAnchor blk = return blk makeHeaderAnchor blk = return blk