From 3692a1d1e83703fbf235214f2838cd92683c625c Mon Sep 17 00:00:00 2001
From: Albert Krewinkel <albert@zeitkraut.de>
Date: Sun, 28 Nov 2021 02:08:01 +0100
Subject: Lua: use package pandoc-lua-marshal (#7719)

The marshaling functions for pandoc's AST are extracted into a separate
package. The package comes with a number of changes:

  - Pandoc's List module was rewritten in C, thereby improving error
    messages.

  - Lists of `Block` and `Inline` elements are marshaled using the new
    list types `Blocks` and `Inlines`, respectively. These types
    currently behave identical to the generic List type, but give better
    error messages. This also opens up the possibility of adding
    element-specific methods to these lists in the future.

  - Elements of type `MetaValue` are no longer pushed as values which
    have `.t` and `.tag` properties. This was already true for
    `MetaString` and `MetaBool` values, which are still marshaled as Lua
    strings and booleans, respectively. Affected values:

      + `MetaBlocks` values are marshaled as a `Blocks` list;

      + `MetaInlines` values are marshaled as a `Inlines` list;

      + `MetaList` values are marshaled as a generic pandoc `List`s.

      + `MetaMap` values are marshaled as plain tables and no longer
        given any metatable.

  - The test suite for marshaled objects and their constructors has
    been extended and improved.

  - A bug in Citation objects, where setting a citation's suffix
    modified it's prefix, has been fixed.
---
 pandoc.cabal | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'pandoc.cabal')

diff --git a/pandoc.cabal b/pandoc.cabal
index 99962ac4c..e7d1349fc 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -177,10 +177,6 @@ data-files:
                  data/creole.lua
                  -- lua init script
                  data/init.lua
-                 -- pandoc lua module
-                 data/pandoc.lua
-                 -- lua List module
-                 data/pandoc.List.lua
                  -- bash completion template
                  data/bash_completion.tpl
                  -- citeproc
@@ -481,6 +477,7 @@ library
                  mtl                   >= 2.2      && < 2.3,
                  network               >= 2.6,
                  network-uri           >= 2.6      && < 2.8,
+                 pandoc-lua-marshal    >= 0.1      && < 0.2,
                  pandoc-types          >= 1.22.1   && < 1.23,
                  parsec                >= 3.1      && < 3.2,
                  pretty                >= 1.1      && < 1.2,
@@ -689,21 +686,16 @@ library
                    Text.Pandoc.Lua.Filter,
                    Text.Pandoc.Lua.Global,
                    Text.Pandoc.Lua.Init,
-                   Text.Pandoc.Lua.Marshaling,
-                   Text.Pandoc.Lua.Marshaling.AST,
-                   Text.Pandoc.Lua.Marshaling.Attr,
-                   Text.Pandoc.Lua.Marshaling.CommonState,
-                   Text.Pandoc.Lua.Marshaling.Context,
-                   Text.Pandoc.Lua.Marshaling.List,
-                   Text.Pandoc.Lua.Marshaling.ListAttributes,
-                   Text.Pandoc.Lua.Marshaling.PandocError,
-                   Text.Pandoc.Lua.Marshaling.ReaderOptions,
-                   Text.Pandoc.Lua.Marshaling.SimpleTable,
+                   Text.Pandoc.Lua.Marshal.CommonState,
+                   Text.Pandoc.Lua.Marshal.Context,
+                   Text.Pandoc.Lua.Marshal.PandocError,
+                   Text.Pandoc.Lua.Marshal.ReaderOptions,
                    Text.Pandoc.Lua.Module.MediaBag,
                    Text.Pandoc.Lua.Module.Pandoc,
                    Text.Pandoc.Lua.Module.System,
                    Text.Pandoc.Lua.Module.Types,
                    Text.Pandoc.Lua.Module.Utils,
+                   Text.Pandoc.Lua.Orphans,
                    Text.Pandoc.Lua.Packages,
                    Text.Pandoc.Lua.PandocLua,
                    Text.Pandoc.Lua.Util,
-- 
cgit v1.2.3