@@ -45,32 +45,19 @@ import Data.Maybe (fromMaybe)
45import Text.HTML.TagSoup
45import Text.HTML.TagSoup
46import Data.Char (isAlphaNum)
46import Data.Char (isAlphaNum)
47import qualified Data.Foldable as F
47import qualified Data.Foldable as F
48−import Text.Pandoc.Error
50import Control.Monad.Except (throwError)
48import Control.Monad.Except (throwError)
51import Text.Pandoc.Class (PandocMonad)
49import Text.Pandoc.Class (PandocMonad)
52−import qualified Text.Pandoc.Class as P
54-- | Read twiki from an input string and return a Pandoc document.
51-- | Read twiki from an input string and return a Pandoc document.
55readTWiki :: PandocMonad m
52readTWiki :: PandocMonad m
56 => ReaderOptions
53 => ReaderOptions
58 -> m Pandoc
55 -> m Pandoc
59−readTWiki opts s = case readTWikiWithWarnings' opts s of
56+readTWiki opts s =
60− Right (doc, warns) -> do
61− mapM_ P.warning warns
63− Left e -> throwError e
65−readTWikiWithWarnings' :: ReaderOptions -- ^ Reader options
66− -> String -- ^ String to parse (assuming @'\n'@ line endings)
67− -> Either PandocError (Pandoc, [String])
68−readTWikiWithWarnings' opts s =
69− (readWith parseTWikiWithWarnings) def{ stateOptions = opts } (s ++ "\n\n")
57+ case (readWith parseTWiki) def{ stateOptions = opts } (s ++ "\n\n") of
70− where parseTWikiWithWarnings = do
58+ Left e -> throwError e
71− doc <- parseTWiki
59+ Right d -> return d
72− warnings <- stateWarnings <$> getState
60+
73− return (doc, warnings)
75type TWParser = Parser [Char] ParserState
62type TWParser = Parser [Char] ParserState