@@ -85,12 +85,12 @@ import qualified Text.Pandoc.Builder as B (blockQuote, bulletList, code,
8585import Text.Pandoc.Class (PandocMonad (..))
8686import Text.Pandoc.Definition (Attr, Block (BulletList, OrderedList),
8787 Inline (Space), ListNumberDelim (..),
88− ListNumberStyle (..), Meta, Pandoc (..),
88+ ListNumberStyle (..), Pandoc (..),
8989 nullMeta)
9090import Text.Pandoc.Options (ReaderOptions)
91−import Text.Pandoc.Parsing (F, ParserState, ParserT, blanklines, emailAddress,
91+import Text.Pandoc.Parsing (ParserState, ParserT, blanklines, emailAddress,
9292 many1Till, orderedListMarker, readWithM,
93− registerHeader, runF, spaceChar, stateMeta',
93+ registerHeader, spaceChar, stateMeta,
9494 stateOptions, uri)
9595import Text.Pandoc.Shared (crFilter, splitBy, stringify, stripFirstAndLast)
9696import Text.Parsec.Char (alphaNum, anyChar, char, newline, noneOf, oneOf, space,
@@ -126,7 +126,7 @@ parseVimwiki = do
126126 spaces
127127 eof
128128 st <- getState
129− let meta = runF (stateMeta' st) st
129+ let meta = stateMeta st
130130 return $ Pandoc meta (toList bs)
131131
132132-- block parser
@@ -444,8 +444,8 @@ ph s = try $ do
444444 many spaceChar >>string ('%':s) >> spaceChar
445445 contents <- trimInlines . mconcat <$> manyTill inline (lookAhead newline)
446446 --use lookAhead because of placeholder in the whitespace parser
447− let meta' = return $ B.setMeta s contents nullMeta :: F Meta
448− updateState $ \st -> st { stateMeta' = stateMeta' st <> meta' }
447+ let meta' = B.setMeta s contents nullMeta
448+ updateState $ \st -> st { stateMeta = stateMeta st <> meta' }
449449
450450noHtmlPh :: PandocMonad m => VwParser m ()
451451noHtmlPh = try $