diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2021-08-22 12:01:28 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2021-08-24 22:17:52 -0700 |
| commit | 0df003b099ca16bddee215d6b9f151591f57c6d1 (patch) | |
| tree | 069b9c90df61075b5cd8cadcdf3b929881e3fa75 /src/Text/Pandoc/Writers | |
| parent | 7ff06a8c43019f56db3e647a55d4d8ec82d2fd62 (diff) | |
| download | pandoc-0df003b099ca16bddee215d6b9f151591f57c6d1.tar.gz | |
Lua subsystem and custom writers: generalize types from PandocIO...
to any instance of PandocMonad and MonadIO.
This involves an API change, since the type of
runLua is now
(PandocMonad m, MonadIO m) => Lua a -> m (Either PandocError a)
Diffstat (limited to 'src/Text/Pandoc/Writers')
| -rw-r--r-- | src/Text/Pandoc/Writers/Custom.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/Custom.hs b/src/Text/Pandoc/Writers/Custom.hs index 58c4bb5be..1e9f37d2f 100644 --- a/src/Text/Pandoc/Writers/Custom.hs +++ b/src/Text/Pandoc/Writers/Custom.hs @@ -22,11 +22,12 @@ import qualified Data.Text as T import Data.Text (Text, pack) import Foreign.Lua (Lua, Pushable) import Text.DocLayout (render, literal) -import Text.Pandoc.Class.PandocIO (PandocIO) +import Control.Monad.IO.Class (MonadIO) import Text.Pandoc.Definition import Text.Pandoc.Lua (Global (..), runLua, setGlobals) import Text.Pandoc.Lua.Util (addField, dofileWithTraceback) import Text.Pandoc.Options +import Text.Pandoc.Class (PandocMonad) import Text.Pandoc.Templates (renderTemplate) import Text.Pandoc.Writers.Shared @@ -79,7 +80,8 @@ instance (Pushable a, Pushable b) => Pushable (KeyValue a b) where Lua.rawset (Lua.nthFromTop 3) -- | Convert Pandoc to custom markup. -writeCustom :: FilePath -> WriterOptions -> Pandoc -> PandocIO Text +writeCustom :: (PandocMonad m, MonadIO m) + => FilePath -> WriterOptions -> Pandoc -> m Text writeCustom luaFile opts doc@(Pandoc meta _) = do let globals = [ PANDOC_DOCUMENT doc , PANDOC_SCRIPT_FILE luaFile |