aboutsummaryrefslogtreecommitdiff
path: root/pandoc-cli/src
diff options
context:
space:
mode:
authorAlbert Krewinkel <[email protected]>2022-09-29 14:09:48 +0200
committerJohn MacFarlane <[email protected]>2022-09-30 08:33:40 -0700
commit0ab014ed1e5890e338792fab98aecc45cd889f99 (patch)
tree7b89e14ed2af8f31e4fac51719550d72239095c7 /pandoc-cli/src
parent78814f27e07e2b9953ac1aba7f9646c3dca15a13 (diff)
[API Change] App: parameterize `options` over the scripting engine
Diffstat (limited to 'pandoc-cli/src')
-rw-r--r--pandoc-cli/src/pandoc.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/pandoc-cli/src/pandoc.hs b/pandoc-cli/src/pandoc.hs
index ca5cf6651..216198291 100644
--- a/pandoc-cli/src/pandoc.hs
+++ b/pandoc-cli/src/pandoc.hs
@@ -20,7 +20,7 @@ import Text.Pandoc.App ( convertWithOpts, defaultOpts, options
, parseOptionsFromArgs)
import Text.Pandoc.Class (runIOorExplode)
import Text.Pandoc.Error (handleError)
-import Text.Pandoc.Lua (runLua, runLuaNoEnv)
+import Text.Pandoc.Lua (getEngine, runLua, runLuaNoEnv)
import Text.Pandoc.Shared (pandocVersionText)
import qualified Text.Pandoc.UTF8 as UTF8
import PandocCLI.Server
@@ -37,8 +37,10 @@ main = E.handle (handleError . Left) $ do
case rawArgs of
"lua" : args -> runLuaInterpreter "pandoc lua" args
"serve" : args -> runServer args
- _ -> parseOptionsFromArgs options defaultOpts prg rawArgs
- >>= convertWithOpts
+ _ -> do
+ engine <- getEngine
+ let opts = options engine
+ parseOptionsFromArgs opts defaultOpts prg rawArgs >>= convertWithOpts
-- | Runs pandoc as a Lua interpreter that is (mostly) compatible with
-- the default @lua@ program shipping with Lua.