diff options
| -rw-r--r-- | data/pandoc.lua | 23 | ||||
| -rw-r--r-- | src/Text/Pandoc/Lua/PandocModule.hs | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/data/pandoc.lua b/data/pandoc.lua index e6cfbc90c..fc83103e0 100644 --- a/data/pandoc.lua +++ b/data/pandoc.lua @@ -790,6 +790,29 @@ function M.read(markup, format) end end +--- Runs command with arguments, passing it some input, and returns the output. +-- @treturn string Output of command. +-- @usage +-- local ec, output = pandoc.pipe("sed", {"-e","s/a/b/"}, "abc") +function M.pipe (command, args, input) + local ec, output = pandoc._pipe(command, args, input) + if ec ~= 0 then + err = setmetatable( + { command = command, error_code = ec, output = output}, + { __tostring = function(e) + return "Error running " .. e.command + .. " (error code " .. e.error_code .. "): " + .. e.output + end + } + ) + -- TODO: drop the wrapping call to `tostring` as soon as hslua supports + -- non-string error objects. + error(tostring(err)) + end + return output +end + --- Use functions defined in the global namespace to create a pandoc filter. -- All globally defined functions which have names of pandoc elements are -- collected into a new table. diff --git a/src/Text/Pandoc/Lua/PandocModule.hs b/src/Text/Pandoc/Lua/PandocModule.hs index c689edc4e..f9b072dff 100644 --- a/src/Text/Pandoc/Lua/PandocModule.hs +++ b/src/Text/Pandoc/Lua/PandocModule.hs @@ -63,7 +63,7 @@ pushPandocModule datadir = do script <- liftIO (pandocModuleScript datadir) status <- Lua.loadstring script unless (status /= Lua.OK) $ Lua.call 0 1 - addFunction "pipe" pipeFn + addFunction "_pipe" pipeFn addFunction "_read" readDoc addFunction "sha1" sha1HashFn |