f2b3377 · typeable/pandoc

git.iko.soy/typeable/pandoc

Finer grained imports of Text.Pandoc.Class submodules (#6203)

This should speed-up recompilation after changes in `Text.Pandoc.Class`, as the number of modules affected by a change will be smaller in general. It also offers faster insights into the parts of `T.P.Class` used within a module.

commitf2b337768e95c8903f65e597f7d8cd81938dacc3 authorAlbert Krewinkel <albert@zeitkraut.de> dateSun 22 Mar 2020, 20:28 (7 years ago) parent22bf3d6

89 files changed+120−111

compare with master

unifiedsplit

src/Text/Pandoc/Class/PandocPure.hs+1−1

@@ -2,7 +2,7 @@

22{-# LANGUAGE GeneralizedNewtypeDeriving #-}

33{-# LANGUAGE OverloadedStrings #-}

44{- |

5−Module : Text.Pandoc.Class.Pure

5+Module : Text.Pandoc.Class.PandocPure

77License : GNU GPL, version 2 or above

src/Text/Pandoc/Filter.hs+2−1

@@ -21,7 +21,8 @@ module Text.Pandoc.Filter

2121import System.CPUTime (getCPUTime)

2222import Data.Aeson.TH (deriveJSON, defaultOptions)

2323import GHC.Generics (Generic)

24−import Text.Pandoc.Class (PandocIO, report, getVerbosity)

24+import Text.Pandoc.Class.PandocIO (PandocIO)

25+import Text.Pandoc.Class.PandocMonad (report, getVerbosity)

2526import Text.Pandoc.Definition (Pandoc)

2627import Text.Pandoc.Options (ReaderOptions)

2728import Text.Pandoc.Logging

src/Text/Pandoc/Filter/JSON.hs+1−1

@@ -23,7 +23,7 @@ import System.Directory (executable, doesFileExist, findExecutable,

2323import System.Environment (getEnvironment)

2424import System.Exit (ExitCode (..))

2525import System.FilePath ((</>), takeExtension)

26−import Text.Pandoc.Class (PandocIO)

26+import Text.Pandoc.Class.PandocIO (PandocIO)

2727import Text.Pandoc.Error (PandocError (PandocFilterError))

2828import Text.Pandoc.Definition (Pandoc)

2929import Text.Pandoc.Options (ReaderOptions)

src/Text/Pandoc/Filter/Lua.hs+1−1

@@ -14,7 +14,7 @@ module Text.Pandoc.Filter.Lua (apply) where

1414import Control.Exception (throw)

1515import Control.Monad ((>=>))

1616import qualified Data.Text as T

17−import Text.Pandoc.Class (PandocIO)

17+import Text.Pandoc.Class.PandocIO (PandocIO)

1818import Text.Pandoc.Definition (Pandoc)

1919import Text.Pandoc.Error (PandocError (PandocFilterError))

2020import Text.Pandoc.Lua (Global (..), LuaException (..),

src/Text/Pandoc/Filter/Path.hs+1−1

@@ -13,7 +13,7 @@ module Text.Pandoc.Filter.Path

1313 ( expandFilterPath

1414 ) where

1515

16−import Text.Pandoc.Class (PandocMonad, fileExists, getUserDataDir)

16+import Text.Pandoc.Class.PandocMonad (PandocMonad, fileExists, getUserDataDir)

1717import System.FilePath ((</>), isRelative)

1818

1919 -- First we check to see if a filter is found. If not, and if it's

src/Text/Pandoc/Lua/Global.hs+1−1

@@ -19,7 +19,7 @@ import Foreign.Lua (Lua, Peekable, Pushable)

1919import Foreign.Lua.Userdata ( ensureUserdataMetatable, pushAnyWithMetatable

2020 , metatableName)

2121import Paths_pandoc (version)

22−import Text.Pandoc.Class (CommonState)

22+import Text.Pandoc.Class.CommonState (CommonState)

2323import Text.Pandoc.Definition (Pandoc (Pandoc), pandocTypesVersion)

2424import Text.Pandoc.Lua.Marshaling ()

2525import Text.Pandoc.Lua.Util (addFunction)

src/Text/Pandoc/Lua/Init.hs+3−2

@@ -19,8 +19,9 @@ import Control.Monad.Trans (MonadIO (..))

1919import Data.Data (Data, dataTypeConstrs, dataTypeOf, showConstr)

2020import Foreign.Lua (Lua)

2121import GHC.IO.Encoding (getForeignEncoding, setForeignEncoding, utf8)

22−import Text.Pandoc.Class (PandocIO, getCommonState, getUserDataDir,

23− putCommonState)

22+import Text.Pandoc.Class.PandocIO (PandocIO)

23+import Text.Pandoc.Class.PandocMonad (getCommonState, getUserDataDir,

24+ putCommonState)

2425import Text.Pandoc.Lua.Global (Global (..), setGlobals)

2526import Text.Pandoc.Lua.Packages (LuaPackageParams (..),

2627 installPandocPackageSearcher)

src/Text/Pandoc/Lua/Module/MediaBag.hs+3−2

@@ -15,8 +15,9 @@ module Text.Pandoc.Lua.Module.MediaBag

1515

1616import Control.Monad (zipWithM_)

1717import Foreign.Lua (Lua, NumResults, Optional, liftIO)

18−import Text.Pandoc.Class (CommonState (..), fetchItem, putCommonState,

19− runIOorExplode, setMediaBag)

18+import Text.Pandoc.Class.CommonState (CommonState (..))

19+import Text.Pandoc.Class.PandocIO (runIOorExplode)

20+import Text.Pandoc.Class.PandocMonad (fetchItem, putCommonState, setMediaBag)

2021import Text.Pandoc.Lua.Marshaling ()

2122import Text.Pandoc.Lua.Marshaling.MediaBag (pushIterator)

2223import Text.Pandoc.Lua.Util (addFunction)

src/Text/Pandoc/Lua/Module/Pandoc.hs+1−1

@@ -20,7 +20,7 @@ import Data.Default (Default (..))

2020import Data.Maybe (fromMaybe)

2121import Foreign.Lua (Lua, NumResults, Optional, Peekable, Pushable)

2222import System.Exit (ExitCode (..))

23−import Text.Pandoc.Class (runIO)

23+import Text.Pandoc.Class.PandocIO (runIO)

2424import Text.Pandoc.Definition (Block, Inline)

2525import Text.Pandoc.Lua.Filter (walkInlines, walkBlocks, LuaFilter, SingletonsList (..))

2626import Text.Pandoc.Lua.Marshaling ()

src/Text/Pandoc/Lua/Module/Utils.hs+2−1

@@ -16,7 +16,8 @@ import Control.Applicative ((<|>))

1616import Data.Default (def)

1717import Data.Version (Version)

1818import Foreign.Lua (Peekable, Lua, NumResults)

19−import Text.Pandoc.Class (runIO, setUserDataDir)

19+import Text.Pandoc.Class.PandocIO (runIO)

20+import Text.Pandoc.Class.PandocMonad (setUserDataDir)

2021import Text.Pandoc.Definition ( Pandoc, Meta, MetaValue (..), Block, Inline

2122 , Citation, Attr, ListAttributes)

2223import Text.Pandoc.Lua.Marshaling ()

src/Text/Pandoc/Lua/Packages.hs+2−1

@@ -18,7 +18,8 @@ module Text.Pandoc.Lua.Packages

1818import Control.Monad (forM_)

1919import Data.ByteString (ByteString)

2020import Foreign.Lua (Lua, NumResults, liftIO)

21−import Text.Pandoc.Class (readDataFile, runIO, setUserDataDir)

21+import Text.Pandoc.Class.PandocIO (runIO)

22+import Text.Pandoc.Class.PandocMonad (readDataFile, setUserDataDir)

2223

2324import qualified Foreign.Lua as Lua

2425import Text.Pandoc.Lua.Module.Pandoc as Pandoc

src/Text/Pandoc/Lua/Util.hs+2−1

@@ -29,7 +29,8 @@ module Text.Pandoc.Lua.Util

2929import Control.Monad (unless, when)

3030import Foreign.Lua ( Lua, NumArgs, NumResults, Peekable, Pushable, StackIndex

3131 , Status, ToHaskellFunction )

32−import Text.Pandoc.Class (readDataFile, runIOorExplode, setUserDataDir)

32+import Text.Pandoc.Class.PandocIO (runIOorExplode)

33+import Text.Pandoc.Class.PandocMonad (readDataFile, setUserDataDir)

3334import qualified Foreign.Lua as Lua

3435import qualified Text.Pandoc.UTF8 as UTF8

3536import Data.Text (Text)

src/Text/Pandoc/PDF.hs+3−3

@@ -52,9 +52,9 @@ import Text.Pandoc.Writers.Shared (getField, metaToContext)

5252import Data.List (intercalate)

5353#endif

5454import Data.List (isPrefixOf, find)

55−import Text.Pandoc.Class (PandocIO, extractMedia, fillMediaBag, getCommonState,

56− getVerbosity, putCommonState, report,

57− runIOorExplode, setVerbosity)

55+import Text.Pandoc.Class.PandocIO (PandocIO, extractMedia, runIOorExplode)

56+import Text.Pandoc.Class.PandocMonad (fillMediaBag, getCommonState, getVerbosity,

57+ putCommonState, report, setVerbosity)

5858import Text.Pandoc.Logging

5959

6060#ifdef _WINDOWS

src/Text/Pandoc/Parsing.hs+1−1

@@ -202,7 +202,7 @@ import Text.HTML.TagSoup.Entity (lookupEntity)

202202import Text.Pandoc.Asciify (toAsciiChar)

203203import Text.Pandoc.Builder (Blocks, HasMeta (..), Inlines, trimInlines)

204204import qualified Text.Pandoc.Builder as B

205−import Text.Pandoc.Class (PandocMonad, readFileFromDirs, report)

205+import Text.Pandoc.Class.PandocMonad (PandocMonad, readFileFromDirs, report)

206206import Text.Pandoc.Definition

207207import Text.Pandoc.Logging

208208import Text.Pandoc.Options

src/Text/Pandoc/Readers/CommonMark.hs+1−1

@@ -21,7 +21,7 @@ import Control.Monad.State

2121import qualified Data.Set as Set

2222import Data.Text (Text)

2323import qualified Data.Text as T

24−import Text.Pandoc.Class (PandocMonad)

24+import Text.Pandoc.Class.PandocMonad (PandocMonad)

2525import Text.Pandoc.Definition

2626import Text.Pandoc.Emoji (emojiToInline)

2727import Text.Pandoc.Options

src/Text/Pandoc/Readers/Creole.hs+1−1

@@ -19,7 +19,7 @@ import Data.Maybe (fromMaybe)

1919import Data.Text (Text)

2020import qualified Data.Text as T

2121import qualified Text.Pandoc.Builder as B

22−import Text.Pandoc.Class (PandocMonad (..))

22+import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

2323import Text.Pandoc.Definition

2424import Text.Pandoc.Options

2525import Text.Pandoc.Parsing hiding (enclosed)

src/Text/Pandoc/Readers/DocBook.hs+1−1

@@ -23,7 +23,7 @@ import Data.Text (Text)

2323import qualified Data.Text as T

2424import Text.HTML.TagSoup.Entity (lookupEntity)

2525import Text.Pandoc.Builder

26−import Text.Pandoc.Class (PandocMonad, report)

26+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

2727import Text.Pandoc.Options

2828import Text.Pandoc.Logging (LogMessage(..))

2929import Text.Pandoc.Shared (crFilter, safeRead)

src/Text/Pandoc/Readers/Docx.hs+2−2

@@ -82,8 +82,8 @@ import Text.Pandoc.Shared

8282import Text.Pandoc.Walk

8383import Text.TeXMath (writeTeX)

8484import Control.Monad.Except (throwError)

85−import Text.Pandoc.Class (PandocMonad)

86−import qualified Text.Pandoc.Class as P

85+import Text.Pandoc.Class.PandocMonad (PandocMonad)

86+import qualified Text.Pandoc.Class.PandocMonad as P

8787import Text.Pandoc.Error

8888import Text.Pandoc.Logging

8989

src/Text/Pandoc/Readers/DokuWiki.hs+1−1

@@ -24,7 +24,7 @@ import Data.Maybe (fromMaybe, catMaybes)

2424import Data.Text (Text)

2525import qualified Data.Text as T

2626import qualified Text.Pandoc.Builder as B

27−import Text.Pandoc.Class (PandocMonad (..))

27+import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

2828import Text.Pandoc.Definition

2929import Text.Pandoc.Error (PandocError (PandocParsecError))

3030import Text.Pandoc.Options

src/Text/Pandoc/Readers/EPUB.hs+1−1

@@ -33,7 +33,7 @@ import Network.URI (unEscapeString)

3333import System.FilePath (dropFileName, dropFileName, normalise, splitFileName,

3434 takeFileName, (</>))

3535import qualified Text.Pandoc.Builder as B

36−import Text.Pandoc.Class (PandocMonad, insertMedia)

36+import Text.Pandoc.Class.PandocMonad (PandocMonad, insertMedia)

3737import Text.Pandoc.Definition hiding (Attr)

3838import Text.Pandoc.Error

3939import Text.Pandoc.Extensions (Extension (Ext_raw_html), enableExtension)

src/Text/Pandoc/Readers/FB2.hs+1−1

@@ -36,7 +36,7 @@ import Data.Default

3636import Data.Maybe

3737import Text.HTML.TagSoup.Entity (lookupEntity)

3838import Text.Pandoc.Builder

39−import Text.Pandoc.Class (PandocMonad, insertMedia, report)

39+import Text.Pandoc.Class.PandocMonad (PandocMonad, insertMedia, report)

4040import Text.Pandoc.Error

4141import Text.Pandoc.Logging

4242import Text.Pandoc.Options

src/Text/Pandoc/Readers/HTML.hs+1−1

@@ -45,7 +45,7 @@ import Text.HTML.TagSoup

4545import Text.HTML.TagSoup.Match

4646import Text.Pandoc.Builder (Blocks, HasMeta (..), Inlines, trimInlines)

4747import qualified Text.Pandoc.Builder as B

48−import Text.Pandoc.Class (PandocMonad (..))

48+import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

4949import Text.Pandoc.CSS (foldOrElse, pickStyleAttrProps)

5050import Text.Pandoc.Definition

5151import Text.Pandoc.Readers.LaTeX (rawLaTeXInline)

src/Text/Pandoc/Readers/Haddock.hs+1−1

@@ -24,7 +24,7 @@ import Documentation.Haddock.Parser

2424import Documentation.Haddock.Types as H

2525import Text.Pandoc.Builder (Blocks, Inlines)

2626import qualified Text.Pandoc.Builder as B

27−import Text.Pandoc.Class (PandocMonad)

27+import Text.Pandoc.Class.PandocMonad (PandocMonad)

2828import Text.Pandoc.Definition

2929import Text.Pandoc.Error

3030import Text.Pandoc.Options

src/Text/Pandoc/Readers/Ipynb.hs+1−1

@@ -24,7 +24,7 @@ import qualified Text.Pandoc.Builder as B

2424import Text.Pandoc.Logging

2525import Text.Pandoc.Definition

2626import Data.Ipynb as Ipynb

27−import Text.Pandoc.Class

27+import Text.Pandoc.Class.PandocMonad

2828import Text.Pandoc.MIME (extensionFromMimeType)

2929import Text.Pandoc.Shared (tshow)

3030import Text.Pandoc.UTF8

src/Text/Pandoc/Readers/JATS.hs+1−1

@@ -24,7 +24,7 @@ import Data.Text (Text)

2424import qualified Data.Text as T

2525import Text.HTML.TagSoup.Entity (lookupEntity)

2626import Text.Pandoc.Builder

27−import Text.Pandoc.Class (PandocMonad)

27+import Text.Pandoc.Class.PandocMonad (PandocMonad)

2828import Text.Pandoc.Options

2929import Text.Pandoc.Shared (underlineSpan, crFilter, safeRead)

3030import Text.TeXMath (readMathML, writeTeX)

src/Text/Pandoc/Readers/Jira.hs+1−1

@@ -15,7 +15,7 @@ import Control.Monad.Except (throwError)

1515import Data.Text (Text, append, pack, singleton, unpack)

1616import Text.HTML.TagSoup.Entity (lookupEntity)

1717import Text.Jira.Parser (parse)

18−import Text.Pandoc.Class (PandocMonad (..))

18+import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

1919import Text.Pandoc.Builder

2020import Text.Pandoc.Error (PandocError (PandocParseError))

2121import Text.Pandoc.Options (ReaderOptions)

src/Text/Pandoc/Readers/LaTeX.hs+5−4

@@ -40,9 +40,10 @@ import qualified Data.Text as T

4040import System.FilePath (addExtension, replaceExtension, takeExtension)

4141import Text.Pandoc.BCP47 (Lang (..), renderLang)

4242import Text.Pandoc.Builder

43−import Text.Pandoc.Class (PandocMonad, PandocPure, getResourcePath, lookupEnv,

44− readFileFromDirs, report, setResourcePath,

45− setTranslations, translateTerm, trace, fileExists)

43+import Text.Pandoc.Class.PandocPure (PandocPure)

44+import Text.Pandoc.Class.PandocMonad (PandocMonad (..), getResourcePath,

45+ readFileFromDirs, report, setResourcePath,

46+ setTranslations, translateTerm)

4647import Text.Pandoc.Error (PandocError (PandocParseError, PandocParsecError))

4748import Text.Pandoc.Highlighting (fromListingsLanguage, languagesByExtension)

4849import Text.Pandoc.ImageSize (numUnit, showFl)

@@ -64,7 +65,7 @@ import Safe

6465

6566-- for debugging:

6667-- import Text.Pandoc.Extensions (getDefaultExtensions)

67−-- import Text.Pandoc.Class (runIOorExplode, PandocIO)

68+-- import Text.Pandoc.Class.PandocIO (runIOorExplode, PandocIO)

6869-- import Debug.Trace (traceShowId)

6970

7071-- | Parse LaTeX from string and return 'Pandoc' document.

src/Text/Pandoc/Readers/LaTeX/Parsing.hs+1−1

@@ -80,7 +80,7 @@ import qualified Data.Set as Set

8080import Data.Text (Text)

8181import qualified Data.Text as T

8282import Text.Pandoc.Builder

83−import Text.Pandoc.Class (PandocMonad, report)

83+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

8484import Text.Pandoc.Error (PandocError (PandocMacroLoop))

8585import Text.Pandoc.Logging

8686import Text.Pandoc.Options

src/Text/Pandoc/Readers/Man.hs+1−1

@@ -19,11 +19,11 @@ import Data.Default (Default)

1919import Control.Monad (liftM, mzero, guard, void)

2020import Control.Monad.Trans (lift)

2121import Control.Monad.Except (throwError)

22−import Text.Pandoc.Class (PandocMonad(..), report)

2322import Data.Maybe (catMaybes, isJust)

2423import Data.List (intersperse, intercalate)

2524import qualified Data.Text as T

2625import Text.Pandoc.Builder as B

26+import Text.Pandoc.Class.PandocMonad (PandocMonad(..), report)

2727import Text.Pandoc.Error (PandocError (PandocParsecError))

2828import Text.Pandoc.Logging (LogMessage(..))

2929import Text.Pandoc.Options

src/Text/Pandoc/Readers/Markdown.hs+1−1

@@ -31,7 +31,7 @@ import System.FilePath (addExtension, takeExtension)

3131import Text.HTML.TagSoup

3232import Text.Pandoc.Builder (Blocks, Inlines)

3333import qualified Text.Pandoc.Builder as B

34−import Text.Pandoc.Class (PandocMonad (..), report)

34+import Text.Pandoc.Class.PandocMonad (PandocMonad (..), report)

3535import Text.Pandoc.Definition

3636import Text.Pandoc.Emoji (emojiToInline)

3737import Text.Pandoc.Error

src/Text/Pandoc/Readers/MediaWiki.hs+1−1

@@ -32,7 +32,7 @@ import qualified Data.Text as T

3232import Text.HTML.TagSoup

3333import Text.Pandoc.Builder (Blocks, Inlines, trimInlines)

3434import qualified Text.Pandoc.Builder as B

35−import Text.Pandoc.Class (PandocMonad (..))

35+import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

3636import Text.Pandoc.Definition

3737import Text.Pandoc.Logging

3838import Text.Pandoc.Options

src/Text/Pandoc/Readers/Metadata.hs+1−1

@@ -24,7 +24,7 @@ import qualified Data.YAML as YAML

2424import qualified Data.YAML.Event as YE

2525import qualified Text.Pandoc.Builder as B

2626import Text.Pandoc.Builder (Blocks)

27−import Text.Pandoc.Class (PandocMonad (..))

27+import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

2828import Text.Pandoc.Definition

2929import Text.Pandoc.Error

3030import Text.Pandoc.Logging

src/Text/Pandoc/Readers/Muse.hs+1−1

@@ -31,7 +31,7 @@ import Data.Text (Text)

3131import qualified Data.Text as T

3232import Text.Pandoc.Builder (Blocks, Inlines)

3333import qualified Text.Pandoc.Builder as B

34−import Text.Pandoc.Class (PandocMonad (..))

34+import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

3535import Text.Pandoc.Definition

3636import Text.Pandoc.Error (PandocError (PandocParsecError))

3737import Text.Pandoc.Logging

src/Text/Pandoc/Readers/Native.hs+1−1

@@ -19,7 +19,7 @@ import Text.Pandoc.Shared (safeRead)

1919

2020import Control.Monad.Except (throwError)

2121import Data.Text (Text)

22−import Text.Pandoc.Class

22+import Text.Pandoc.Class.PandocMonad (PandocMonad)

2323import Text.Pandoc.Error

2424

2525-- | Read native formatted text and return a Pandoc document.

src/Text/Pandoc/Readers/OPML.hs+1−1

@@ -21,7 +21,7 @@ import Data.Text (Text)

2121import qualified Data.Text as T

2222import Text.HTML.TagSoup.Entity (lookupEntity)

2323import Text.Pandoc.Builder

24−import Text.Pandoc.Class (PandocMonad)

24+import Text.Pandoc.Class.PandocMonad (PandocMonad)

2525import Text.Pandoc.Options

2626import Text.Pandoc.Readers.HTML (readHtml)

2727import Text.Pandoc.Readers.Markdown (readMarkdown)

src/Text/Pandoc/Readers/Odt.hs+2−2

@@ -23,8 +23,8 @@ import System.FilePath

2323

2424import Control.Monad.Except (throwError)

2525

26−import Text.Pandoc.Class (PandocMonad)

27−import qualified Text.Pandoc.Class as P

26+import Text.Pandoc.Class.PandocMonad (PandocMonad)

27+import qualified Text.Pandoc.Class.PandocMonad as P

2828import Text.Pandoc.Definition

2929import Text.Pandoc.Error

3030import Text.Pandoc.MediaBag

src/Text/Pandoc/Readers/Org.hs+1−1

@@ -14,7 +14,7 @@ import Text.Pandoc.Readers.Org.Blocks (blockList, meta)

1414import Text.Pandoc.Readers.Org.ParserState (optionsToParserState)

1515import Text.Pandoc.Readers.Org.Parsing (OrgParser, readWithM)

1616

17−import Text.Pandoc.Class (PandocMonad)

17+import Text.Pandoc.Class.PandocMonad (PandocMonad)

1818import Text.Pandoc.Definition

1919import Text.Pandoc.Options

2020import Text.Pandoc.Parsing (reportLogMessages)

src/Text/Pandoc/Readers/Org/Blocks.hs+1−1

@@ -26,7 +26,7 @@ import Text.Pandoc.Readers.Org.Shared (cleanLinkText, isImageFilename,

2626 originalLang, translateLang, exportsCode)

2727

2828import Text.Pandoc.Builder (Blocks, Inlines)

29−import Text.Pandoc.Class (PandocMonad)

29+import Text.Pandoc.Class.PandocMonad (PandocMonad)

3030import Text.Pandoc.Definition

3131import Text.Pandoc.Options

3232import Text.Pandoc.Shared (compactify, compactifyDL, safeRead)

src/Text/Pandoc/Readers/Org/DocumentTree.hs+1−1

@@ -21,7 +21,7 @@ import Data.List (intersperse)

2121import Data.Maybe (mapMaybe)

2222import Data.Text (Text)

2323import Text.Pandoc.Builder (Blocks, Inlines)

24−import Text.Pandoc.Class (PandocMonad)

24+import Text.Pandoc.Class.PandocMonad (PandocMonad)

2525import Text.Pandoc.Definition

2626import Text.Pandoc.Readers.Org.BlockStarts

2727import Text.Pandoc.Readers.Org.ParserState

src/Text/Pandoc/Readers/Org/ExportSettings.hs+1−1

@@ -12,7 +12,7 @@ module Text.Pandoc.Readers.Org.ExportSettings

1212 ( exportSettings

1313 ) where

1414

15−import Text.Pandoc.Class (PandocMonad, report)

15+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

1616import Text.Pandoc.Logging (LogMessage (UnknownOrgExportOption))

1717import Text.Pandoc.Readers.Org.ParserState

1818import Text.Pandoc.Readers.Org.Parsing

src/Text/Pandoc/Readers/Org/Inlines.hs+1−1

@@ -23,7 +23,7 @@ import Text.Pandoc.Readers.Org.Shared (cleanLinkText, isImageFilename,

2323

2424import Text.Pandoc.Builder (Inlines)

2525import qualified Text.Pandoc.Builder as B

26−import Text.Pandoc.Class (PandocMonad)

26+import Text.Pandoc.Class.PandocMonad (PandocMonad)

2727import Text.Pandoc.Definition

2828import Text.Pandoc.Options

2929import Text.Pandoc.Readers.LaTeX (inlineCommand, rawLaTeXInline)

src/Text/Pandoc/Readers/Org/Meta.hs+1−1

@@ -24,7 +24,7 @@ import Text.Pandoc.Readers.Org.Parsing

2424

2525import Text.Pandoc.Builder (Blocks, Inlines)

2626import qualified Text.Pandoc.Builder as B

27−import Text.Pandoc.Class (PandocMonad)

27+import Text.Pandoc.Class.PandocMonad (PandocMonad)

2828import Text.Pandoc.Definition

2929import Text.Pandoc.Shared (safeRead)

3030

src/Text/Pandoc/Readers/RST.hs+1−1

@@ -27,7 +27,7 @@ import Data.Text (Text)

2727import qualified Data.Text as T

2828import Text.Pandoc.Builder (Blocks, Inlines, fromList, setMeta, trimInlines)

2929import qualified Text.Pandoc.Builder as B

30−import Text.Pandoc.Class (PandocMonad, fetchItem, readFileFromDirs)

30+import Text.Pandoc.Class.PandocMonad (PandocMonad, fetchItem, readFileFromDirs)

3131import Text.Pandoc.CSV (CSVOptions (..), defaultCSVOptions, parseCSV)

3232import Text.Pandoc.Definition

3333import Text.Pandoc.Error

src/Text/Pandoc/Readers/Roff.hs+1−1

@@ -31,7 +31,7 @@ where

3131import Safe (lastDef)

3232import Control.Monad (void, mzero, mplus, guard)

3333import Control.Monad.Except (throwError)

34−import Text.Pandoc.Class

34+import Text.Pandoc.Class.PandocMonad

3535 (getResourcePath, readFileFromDirs, PandocMonad(..), report)

3636import Data.Char (isLower, toLower, toUpper, chr, isAscii, isAlphaNum)

3737import Data.Default (Default)

src/Text/Pandoc/Readers/TWiki.hs+1−1

@@ -25,7 +25,7 @@ import Data.Text (Text)

2525import qualified Data.Text as T

2626import Text.HTML.TagSoup

2727import qualified Text.Pandoc.Builder as B

28−import Text.Pandoc.Class (PandocMonad (..))

28+import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

2929import Text.Pandoc.Definition

3030import Text.Pandoc.Options

3131import Text.Pandoc.Parsing hiding (enclosed, nested)

src/Text/Pandoc/Readers/Textile.hs+1−1

@@ -45,7 +45,7 @@ import Text.HTML.TagSoup (Tag (..), fromAttrib)

4545import Text.HTML.TagSoup.Match

4646import Text.Pandoc.Builder (Blocks, Inlines, trimInlines)

4747import qualified Text.Pandoc.Builder as B

48−import Text.Pandoc.Class (PandocMonad (..))

48+import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

4949import Text.Pandoc.CSS

5050import Text.Pandoc.Definition

5151import Text.Pandoc.Options

src/Text/Pandoc/Readers/TikiWiki.hs+2−1

@@ -25,7 +25,8 @@ import Data.Maybe (fromMaybe)

2525import Data.Text (Text)

2626import qualified Data.Text as T

2727import qualified Text.Pandoc.Builder as B

28−import Text.Pandoc.Class (CommonState (..), PandocMonad (..))

28+import Text.Pandoc.Class.CommonState (CommonState (..))

29+import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

2930import Text.Pandoc.Definition

3031import Text.Pandoc.Logging (Verbosity (..))

3132import Text.Pandoc.Options

src/Text/Pandoc/Readers/Txt2Tags.hs+2−2

@@ -25,8 +25,8 @@ import qualified Data.Text as T

2525import Data.Time.Format (formatTime)

2626import Text.Pandoc.Builder (Blocks, Inlines, trimInlines)

2727import qualified Text.Pandoc.Builder as B

28−import Text.Pandoc.Class (PandocMonad)

29−import qualified Text.Pandoc.Class as P

28+import Text.Pandoc.Class.PandocMonad (PandocMonad)

29+import qualified Text.Pandoc.Class.PandocMonad as P

3030import Data.Time (defaultTimeLocale)

3131import Text.Pandoc.Definition

3232import Text.Pandoc.Options

src/Text/Pandoc/Readers/Vimwiki.hs+1−1

@@ -64,7 +64,7 @@ import qualified Text.Pandoc.Builder as B (blockQuote, bulletList, code,

6464 softbreak, space, spanWith, str,

6565 strikeout, strong, subscript,

6666 superscript)

67−import Text.Pandoc.Class (PandocMonad (..))

67+import Text.Pandoc.Class.PandocMonad (PandocMonad (..))

6868import Text.Pandoc.Definition (Attr, Block (BulletList, OrderedList),

6969 Inline (Space), ListNumberDelim (..),

7070 ListNumberStyle (..), Pandoc (..),

src/Text/Pandoc/SelfContained.hs+2−2

@@ -27,8 +27,8 @@ import Data.Char (isAlphaNum, isAscii)

2727import Network.URI (escapeURIString)

2828import System.FilePath (takeDirectory, takeExtension, (</>))

2929import Text.HTML.TagSoup

30−import Text.Pandoc.Class (PandocMonad (..), fetchItem, getInputFiles, report,

31− setInputFiles)

30+import Text.Pandoc.Class.PandocMonad (PandocMonad (..), fetchItem,

31+ getInputFiles, report, setInputFiles)

3232import Text.Pandoc.Error

3333import Text.Pandoc.Logging

3434import Text.Pandoc.MIME (MimeType)

src/Text/Pandoc/Templates.hs+3−2

@@ -26,8 +26,9 @@ module Text.Pandoc.Templates ( Template

2626

2727import System.FilePath ((<.>), (</>), takeFileName)

2828import Text.DocTemplates (Template, TemplateMonad(..), compileTemplate, renderTemplate)

29−import Text.Pandoc.Class (PandocMonad, readDataFile, fetchItem,

30− CommonState(..), getCommonState, modifyCommonState)

29+import Text.Pandoc.Class.CommonState (CommonState(..))

30+import Text.Pandoc.Class.PandocMonad (PandocMonad, readDataFile, fetchItem,

31+ getCommonState, modifyCommonState)

3132import qualified Text.Pandoc.UTF8 as UTF8

3233import Control.Monad.Except (catchError, throwError)

3334import Data.Text (Text)

src/Text/Pandoc/Writers/AsciiDoc.hs+1−1

@@ -26,7 +26,7 @@ import Data.Maybe (fromMaybe, isJust)

2626import qualified Data.Set as Set

2727import qualified Data.Text as T

2828import Data.Text (Text)

29−import Text.Pandoc.Class (PandocMonad, report)

29+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

3030import Text.Pandoc.Definition

3131import Text.Pandoc.ImageSize

3232import Text.Pandoc.Logging

src/Text/Pandoc/Writers/CommonMark.hs+1−1

@@ -23,7 +23,7 @@ import Data.List (transpose)

2323import Data.Text (Text)

2424import qualified Data.Text as T

2525import Network.HTTP (urlEncode)

26−import Text.Pandoc.Class (PandocMonad)

26+import Text.Pandoc.Class.PandocMonad (PandocMonad)

2727import Text.Pandoc.Definition

2828import Text.Pandoc.Options

2929import Text.Pandoc.Shared (capitalize, isTightList,

src/Text/Pandoc/Writers/ConTeXt.hs+1−1

@@ -21,7 +21,7 @@ import Data.Text (Text)

2121import qualified Data.Text as T

2222import Network.URI (unEscapeString)

2323import Text.Pandoc.BCP47

24−import Text.Pandoc.Class (PandocMonad, report, toLang)

24+import Text.Pandoc.Class.PandocMonad (PandocMonad, report, toLang)

2525import Text.Pandoc.Definition

2626import Text.Pandoc.ImageSize

2727import Text.Pandoc.Logging

src/Text/Pandoc/Writers/Custom.hs+1−1

@@ -23,7 +23,7 @@ import Data.Text (Text, pack)

2323import Data.Typeable

2424import Foreign.Lua (Lua, Pushable)

2525import Text.DocLayout (render, literal)

26−import Text.Pandoc.Class (PandocIO)

26+import Text.Pandoc.Class.PandocIO (PandocIO)

2727import Text.Pandoc.Definition

2828import Text.Pandoc.Lua (Global (..), LuaException (LuaException),

2929 runLua, setGlobals)

src/Text/Pandoc/Writers/Docbook.hs+1−1

@@ -19,7 +19,7 @@ import Data.Monoid (Any (..))

1919import Data.Text (Text)

2020import qualified Data.Text as T

2121import qualified Text.Pandoc.Builder as B

22−import Text.Pandoc.Class (PandocMonad, report)

22+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

2323import Text.Pandoc.Definition

2424import Text.Pandoc.Highlighting (languages, languagesByExtension)

2525import Text.Pandoc.ImageSize

src/Text/Pandoc/Writers/Docx.hs+2−2

@@ -36,8 +36,8 @@ import Data.Digest.Pure.SHA (sha1, showDigest)

3636import Skylighting

3737import System.Random (randomR, StdGen, mkStdGen)

3838import Text.Pandoc.BCP47 (getLang, renderLang)

39−import Text.Pandoc.Class (PandocMonad, report, toLang)

40−import qualified Text.Pandoc.Class as P

39+import Text.Pandoc.Class.PandocMonad (PandocMonad, report, toLang)

40+import qualified Text.Pandoc.Class.PandocMonad as P

4141import Data.Time

4242import Text.Pandoc.UTF8 (fromTextLazy)

4343import Text.Pandoc.Definition

src/Text/Pandoc/Writers/DokuWiki.hs+1−1

@@ -29,7 +29,7 @@ import Data.Default (Default (..))

2929import Data.List (intersect, transpose)

3030import Data.Text (Text)

3131import qualified Data.Text as T

32−import Text.Pandoc.Class (PandocMonad, report)

32+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

3333import Text.Pandoc.Definition

3434import Text.Pandoc.ImageSize

3535import Text.Pandoc.Logging

src/Text/Pandoc/Writers/EPUB.hs+3−2

@@ -35,8 +35,9 @@ import Network.HTTP (urlEncode)

3535import System.FilePath (takeExtension, takeFileName, makeRelative)

3636import Text.HTML.TagSoup (Tag (TagOpen), fromAttrib, parseTags)

3737import Text.Pandoc.Builder (fromList, setMeta)

38−import Text.Pandoc.Class (PandocMonad, report)

39−import qualified Text.Pandoc.Class as P

38+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

39+import qualified Text.Pandoc.Class.PandocPure as P

40+import qualified Text.Pandoc.Class.PandocMonad as P

4041import Data.Time

4142import Text.Pandoc.Definition

4243import Text.Pandoc.Error

src/Text/Pandoc/Writers/FB2.hs+2−2

@@ -34,8 +34,8 @@ import qualified Text.XML.Light as X

3434import qualified Text.XML.Light.Cursor as XC

3535import qualified Text.XML.Light.Input as XI

3636

37−import Text.Pandoc.Class (PandocMonad, report)

38−import qualified Text.Pandoc.Class as P

37+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

38+import qualified Text.Pandoc.Class.PandocMonad as P

3939import Text.Pandoc.Definition

4040import Text.Pandoc.Logging

4141import Text.Pandoc.Options (HTMLMathMethod (..), WriterOptions (..), def)

src/Text/Pandoc/Writers/HTML.hs+2−2

@@ -61,7 +61,8 @@ import System.FilePath (takeBaseName)

6161import Text.Blaze.Html.Renderer.Text (renderHtml)

6262import qualified Text.Blaze.XHtml1.Transitional as H

6363import qualified Text.Blaze.XHtml1.Transitional.Attributes as A

64−import Text.Pandoc.Class (PandocMonad, report, runPure)

64+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

65+import Text.Pandoc.Class.PandocPure (runPure)

6566import Text.Pandoc.Error

6667import Text.Pandoc.Logging

6768import Text.Pandoc.MIME (mediaCategory)

@@ -1308,4 +1309,3 @@ isRawHtml f = do

13081309 html5 <- gets stHtml5

13091310 return $ f == Format "html" ||

13101311 ((html5 && f == Format "html5") || f == Format "html4")

1311−

src/Text/Pandoc/Writers/Haddock.hs+1−1

@@ -18,7 +18,7 @@ import Control.Monad.State.Strict

1818import Data.Default

1919import Data.Text (Text)

2020import qualified Data.Text as T

21−import Text.Pandoc.Class (PandocMonad, report)

21+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

2222import Text.Pandoc.Definition

2323import Text.Pandoc.Logging

2424import Text.Pandoc.Options

src/Text/Pandoc/Writers/ICML.hs+2−3

@@ -24,8 +24,7 @@ import Data.Maybe (fromMaybe, maybeToList)

2424import qualified Data.Set as Set

2525import qualified Data.Text as Text

2626import Data.Text (Text)

27−import Text.Pandoc.Class (PandocMonad, report)

28−import qualified Text.Pandoc.Class as P

27+import Text.Pandoc.Class.PandocMonad (PandocMonad, fetchItem, report)

2928import Text.Pandoc.Definition

3029import Text.Pandoc.ImageSize

3130import Text.Pandoc.Logging

@@ -550,7 +549,7 @@ styleToStrAttr style =

550549imageICML :: PandocMonad m => WriterOptions -> Style -> Attr -> Target -> WS m (Doc Text)

551550imageICML opts style attr (src, _) = do

552551 imgS <- catchError

553− (do (img, _) <- P.fetchItem src

552+ (do (img, _) <- fetchItem src

554553 case imageSize opts img of

555554 Right size -> return size

556555 Left msg -> do

src/Text/Pandoc/Writers/Ipynb.hs+1−1

@@ -22,7 +22,7 @@ import Text.Pandoc.Definition

2222import Data.Ipynb as Ipynb

2323import Text.Pandoc.Walk (walkM)

2424import qualified Text.Pandoc.Builder as B

25−import Text.Pandoc.Class

25+import Text.Pandoc.Class.PandocMonad

2626import Text.Pandoc.Logging

2727import Data.Text (Text)

2828import qualified Data.Text as T

src/Text/Pandoc/Writers/JATS.hs+1−1

@@ -29,7 +29,7 @@ import Data.Maybe (fromMaybe)

2929import Data.Time (toGregorian, Day, parseTimeM, defaultTimeLocale, formatTime)

3030import qualified Data.Text as T

3131import Data.Text (Text)

32−import Text.Pandoc.Class (PandocMonad, report)

32+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

3333import Text.Pandoc.Definition

3434import Text.Pandoc.Highlighting (languages, languagesByExtension)

3535import Text.Pandoc.Logging

src/Text/Pandoc/Writers/Jira.hs+1−1

@@ -21,7 +21,7 @@ import Data.Foldable (find)

2121import Data.Text (Text)

2222import Text.Jira.Parser (plainText)

2323import Text.Jira.Printer (prettyBlocks, prettyInlines)

24−import Text.Pandoc.Class (PandocMonad)

24+import Text.Pandoc.Class.PandocMonad (PandocMonad)

2525import Text.Pandoc.Definition

2626import Text.Pandoc.Options (WriterOptions (writerTemplate, writerWrapText),

2727 WrapOption (..))

src/Text/Pandoc/Writers/LaTeX.hs+1−1

@@ -31,7 +31,7 @@ import Network.URI (unEscapeString)

3131import Text.DocTemplates (FromContext(lookupContext), renderTemplate,

3232 Val(..), Context(..))

3333import Text.Pandoc.BCP47 (Lang (..), getLang, renderLang)

34−import Text.Pandoc.Class (PandocMonad, report, toLang)

34+import Text.Pandoc.Class.PandocMonad (PandocMonad, report, toLang)

3535import Text.Pandoc.Definition

3636import Text.Pandoc.Highlighting (formatLaTeXBlock, formatLaTeXInline, highlight,

3737 styleToLaTeX, toListingsLanguage)

src/Text/Pandoc/Writers/Man.hs+1−1

@@ -19,7 +19,7 @@ import Data.Maybe (fromMaybe)

1919import Data.Text (Text)

2020import qualified Data.Text as T

2121import Text.Pandoc.Builder (deleteMeta)

22−import Text.Pandoc.Class (PandocMonad, report)

22+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

2323import Text.Pandoc.Definition

2424import Text.Pandoc.Logging

2525import Text.Pandoc.Options

src/Text/Pandoc/Writers/Markdown.hs+1−1

@@ -30,7 +30,7 @@ import Data.Text (Text)

3030import qualified Data.Text as T

3131import Network.HTTP (urlEncode)

3232import Text.HTML.TagSoup (Tag (..), isTagText, parseTags)

33−import Text.Pandoc.Class (PandocMonad, report)

33+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

3434import Text.Pandoc.Definition

3535import Text.Pandoc.Logging

3636import Text.Pandoc.Options

src/Text/Pandoc/Writers/Math.hs+1−1

@@ -8,7 +8,7 @@ module Text.Pandoc.Writers.Math

88where

1010import qualified Data.Text as T

11−import Text.Pandoc.Class

11+import Text.Pandoc.Class.PandocMonad

1212import Text.Pandoc.Definition

1313import Text.Pandoc.Logging

1414import Text.TeXMath (DisplayType (..), Exp, readTeX, writePandoc)

src/Text/Pandoc/Writers/MediaWiki.hs+1−1

@@ -20,7 +20,7 @@ import Data.Maybe (fromMaybe)

2020import qualified Data.Set as Set

2121import Data.Text (Text)

2222import qualified Data.Text as T

23−import Text.Pandoc.Class (PandocMonad, report)

23+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

2424import Text.Pandoc.Definition

2525import Text.Pandoc.ImageSize

2626import Text.Pandoc.Logging

src/Text/Pandoc/Writers/Ms.hs+1−1

@@ -31,7 +31,7 @@ import Network.URI (escapeURIString, isAllowedInURI)

3131import Skylighting

3232import System.FilePath (takeExtension)

3333import Text.Pandoc.Asciify (toAsciiChar)

34−import Text.Pandoc.Class (PandocMonad, report)

34+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

3535import Text.Pandoc.Definition

3636import Text.Pandoc.Highlighting

3737import Text.Pandoc.ImageSize

src/Text/Pandoc/Writers/Muse.hs+1−1

@@ -35,7 +35,7 @@ import qualified Data.Set as Set

3535import qualified Data.Text as T

3636import Data.Text (Text)

3737import System.FilePath (takeExtension)

38−import Text.Pandoc.Class (PandocMonad)

38+import Text.Pandoc.Class.PandocMonad (PandocMonad)

3939import Text.Pandoc.Definition

4040import Text.Pandoc.Error

4141import Text.Pandoc.ImageSize

src/Text/Pandoc/Writers/Native.hs+1−1

@@ -14,7 +14,7 @@ module Text.Pandoc.Writers.Native ( writeNative )

1414where

1515import Data.List (intersperse)

1616import Data.Text (Text)

17−import Text.Pandoc.Class (PandocMonad)

17+import Text.Pandoc.Class.PandocMonad (PandocMonad)

1818import Text.Pandoc.Definition

1919import Text.Pandoc.Options (WrapOption (..), WriterOptions (..))

2020import Text.DocLayout

src/Text/Pandoc/Writers/ODT.hs+2−2

@@ -24,8 +24,8 @@ import qualified Data.Text.Lazy as TL

2424import Data.Time

2525import System.FilePath (takeDirectory, takeExtension, (<.>))

2626import Text.Pandoc.BCP47 (Lang (..), getLang, renderLang)

27−import Text.Pandoc.Class (PandocMonad, report, toLang)

28−import qualified Text.Pandoc.Class as P

27+import Text.Pandoc.Class.PandocMonad (PandocMonad, report, toLang)

28+import qualified Text.Pandoc.Class.PandocMonad as P

2929import Text.Pandoc.Definition

3030import Text.Pandoc.ImageSize

3131import Text.Pandoc.Logging

src/Text/Pandoc/Writers/OOXML.hs+1−1

@@ -32,7 +32,7 @@ import qualified Data.ByteString.Lazy as BL

3232import qualified Data.ByteString.Lazy.Char8 as BL8

3333import Data.Maybe (mapMaybe)

3434import qualified Data.Text as T

35−import Text.Pandoc.Class (PandocMonad)

35+import Text.Pandoc.Class.PandocMonad (PandocMonad)

3636import qualified Text.Pandoc.UTF8 as UTF8

3737import Text.XML.Light as XML

3838

src/Text/Pandoc/Writers/OPML.hs+1−1

@@ -15,7 +15,7 @@ module Text.Pandoc.Writers.OPML ( writeOPML) where

1515import Data.Text (Text)

1616import qualified Data.Text as T

1717import qualified Text.Pandoc.Builder as B

18−import Text.Pandoc.Class (PandocMonad)

18+import Text.Pandoc.Class.PandocMonad (PandocMonad)

1919import Data.Time

2020import Text.Pandoc.Definition

2121import Text.Pandoc.Options

src/Text/Pandoc/Writers/OpenDocument.hs+2−2

@@ -25,8 +25,8 @@ import qualified Data.Set as Set

2525import Data.Text (Text)

2626import qualified Data.Text as T

2727import Text.Pandoc.BCP47 (Lang (..), parseBCP47)

28−import Text.Pandoc.Class (PandocMonad, report, translateTerm,

29− setTranslations, toLang)

28+import Text.Pandoc.Class.PandocMonad (PandocMonad, report, translateTerm,

29+ setTranslations, toLang)

3030import Text.Pandoc.Definition

3131import Text.Pandoc.Logging

3232import Text.Pandoc.Options

src/Text/Pandoc/Writers/Org.hs+1−1

@@ -20,7 +20,7 @@ import Data.Char (isAlphaNum)

2020import Data.List (intersect, intersperse, partition, transpose)

2121import Data.Text (Text)

2222import qualified Data.Text as T

23−import Text.Pandoc.Class (PandocMonad, report)

23+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

2424import Text.Pandoc.Definition

2525import Text.Pandoc.Logging

2626import Text.Pandoc.Options

src/Text/Pandoc/Writers/Powerpoint.hs+1−1

@@ -24,7 +24,7 @@ module Text.Pandoc.Writers.Powerpoint (writePowerpoint) where

2424import Codec.Archive.Zip

2525import Text.Pandoc.Definition

2626import Text.Pandoc.Walk

27−import Text.Pandoc.Class (PandocMonad, report)

27+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

2828import Text.Pandoc.Options (WriterOptions)

2929import Text.Pandoc.Writers.Shared (fixDisplayMath)

3030import Text.Pandoc.Writers.Powerpoint.Presentation (documentToPresentation)

src/Text/Pandoc/Writers/Powerpoint/Output.hs+2−2

@@ -31,9 +31,9 @@ import System.FilePath.Posix (splitDirectories, splitExtension, takeExtension)

3131import Text.XML.Light

3232import Text.Pandoc.Definition

3333import qualified Text.Pandoc.UTF8 as UTF8

34−import Text.Pandoc.Class (PandocMonad)

34+import Text.Pandoc.Class.PandocMonad (PandocMonad)

3535import Text.Pandoc.Error (PandocError(..))

36−import qualified Text.Pandoc.Class as P

36+import qualified Text.Pandoc.Class.PandocMonad as P

3737import Text.Pandoc.Options

3838import Text.Pandoc.MIME

3939import qualified Data.ByteString.Lazy as BL

src/Text/Pandoc/Writers/RST.hs+1−1

@@ -21,7 +21,7 @@ import Data.Maybe (fromMaybe)

2121import qualified Data.Text as T

2222import Data.Text (Text)

2323import qualified Text.Pandoc.Builder as B

24−import Text.Pandoc.Class (PandocMonad, report)

24+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

2525import Text.Pandoc.Definition

2626import Text.Pandoc.ImageSize

2727import Text.Pandoc.Logging

src/Text/Pandoc/Writers/RTF.hs+2−2

@@ -20,8 +20,8 @@ import Data.Char (chr, isDigit, ord)

2020import qualified Data.Map as M

2121import Data.Text (Text)

2222import qualified Data.Text as T

23−import Text.Pandoc.Class (PandocMonad, report)

24−import qualified Text.Pandoc.Class as P

23+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

24+import qualified Text.Pandoc.Class.PandocMonad as P

2525import Text.Pandoc.Definition

2626import Text.Pandoc.Error

2727import Text.Pandoc.ImageSize

src/Text/Pandoc/Writers/Roff.hs+1−1

@@ -27,7 +27,7 @@ import Data.Text (Text)

2727import qualified Data.Text as Text

2828import Data.String

2929import Data.Maybe (fromMaybe, isJust, catMaybes)

30−import Text.Pandoc.Class (PandocMonad)

30+import Text.Pandoc.Class.PandocMonad (PandocMonad)

3131import Text.Pandoc.Definition

3232import Text.DocLayout

3333import Text.Printf (printf)

src/Text/Pandoc/Writers/TEI.hs+1−1

@@ -14,7 +14,7 @@ Conversion of 'Pandoc' documents to Docbook XML.

1414module Text.Pandoc.Writers.TEI (writeTEI) where

1515import Data.Text (Text)

1616import qualified Data.Text as T

17−import Text.Pandoc.Class (PandocMonad, report)

17+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

1818import Text.Pandoc.Definition

1919import Text.Pandoc.Highlighting (languages, languagesByExtension)

2020import Text.Pandoc.ImageSize

src/Text/Pandoc/Writers/Texinfo.hs+1−1

@@ -22,7 +22,7 @@ import Data.Text (Text)

2222import qualified Data.Text as T

2323import Network.URI (unEscapeString)

2424import System.FilePath

25−import Text.Pandoc.Class (PandocMonad, report)

25+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

2626import Text.Pandoc.Definition

2727import Text.Pandoc.Error

2828import Text.Pandoc.ImageSize

src/Text/Pandoc/Writers/Textile.hs+1−1

@@ -18,7 +18,7 @@ import Control.Monad.State.Strict

1818import Data.Char (isSpace)

1919import Data.Text (Text)

2020import qualified Data.Text as T

21−import Text.Pandoc.Class (PandocMonad, report)

21+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

2222import Text.Pandoc.Definition

2323import Text.Pandoc.ImageSize

2424import Text.Pandoc.Logging

src/Text/Pandoc/Writers/XWiki.hs+1−1

@@ -37,7 +37,7 @@ import Control.Monad.Reader (ReaderT, asks, local, runReaderT)

3737import qualified Data.Set as Set

3838import qualified Data.Text as Text

3939import Data.Text (Text, intercalate, replace, split)

40−import Text.Pandoc.Class (PandocMonad, report)

40+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

4141import Text.Pandoc.Definition

4242import Text.Pandoc.Logging

4343import Text.Pandoc.Options

src/Text/Pandoc/Writers/ZimWiki.hs+1−1

@@ -25,7 +25,7 @@ import Text.DocLayout (render, literal)

2525import Data.Maybe (fromMaybe)

2626import Data.Text (Text)

2727import qualified Data.Text as T

28−import Text.Pandoc.Class (PandocMonad, report)

28+import Text.Pandoc.Class.PandocMonad (PandocMonad, report)

2929import Text.Pandoc.Definition

3030import Text.Pandoc.ImageSize

3131import Text.Pandoc.Logging