git.iko.soy/typeable/pandoc
on master help sign in
Vimwiki reader: code cleanup
commit1a6e6a3a032b70eddc945eafd67599cc071b0f6a authorAlexander Krotov <ilabdsf@gmail.com> dateThu 4 Oct 2018, 12:05 (8 years ago) parent58ae017
1 file changed+7−11
src/Text/Pandoc/Readers/Vimwiki.hs+7−11
src/Text/Pandoc/Readers/Vimwiki.hs+7−11
@@ -429,9 +429,7 @@ tableRow = try $ do
429429 s <- lookAhead $ manyTill anyChar (try (char '|' >> many spaceChar
430430 >> newline))
431431 guard $ not $ "||" `isInfixOf` ("|" ++ s ++ "|")
432− tr <- many tableCell
433− many spaceChar >> char '\n'
434− return tr
432+ many tableCell <* many spaceChar <* char '\n'
435433
436434tableCell :: PandocMonad m => VwParser m Blocks
437435tableCell = try $
@@ -451,13 +449,13 @@ ph s = try $ do
451449
452450noHtmlPh :: PandocMonad m => VwParser m ()
453451noHtmlPh = try $
454− () <$ (many spaceChar >> string "%nohtml" >> many spaceChar
455− >> lookAhead newline)
452+ () <$ many spaceChar <* string "%nohtml" <* many spaceChar
453+ <* lookAhead newline
456454
457455templatePh :: PandocMonad m => VwParser m ()
458456templatePh = try $
459− () <$ (many spaceChar >> string "%template" >>many (noneOf "\n")
460− >> lookAhead newline)
457+ () <$ many spaceChar <* string "%template" <* many (noneOf "\n")
458+ <* lookAhead newline
461459
462460-- inline parser
463461
@@ -617,10 +615,8 @@ procImgurl :: String -> String
617615procImgurl s = if take 6 s == "local:" then "file" ++ drop 5 s else s
618616
619617inlineMath :: PandocMonad m => VwParser m Inlines
620−inlineMath = try $ do
621− char '$'
622− contents <- many1Till (noneOf "\n") (char '$')
623− return $ B.math contents
618+inlineMath = try $
619+ B.math <$ char '$' <*> many1Till (noneOf "\n") (char '$')
624620
625621tag :: PandocMonad m => VwParser m Inlines
626622tag = try $ do