From 64a4f60c029db8da3295cd7139994524dbb9fe43 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 9 Feb 2025 11:43:38 -0800 Subject: [PATCH] TWiki reader: use "wikilink" class, instead of title. --- src/Text/Pandoc/Readers/TWiki.hs | 12 ++++++------ test/twiki-reader.native | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Text/Pandoc/Readers/TWiki.hs b/src/Text/Pandoc/Readers/TWiki.hs index 37f2ba4c1..ac7254c9e 100644 --- a/src/Text/Pandoc/Readers/TWiki.hs +++ b/src/Text/Pandoc/Readers/TWiki.hs @@ -469,25 +469,25 @@ link = try $ do st <- getState guard $ stateAllowLinks st setState $ st{ stateAllowLinks = False } - (url, title, content) <- linkText <|> simpleWikiLink + (url, title, classes, content) <- linkText <|> simpleWikiLink setState $ st{ stateAllowLinks = True } - return $ B.link url title content + return $ B.linkWith ("",classes,[]) url title content -linkText :: PandocMonad m => TWParser m (Text, Text, B.Inlines) +linkText :: PandocMonad m => TWParser m (Text, Text, [Text], B.Inlines) linkText = do string "[[" url <- T.pack <$> many1Till anyChar (char ']') content <- option (B.str url) (mconcat <$> linkContent) char ']' - return (url, "", content) + return (url, "", [], content) where linkContent = char '[' >> many1Till anyChar (char ']') >>= parseLinkContent . T.pack parseLinkContent = parseFromString' $ many1 inline -simpleWikiLink :: PandocMonad m => TWParser m (Text, Text, B.Inlines) +simpleWikiLink :: PandocMonad m => TWParser m (Text, Text, [Text], B.Inlines) simpleWikiLink = do w <- wikiWord - return (w, "wikilink", B.str w) + return (w, "", ["wikilink"], B.str w) where wikiWord = do cs <- many1 $ satisfy (\x -> isLetter x && isUpper x) diff --git a/test/twiki-reader.native b/test/twiki-reader.native index 950eceb60..a839f963f 100644 --- a/test/twiki-reader.native +++ b/test/twiki-reader.native @@ -153,15 +153,15 @@ Pandoc [ Str "internal" , Space , Str "links" ] , Para [ Link - ( "" , [] , [] ) + ( "" , [ "wikilink" ] , [] ) [ Str "MySimplePage" ] - ( "MySimplePage" , "wikilink" ) + ( "MySimplePage" , "" ) ] , Para [ Link - ( "" , [] , [] ) + ( "" , [ "wikilink" ] , [] ) [ Str "My23Page23" ] - ( "My23Page23" , "wikilink" ) + ( "My23Page23" , "" ) ] , Header 1