Merge pull request #141 from Omikhleia/fix-shallow-copy-issue

fix: Djot user-defined pseudo-symbols nesting issue

Author: Omikhleia

packages/markdown/commands.lua

@@ -4,7 +4,7 @@
 -- Split in a standalone package so that it can be reused and
 -- generalized somewhat independently from the underlying parsing code.
 --
--- @copyright License: MIT (c) 2022-2024 Omikhleia, Didier Willis
+-- @copyright License: MIT (c) 2022-2025 Omikhleia, Didier Willis
 -- @module packages.markdown.commands
 --
 require("silex.lang") -- Compatibility layer
@@ -103,7 +103,9 @@ local function decimalFilter (input, _)
 end
 
 local function wrapLinkContent (options, content)
-  local passedOptions = pl.tablex.copy(options) -- shallow
+  -- shallow copy before removing internal options
+  -- (Content may be reused in pseudo-symbol macros or other means)
+  local passedOptions = pl.tablex.copy(options)
   -- We already took care of these.
   passedOptions.src = nil
   passedOptions.id = nil
@@ -247,9 +249,12 @@ function package:registerCommands ()
         -- We'll want the ID to apply to the captioning environment (to potentially
         -- use the caption numbering)
         local id = image.options.id
-        image.options.id = nil
+        local imgOptions = pl.tablex.copy(image.options)
+        -- Shallow copy before removing internal options
+        -- (Content may be reused in pseudo-symbol macros or other means)
+        imgOptions.id = nil
         -- We also propagate image options to the englobing environment
-        SILE.call("markdown:internal:captioned-figure", image.options, {
+        SILE.call("markdown:internal:captioned-figure", imgOptions, {
           image,
           createCommand("caption", {}, {
             createCommand("label", { marker = id }),
@@ -508,6 +513,9 @@ Please consider using a resilient-compatible class!]])
       if not (self.hasPackageSupport.piecharts or self.hasPackageSupport.piechart) then -- HACK Some early versions of piecharts have the wrong internal name
         SU.error("No piecharts package available to render CSV data ".. uri)
       end
+      -- Shallow copy before removing internal options
+      -- (Content may be reused in pseudo-symbol macros or other means)
+      options = pl.tablex.copy(options)
       options.src = nil
       options.csvfile = uri
       SILE.call("piechart", options)
@@ -848,6 +856,9 @@ Please consider using a resilient-compatible class!]])
       local text = ":" .. symbol .. ":"
       content = { text }
     end
+    -- Shallow copy before removing internal options
+    -- (Content may be reused in pseudo-symbol macros or other means)
+    options = pl.tablex.copy(options)
     options._symbol_ = nil
     options._standalone_ = nil
     if next(options) and not standalone then

rockspecs/markdown.sile-2.3.2-1.rockspec

@@ -0,0 +1,62 @@
+rockspec_format = "3.0"
+package = "markdown.sile"
+version = "2.3.2-1"
+source = {
+    url = "git+https://github.com/Omikhleia/markdown.sile.git",
+    tag = "v2.3.2",
+}
+description = {
+  summary = "Native Markdown support for the SILE typesetting system.",
+  detailed = [[
+    This package set for the SILE typesetting system provides a complete redesign
+    of the native Markdown support for SILE, with a great set of Pandoc-like
+    extensions and plenty of extra goodies.
+  ]],
+  homepage = "https://github.com/Omikhleia/markdown.sile",
+  license = "MIT",
+}
+dependencies = {
+   "lua >= 5.1",
+   "embedders.sile >= 0.2.0",
+   "labelrefs.sile >= 0.1.0",
+   "ptable.sile >= 3.1.0",
+   "smartquotes.sile >= 1.0.0",
+   "textsubsuper.sile >= 1.2.0",
+   "silex.sile >= 0.8.0, < 1.0",
+   "lunajson",
+}
+
+build = {
+   type = "builtin",
+   modules = {
+      ["sile.classes.markdown"]           = "classes/markdown.lua",
+      ["sile.inputters.markdown"]         = "inputters/markdown.lua",
+      ["sile.inputters.pandocast"]        = "inputters/pandocast.lua",
+      ["sile.inputters.djot"]             = "inputters/djot.lua",
+      ["sile.packages.markdown"]          = "packages/markdown/init.lua",
+      ["sile.packages.markdown.cmbase"]   = "packages/markdown/cmbase.lua",
+      ["sile.packages.markdown.commands"] = "packages/markdown/commands.lua",
+      ["sile.packages.markdown.utils"]    = "packages/markdown/utils.lua",
+      ["sile.packages.pandocast"]         = "packages/pandocast/init.lua",
+      ["sile.packages.djot"]              = "packages/djot/init.lua",
+
+      ["sile.lunamark"]                 = "lua-libraries/lunamark.lua",
+      ["sile.lunamark.entities"]        = "lua-libraries/lunamark/entities.lua",
+      ["sile.lunamark.reader"]          = "lua-libraries/lunamark/reader.lua",
+      ["sile.lunamark.reader.markdown"] = "lua-libraries/lunamark/reader/markdown.lua",
+      ["sile.lunamark.util"]            = "lua-libraries/lunamark/util.lua",
+      ["sile.lunamark.writer"]          = "lua-libraries/lunamark/writer.lua",
+      ["sile.lunamark.writer.generic"]  = "lua-libraries/lunamark/writer/generic.lua",
+      ["sile.lunamark.writer.html"]     = "lua-libraries/lunamark/writer/html.lua",
+      ["sile.lunamark.writer.html5"]    = "lua-libraries/lunamark/writer/html5.lua",
+
+      ["sile.djot"]                     = "lua-libraries/djot.lua",
+      ["sile.djot.attributes"]          = "lua-libraries/djot/attributes.lua",
+      ["sile.djot.json"]                = "lua-libraries/djot/json.lua",
+      ["sile.djot.block"]               = "lua-libraries/djot/block.lua",
+      ["sile.djot.inline"]              = "lua-libraries/djot/inline.lua",
+      ["sile.djot.html"]                = "lua-libraries/djot/html.lua",
+      ["sile.djot.ast"]                 = "lua-libraries/djot/ast.lua",
+      ["sile.djot.filter"]              = "lua-libraries/djot/filter.lua",
+   }
+}