diff --git a/pandoc-lua-engine.cabal b/pandoc-lua-engine.cabal --- a/pandoc-lua-engine.cabal +++ b/pandoc-lua-engine.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: pandoc-lua-engine -version: 0.3.3 +version: 0.4 build-type: Simple license: GPL-2.0-or-later license-file: COPYING.md @@ -110,7 +110,7 @@ , crypton >= 0.30 && < 1.1 , citeproc >= 0.8 && < 0.9 , containers >= 0.6.0.1 && < 0.8 - , data-default >= 0.4 && < 0.8 + , data-default >= 0.4 && < 0.9 , doclayout >= 0.5 && < 0.6 , doctemplates >= 0.11 && < 0.12 , exceptions >= 0.8 && < 0.11 @@ -124,8 +124,8 @@ , hslua-repl >= 0.1.1 && < 0.2 , lpeg >= 1.1 && < 1.2 , mtl >= 2.2 && < 2.4 - , pandoc >= 3.5 && < 3.6 - , pandoc-lua-marshal >= 0.2.9 && < 0.3 + , pandoc >= 3.6 && < 3.7 + , pandoc-lua-marshal >= 0.3 && < 0.4 , pandoc-types >= 1.22 && < 1.24 , parsec >= 3.1 && < 3.2 , text >= 1.1.1 && < 2.2 diff --git a/src/Text/Pandoc/Lua/Marshal/Chunks.hs b/src/Text/Pandoc/Lua/Marshal/Chunks.hs --- a/src/Text/Pandoc/Lua/Marshal/Chunks.hs +++ b/src/Text/Pandoc/Lua/Marshal/Chunks.hs @@ -30,7 +30,7 @@ pushChunk = pushUD typeChunk typeChunk :: LuaError e => DocumentedType e Chunk -typeChunk = deftype "pandoc.Chunk" +typeChunk = deftype "Chunk" [ operation Tostring $ lambda ### liftPure show <#> udparam typeChunk "chunk" "chunk to print in native format" @@ -103,7 +103,7 @@ -- | Lua type for 'ChunkedDoc' values. typeChunkedDoc :: LuaError e => DocumentedType e ChunkedDoc -typeChunkedDoc = deftype "pandoc.ChunkedDoc" +typeChunkedDoc = deftype "ChunkedDoc" [] [ readonly "chunks" "list of chunks that make up the document" diff --git a/src/Text/Pandoc/Lua/Marshal/CommonState.hs b/src/Text/Pandoc/Lua/Marshal/CommonState.hs --- a/src/Text/Pandoc/Lua/Marshal/CommonState.hs +++ b/src/Text/Pandoc/Lua/Marshal/CommonState.hs @@ -22,7 +22,7 @@ -- | Lua type used for the @CommonState@ object. typeCommonState :: LuaError e => DocumentedType e CommonState -typeCommonState = deftype "pandoc CommonState" [] +typeCommonState = deftype "CommonState" [] [ readonly "input_files" "input files passed to pandoc" (pushPandocList pushString, stInputFiles) diff --git a/src/Text/Pandoc/Lua/Marshal/LogMessage.hs b/src/Text/Pandoc/Lua/Marshal/LogMessage.hs --- a/src/Text/Pandoc/Lua/Marshal/LogMessage.hs +++ b/src/Text/Pandoc/Lua/Marshal/LogMessage.hs @@ -19,7 +19,7 @@ -- | Type definition for pandoc log messages. typeLogMessage :: LuaError e => DocumentedType e LogMessage -typeLogMessage = deftype "pandoc LogMessage" +typeLogMessage = deftype "LogMessage" [ operation Index $ defun "__tostring" ### liftPure showLogMessage <#> udparam typeLogMessage "msg" "object" diff --git a/src/Text/Pandoc/Lua/Marshal/Sources.hs b/src/Text/Pandoc/Lua/Marshal/Sources.hs --- a/src/Text/Pandoc/Lua/Marshal/Sources.hs +++ b/src/Text/Pandoc/Lua/Marshal/Sources.hs @@ -25,7 +25,7 @@ pushSources :: LuaError e => Pusher e Sources pushSources (Sources srcs) = do pushList (pushUD typeSource) srcs - newListMetatable "pandoc Sources" $ do + newListMetatable "Sources" $ do pushName "__tostring" pushHaskellFunction $ do sources <- forcePeek $ peekList (peekUD typeSource) (nthBottom 1) @@ -43,7 +43,7 @@ -- | Source object type. typeSource :: LuaError e => DocumentedType e (SourcePos, Text) -typeSource = deftype "pandoc input source" +typeSource = deftype "Source" [ operation Tostring $ lambda ### liftPure snd <#> udparam typeSource "srcs" "Source to print in native format" diff --git a/src/Text/Pandoc/Lua/Marshal/Template.hs b/src/Text/Pandoc/Lua/Marshal/Template.hs --- a/src/Text/Pandoc/Lua/Marshal/Template.hs +++ b/src/Text/Pandoc/Lua/Marshal/Template.hs @@ -40,4 +40,4 @@ -- | Template object type. typeTemplate :: LuaError e => DocumentedType e (Template Text) -typeTemplate = deftype "pandoc Template" [] [] +typeTemplate = deftype "Template" [] [] diff --git a/src/Text/Pandoc/Lua/Module/Image.hs b/src/Text/Pandoc/Lua/Module/Image.hs --- a/src/Text/Pandoc/Lua/Module/Image.hs +++ b/src/Text/Pandoc/Lua/Module/Image.hs @@ -75,7 +75,7 @@ , "throws an error if the given string is not an image, or if the size" , "of the image cannot be determined." , "" - , "The resulting table has four entires: *width*, *height*, *dpi\\_horz*," + , "The resulting table has four entries: *width*, *height*, *dpi\\_horz*," , "and *dpi\\_vert*." , "" , "The `opts` parameter, when given, should be either a WriterOptions" diff --git a/test/lua/module/pandoc-structure.lua b/test/lua/module/pandoc-structure.lua --- a/test/lua/module/pandoc-structure.lua +++ b/test/lua/module/pandoc-structure.lua @@ -59,7 +59,7 @@ test('returns a chunked doc', function () assert.are_equal( pandoc.utils.type(structure.split_into_chunks(pandoc.Pandoc{})), - 'pandoc.ChunkedDoc' + 'ChunkedDoc' ) end), }, diff --git a/test/lua/module/pandoc-template.lua b/test/lua/module/pandoc-template.lua --- a/test/lua/module/pandoc-template.lua +++ b/test/lua/module/pandoc-template.lua @@ -55,14 +55,14 @@ test('returns a Template', function () assert.are_equal( pandoc.utils.type(template.compile('$title$')), - 'pandoc Template' + 'Template' ) end), test('returns a Template', function () local templ_path = pandoc.path.join{'lua', 'module', 'default.test'} assert.are_equal( pandoc.utils.type(template.compile('${ partial() }', templ_path)), - 'pandoc Template' + 'Template' ) end), test('fails if template has non-existing partial', function () @@ -76,7 +76,7 @@ assert.are_equal(type(jats_template), 'string') assert.are_equal( pandoc.utils.type(template.compile(jats_template)), - 'pandoc Template' + 'Template' ) end), },