Merge branch 'main' into bugfix/github-issue-1954

Author: jjallaire

news/changelog-1.1.md

@@ -135,6 +135,7 @@
 - Properly handle duplicated affilations in author metadata (#1286)
 - Display image path when an error occurs reading PNG metadata
 - `quarto run` preserves stdout and stderr (#1954)
+- Lua filters: quarto.utils.dump does not loop on circular structures
 
 ## Format Templates
 

src/resources/filters/common/debug.lua

@@ -11,8 +11,15 @@ function dump(o)
 end
 
 -- improved formatting for dumping tables
-function tdump (tbl, indent)
+function tdump (tbl, indent, refs)
+  if not refs then refs = {} end
   if not indent then indent = 0 end
+  local address = string.format("%p", tbl)
+  if refs[address] ~= nil then
+    print(string.rep("  ", indent) .. "(circular reference to " .. address .. ")")
+    return
+  end
+
   if tbl.t then
     print(string.rep("  ", indent) .. tbl.t)
   end
@@ -22,7 +29,8 @@ function tdump (tbl, indent)
     formatting = string.rep("  ", indent) .. k .. ": "
     if type(v) == "table" then
       print(formatting)
-      tdump(v, indent+1)
+      refs[address] = true
+      tdump(v, indent+1, refs)
     elseif type(v) == 'boolean' then
       print(formatting .. tostring(v))
     elseif (v ~= nil) then 

src/resources/formats/html/templates/quarto-html.ejs

@@ -295,7 +295,7 @@ window.document.addEventListener("DOMContentLoaded", function (event) {
     const ref = noterefs[i];
     tippyHover(ref, function() {
       // use id or data attribute instead here
-      let href = ref.getAttribute('data-footnote-href');
+      let href = ref.getAttribute('data-footnote-href') || ref.getAttribute('href');
       try { href = new URL(href).hash; } catch {}
       const id = href.replace(/^#\/?/, "");
       const note = window.document.getElementById(id);

src/resources/pandoc/datadir/_utils.lua

@@ -1,8 +1,15 @@
 -- debug.lua
 -- Copyright (C) 2020 by RStudio, PBC
 -- improved formatting for dumping tables
-function tdump (tbl, indent)
+function tdump (tbl, indent, refs)
+  if not refs then refs = {} end
   if not indent then indent = 0 end
+  local address = string.format("%p", tbl)
+  if refs[address] ~= nil then
+    print(string.rep("  ", indent) .. "(circular reference to " .. address .. ")")
+    return
+  end
+
   if tbl.t then
     print(string.rep("  ", indent) .. tbl.t)
   end
@@ -11,8 +18,9 @@ function tdump (tbl, indent)
     empty = false
     formatting = string.rep("  ", indent) .. k .. ": "
     if type(v) == "table" then
-      print(formatting)
-      tdump(v, indent+1)
+      print(formatting .. "table: " .. address)
+      refs[address] = true
+      tdump(v, indent+1, refs)
     elseif type(v) == 'boolean' then
       print(formatting .. tostring(v))
     elseif (v ~= nil) then