Account for external link URLs with anchors

Previously, if a URL had an anchor, such as

    http://johnmacfarlane.net/pandoc/README.html#synopsis

the reader would incorrectly identify it as an internal link
and return "#synopsis" for the link in output.

1 files changed, 10 insertions, 7 deletions

diff --git a/src/Text/Pandoc/Readers/Docx/Parse.hs b/src/Text/Pandoc/Readers/Docx/Parse.hs
index 29b661d10..5fd6b7a81 100644
--- a/src/Text/Pandoc/Readers/Docx/Parse.hs
+++ b/src/Text/Pandoc/Readers/Docx/Parse.hs
@@ -663,17 +663,20 @@ elemToParPart ns element
     return $ BookMark bmId bmName
 elemToParPart ns element
   | isElem ns "w" "hyperlink" element
-  , Just anchor <- findAttr (elemName ns "w" "anchor") element = do
+  , Just relId <- findAttr (elemName ns "r" "id") element = do
     runs <- mapD (elemToRun ns) (elChildren element)
-    return $ InternalHyperLink anchor runs
+    rels <- asks envRelationships
+    case lookupRelationship relId rels of
+      Just target -> do
+         case findAttr (elemName ns "w" "anchor") element of
+             Just anchor -> return $ ExternalHyperLink (target ++ '#':anchor) runs
+             Nothing -> return $ ExternalHyperLink target runs
+      Nothing     -> return $ ExternalHyperLink "" runs
 elemToParPart ns element
   | isElem ns "w" "hyperlink" element
-  , Just relId <- findAttr (elemName ns "r" "id") element = do
+  , Just anchor <- findAttr (elemName ns "w" "anchor") element = do
     runs <- mapD (elemToRun ns) (elChildren element)
-    rels <- asks envRelationships
-    return $ case lookupRelationship relId rels of
-      Just target -> ExternalHyperLink target runs
-      Nothing     -> ExternalHyperLink "" runs
+    return $ InternalHyperLink anchor runs
 elemToParPart ns element
   | isElem ns "m" "oMath" element =
     (eitherToD $ readOMML $ showElement element) >>= (return . PlainOMath)