From 5cd475be7057487ba4f63e2257b6f65b975acd58 Mon Sep 17 00:00:00 2001 From: Mauro Bieg Date: Fri, 3 Feb 2017 09:53:43 +0100 Subject: HTML and DocBook writers: fix internal links with writerIdentifierPrefix opt (#3398) closes #3397 --- src/Text/Pandoc/Writers/Docbook.hs | 2 +- src/Text/Pandoc/Writers/HTML.hs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/Text/Pandoc') diff --git a/src/Text/Pandoc/Writers/Docbook.hs b/src/Text/Pandoc/Writers/Docbook.hs index 4c5b255d8..482cae3db 100644 --- a/src/Text/Pandoc/Writers/Docbook.hs +++ b/src/Text/Pandoc/Writers/Docbook.hs @@ -405,7 +405,7 @@ inlineToDocbook opts (Link attr txt (src, _)) | otherwise = do version <- ask (if isPrefixOf "#" src - then inTags False "link" $ ("linkend", drop 1 src) : idAndRole attr + then inTags False "link" $ ("linkend", writerIdentifierPrefix opts ++ drop 1 src) : idAndRole attr else if version == DocBook5 then inTags False "link" $ ("xlink:href", src) : idAndRole attr else inTags False "ulink" $ ("url", src) : idAndRole attr ) diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index d1fb3dda7..64eccd35e 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -933,9 +933,11 @@ inlineToHtml opts inline = do linkText <- inlineListToHtml opts txt slideVariant <- gets stSlideVariant let s' = case s of - '#':xs | slideVariant == RevealJsSlides - -> '#':'/':xs - _ -> s + '#':xs -> let prefix = if slideVariant == RevealJsSlides + then "/" + else writerIdentifierPrefix opts + in '#' : prefix ++ xs + _ -> s let link = H.a ! A.href (toValue s') $ linkText let link' = if txt == [Str (unEscapeString s)] then link ! A.class_ "uri" -- cgit v1.2.3