Skip to content

Commit 64a4f60

Browse files
committed
TWiki reader: use "wikilink" class, instead of title.
1 parent 94d6427 commit 64a4f60

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/Text/Pandoc/Readers/TWiki.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -469,25 +469,25 @@ link = try $ do
469469
st <- getState
470470
guard $ stateAllowLinks st
471471
setState $ st{ stateAllowLinks = False }
472-
(url, title, content) <- linkText <|> simpleWikiLink
472+
(url, title, classes, content) <- linkText <|> simpleWikiLink
473473
setState $ st{ stateAllowLinks = True }
474-
return $ B.link url title content
474+
return $ B.linkWith ("",classes,[]) url title content
475475

476-
linkText :: PandocMonad m => TWParser m (Text, Text, B.Inlines)
476+
linkText :: PandocMonad m => TWParser m (Text, Text, [Text], B.Inlines)
477477
linkText = do
478478
string "[["
479479
url <- T.pack <$> many1Till anyChar (char ']')
480480
content <- option (B.str url) (mconcat <$> linkContent)
481481
char ']'
482-
return (url, "", content)
482+
return (url, "", [], content)
483483
where
484484
linkContent = char '[' >> many1Till anyChar (char ']') >>= parseLinkContent . T.pack
485485
parseLinkContent = parseFromString' $ many1 inline
486486

487-
simpleWikiLink :: PandocMonad m => TWParser m (Text, Text, B.Inlines)
487+
simpleWikiLink :: PandocMonad m => TWParser m (Text, Text, [Text], B.Inlines)
488488
simpleWikiLink = do
489489
w <- wikiWord
490-
return (w, "wikilink", B.str w)
490+
return (w, "", ["wikilink"], B.str w)
491491
where
492492
wikiWord = do
493493
cs <- many1 $ satisfy (\x -> isLetter x && isUpper x)

test/twiki-reader.native

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,15 @@ Pandoc
153153
[ Str "internal" , Space , Str "links" ]
154154
, Para
155155
[ Link
156-
( "" , [] , [] )
156+
( "" , [ "wikilink" ] , [] )
157157
[ Str "MySimplePage" ]
158-
( "MySimplePage" , "wikilink" )
158+
( "MySimplePage" , "" )
159159
]
160160
, Para
161161
[ Link
162-
( "" , [] , [] )
162+
( "" , [ "wikilink" ] , [] )
163163
[ Str "My23Page23" ]
164-
( "My23Page23" , "wikilink" )
164+
( "My23Page23" , "" )
165165
]
166166
, Header
167167
1

0 commit comments

Comments
 (0)