git.iko.soy/typeable/pandoc
on master help sign in
Vimwiki reader: get rid of F, runF and stateMeta' in favor of stateMeta
8d95917Alexander Krotov
src/Text/Pandoc/Readers/Vimwiki.hs+6−6
@@ -85,12 +85,12 @@ import qualified Text.Pandoc.Builder as B (blockQuote, bulletList, code,
85import Text.Pandoc.Class (PandocMonad (..))
85import Text.Pandoc.Class (PandocMonad (..))
86import Text.Pandoc.Definition (Attr, Block (BulletList, OrderedList),
86import Text.Pandoc.Definition (Attr, Block (BulletList, OrderedList),
87 Inline (Space), ListNumberDelim (..),
87 Inline (Space), ListNumberDelim (..),
88− ListNumberStyle (..), Meta, Pandoc (..),
88+ ListNumberStyle (..), Pandoc (..),
89 nullMeta)
89 nullMeta)
90import Text.Pandoc.Options (ReaderOptions)
90import Text.Pandoc.Options (ReaderOptions)
91−import Text.Pandoc.Parsing (F, ParserState, ParserT, blanklines, emailAddress,
91+import Text.Pandoc.Parsing (ParserState, ParserT, blanklines, emailAddress,
92 many1Till, orderedListMarker, readWithM,
92 many1Till, orderedListMarker, readWithM,
93− registerHeader, runF, spaceChar, stateMeta',
93+ registerHeader, spaceChar, stateMeta,
94 stateOptions, uri)
94 stateOptions, uri)
95import Text.Pandoc.Shared (crFilter, splitBy, stringify, stripFirstAndLast)
95import Text.Pandoc.Shared (crFilter, splitBy, stringify, stripFirstAndLast)
96import Text.Parsec.Char (alphaNum, anyChar, char, newline, noneOf, oneOf, space,
96import Text.Parsec.Char (alphaNum, anyChar, char, newline, noneOf, oneOf, space,
@@ -126,7 +126,7 @@ parseVimwiki = do
126 spaces
126 spaces
127 eof
127 eof
128 st <- getState
128 st <- getState
129− let meta = runF (stateMeta' st) st
129+ let meta = stateMeta st
130 return $ Pandoc meta (toList bs)
130 return $ Pandoc meta (toList bs)
131
131
132-- block parser
132-- block parser
@@ -444,8 +444,8 @@ ph s = try $ do
444 many spaceChar >>string ('%':s) >> spaceChar
444 many spaceChar >>string ('%':s) >> spaceChar
445 contents <- trimInlines . mconcat <$> manyTill inline (lookAhead newline)
445 contents <- trimInlines . mconcat <$> manyTill inline (lookAhead newline)
446 --use lookAhead because of placeholder in the whitespace parser
446 --use lookAhead because of placeholder in the whitespace parser
447− let meta' = return $ B.setMeta s contents nullMeta :: F Meta
447+ let meta' = B.setMeta s contents nullMeta
448− updateState $ \st -> st { stateMeta' = stateMeta' st <> meta' }
448+ updateState $ \st -> st { stateMeta = stateMeta st <> meta' }
449
449
450noHtmlPh :: PandocMonad m => VwParser m ()
450noHtmlPh :: PandocMonad m => VwParser m ()
451noHtmlPh = try $
451noHtmlPh = try $