Merge pull request #1430 from jkr/anchor-fix-2

Fix auto identified headers when already auto-id'ed

pandoc.cabal

@@ -188,6 +188,8 @@ Extra-Source-Files:
                  tests/fb2.math.fb2,
                  tests/fb2.test-small.png,
                  tests/fb2.test.jpg,
+                 tests/docx.already_auto_ident.native,
+                 tests/docx.already_auto_ident.docx,
                  tests/docx.block_quotes.docx,
                  tests/docx.block_quotes_parse_indent.native,
                  tests/docx.headers.docx,

src/Text/Pandoc/Readers/Docx.hs

@@ -105,6 +105,7 @@ readDocx opts bytes =
     Left _   -> error $ "couldn't parse docx file"
 
 data DState = DState { docxAnchorMap :: M.Map String String
+                     , docxInHeaderBlock :: Bool
                      , docxInTexSubscript :: Bool }
 
 data DEnv = DEnv { docxOptions  :: ReaderOptions
@@ -112,18 +113,13 @@ data DEnv = DEnv { docxOptions  :: ReaderOptions
 
 type DocxContext = ReaderT DEnv (State DState)
 
-updateDState :: (DState -> DState) -> DocxContext ()
+withDState :: (DState -> DState) -> DocxContext a -> DocxContext a
-updateDState f = do
+withDState f dctx = do
-  st <- get
+  ds <- get
-  put $ f st
+  modify f
-
+  ctx' <- dctx
-withDState :: DState -> DocxContext a -> DocxContext a
+  put ds
-withDState ds dctx = do
+  return ctx'
-  ds' <- get
-  updateDState (\_ -> ds)
-  dctx' <- dctx
-  put ds'
-  return dctx'
 
 evalDocxContext :: DocxContext a -> DEnv -> DState -> a
 evalDocxContext ctx env st = evalState (runReaderT ctx env) st
@@ -297,18 +293,24 @@ parPartToInlines (BookMark _ anchor) =
   -- We record these, so we can make sure not to overwrite
   -- user-defined anchor links with header auto ids.
   do
+    -- get whether we're in a header.
+    inHdrBool <- gets docxInHeaderBlock
     -- Get the anchor map.
     anchorMap <- gets docxAnchorMap
-    -- Check to see if the id is already in there. Rewrite if
+    -- We don't want to rewrite if we're in a header, since we'll take
-    -- necessary. This will have the possible effect of rewriting
+    -- care of that later, when we make the header anchor. If the
-    -- user-defined anchor links. However, since these are not defined
+    -- bookmark were already in uniqueIdent form, this would lead to a
-    -- in pandoc, it seems like a necessary evil to avoid an extra
+    -- duplication. Otherwise, we check to see if the id is already in
-    -- pass.
+    -- there. Rewrite if necessary. This will have the possible effect
-    let newAnchor = case anchor `elem` (M.elems anchorMap) of
+    -- of rewriting user-defined anchor links. However, since these
-          True -> uniqueIdent [Str anchor] (M.elems anchorMap)
+    -- are not defined in pandoc, it seems like a necessary evil to
-          False -> anchor
+    -- avoid an extra pass.
-    updateDState $ \s -> s { docxAnchorMap = M.insert anchor newAnchor anchorMap}
+    let newAnchor =
-    return [Span (anchor, ["anchor"], []) []]
+          if not inHdrBool && anchor `elem` (M.elems anchorMap)
+          then uniqueIdent [Str anchor] (M.elems anchorMap)
+          else anchor
+    modify $ \s -> s { docxAnchorMap = M.insert anchor newAnchor anchorMap}
+    return [Span (newAnchor, ["anchor"], []) []]
 parPartToInlines (Drawing fp bs) = do
   return $ case True of                  -- TODO: add self-contained images
     True -> [Image [] (fp, "")]
@@ -427,8 +429,8 @@ oMathElemToTexString (Matrix bases) = do
   s <- liftM (intercalate " \\\\\n")(mapM rowString bases)
   return $ printf "\\begin{matrix}\n%s\n\\end{matrix}" s
 oMathElemToTexString (NAry style sub sup base) | Just c <- nAryChar style = do
-  ds <- gets (\s -> s{docxInTexSubscript = True})
+  subString  <- withDState (\s -> s{docxInTexSubscript = True}) $
-  subString  <- withDState ds $ concatMapM oMathElemToTexString sub
+                concatMapM oMathElemToTexString sub
   supString  <- concatMapM oMathElemToTexString sup
   baseString <- baseToTexString base
   return $ case M.lookup c uniconvMap of
@@ -497,7 +499,7 @@ makeHeaderAnchor (Header n (_, classes, kvs) ils)
     do
       hdrIDMap <- gets docxAnchorMap
       let newIdent = uniqueIdent ils (M.elems hdrIDMap)
-      updateDState $ \s -> s {docxAnchorMap = M.insert ident newIdent hdrIDMap}
+      modify $ \s -> s {docxAnchorMap = M.insert ident newIdent hdrIDMap}
       return $ Header n (newIdent, classes, kvs) (ils \\ (x:xs))
 -- Otherwise we just give it a name, and register that name (associate
 -- it with itself.)
@@ -505,7 +507,7 @@ makeHeaderAnchor (Header n (_, classes, kvs) ils) =
   do
     hdrIDMap <- gets docxAnchorMap
     let newIdent = uniqueIdent ils (M.elems hdrIDMap)
-    updateDState $ \s -> s {docxAnchorMap = M.insert newIdent newIdent hdrIDMap}
+    modify $ \s -> s {docxAnchorMap = M.insert newIdent newIdent hdrIDMap}
     return $ Header n (newIdent, classes, kvs) ils
 makeHeaderAnchor blk = return blk
 
@@ -541,7 +543,8 @@ bodyPartToBlocks (Paragraph pPr parparts)
      [CodeBlock ("", [], []) (concatMap parPartToString parparts)]
 bodyPartToBlocks (Paragraph pPr parparts)
   | any isHeaderContainer (parStyleToContainers pPr) = do
-    ils <- parPartsToInlines parparts >>= (return . normalizeSpaces)
+    ils <-withDState (\s -> s{docxInHeaderBlock = True}) $
+          parPartsToInlines parparts >>= (return . normalizeSpaces)
     let (Container hdrFun) = head $ filter isHeaderContainer (parStyleToContainers pPr)
         Header n attr _ = hdrFun []
     hdr <- makeHeaderAnchor $ Header n attr ils
@@ -624,6 +627,7 @@ bodyToBlocks (Body bps) = do
 docxToBlocks :: ReaderOptions -> Docx -> [Block]
 docxToBlocks opts d@(Docx (Document _ body)) =
   let dState = DState { docxAnchorMap = M.empty
+                      , docxInHeaderBlock = False
                       , docxInTexSubscript = False}
       dEnv   = DEnv { docxOptions  = opts
                     , docxDocument = d}

tests/Tests/Readers/Docx.hs

@@ -96,6 +96,10 @@ tests = [ testGroup "inlines"
             "headers"
             "docx.headers.docx"
             "docx.headers.native"
+          , testCompare
+            "headers already having auto identifiers"
+            "docx.already_auto_ident.docx"
+            "docx.already_auto_ident.native"
           , testCompare
             "lists"
             "docx.lists.docx"

tests/docx.already_auto_ident.native

@@ -0,0 +1,2 @@
+[Header 1 ("anchor-header",[],[]) [Str "Anchor",Space,Str "Header"]
+,Para [Str "A",Space,Link [Str "link"] ("#anchor-header","")]]