nodetree (18sep24)

git-svn-id: svn://tug.org/texlive/trunk@72318 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 34 insertions, 27 deletions

diff --git a/Master/texmf-dist/doc/luatex/nodetree/README.md b/Master/texmf-dist/doc/luatex/nodetree/README.md
index f9fdb53fff9..71297fb7f14 100644
--- a/Master/texmf-dist/doc/luatex/nodetree/README.md
+++ b/Master/texmf-dist/doc/luatex/nodetree/README.md
@@ -18,7 +18,7 @@ terminal to generate the document.
 
 # License
 
-Copyright (C) 2016-2023 by Josef Friedrich <josef@friedrich.rocks>
+Copyright (C) 2016-2024 by Josef Friedrich <josef@friedrich.rocks>
 ------------------------------------------------------------------------
 This work may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version 1.3 of this license
@@ -150,8 +150,8 @@ if not modules then modules = { } end modules ['nodetree'] = {
 ### Update the copyright year:
 
 ```
-sed -i 's/(C) 2016-2023/(C) 2016-2021/g' nodetree.ins
-sed -i 's/(C) 2016-2023/(C) 2016-2021/g' nodetree.dtx
+sed -i 's/(C) 2016-2024/(C) 2016-2021/g' nodetree.ins
+sed -i 's/(C) 2016-2024/(C) 2016-2021/g' nodetree.dtx
 ```
 
 ### Command line tasks:
diff --git a/Master/texmf-dist/doc/luatex/nodetree/nodetree-doc.tex b/Master/texmf-dist/doc/luatex/nodetree/nodetree-doc.tex
index d9531ad9f25..c992d70246d 100644
--- a/Master/texmf-dist/doc/luatex/nodetree/nodetree-doc.tex
+++ b/Master/texmf-dist/doc/luatex/nodetree/nodetree-doc.tex
@@ -107,7 +107,7 @@
   \href{https://github.com/Josef-Friedrich/nodetree}{github.com/Josef-Friedrich/nodetree}\\%
   with contributions by Werner Lemberg
 }
-\date{v2.3.0 from 2023/09/10}
+\date{v2.4.0 from 2024/09/17}
 
 \maketitle
 
diff --git a/Master/texmf-dist/doc/luatex/nodetree/nodetree.pdf b/Master/texmf-dist/doc/luatex/nodetree/nodetree.pdf
index c15b1e5c17f..6c228dbe58a 100644
--- a/Master/texmf-dist/doc/luatex/nodetree/nodetree.pdf
+++ b/Master/texmf-dist/doc/luatex/nodetree/nodetree.pdf
diff --git a/Master/texmf-dist/source/luatex/nodetree/nodetree.dtx b/Master/texmf-dist/source/luatex/nodetree/nodetree.dtx
index 0b3668a8cec..6c274899d33 100644
--- a/Master/texmf-dist/source/luatex/nodetree/nodetree.dtx
+++ b/Master/texmf-dist/source/luatex/nodetree/nodetree.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2016-2023 by Josef Friedrich <josef@friedrich.rocks>
+% Copyright (C) 2016-2024 by Josef Friedrich <josef@friedrich.rocks>
 % ----------------------------------------------------------------------
 % This work may be distributed and/or modified under the conditions of
 % the LaTeX Project Public License, either version 1.3 of this license
@@ -28,7 +28,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{nodetree}
 %<*package>
-    [2023/09/10 v2.3.0 Visualize node lists in a tree view]
+    [2024/09/17 v2.4.0 Visualize node lists in a tree view]
 %</package>
 % \fi
 %
@@ -218,7 +218,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
 \ProvidesPackage{nodetree-embed}
-  [2023/09/10 v2.3.0 Embed node trees into a LaTeX document]
+  [2024/09/17 v2.4.0 Embed node trees into a LaTeX document]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/luatex/nodetree/nodetree.ins b/Master/texmf-dist/source/luatex/nodetree/nodetree.ins
index e1ded5bb1b8..fce0ba7c8db 100644
--- a/Master/texmf-dist/source/luatex/nodetree/nodetree.ins
+++ b/Master/texmf-dist/source/luatex/nodetree/nodetree.ins
@@ -1,4 +1,4 @@
-% Copyright (C) 2016-2023 by Josef Friedrich <josef@friedrich.rocks>
+% Copyright (C) 2016-2024 by Josef Friedrich <josef@friedrich.rocks>
 % ----------------------------------------------------------------------
 % This work may be distributed and/or modified under the conditions of
 % the LaTeX Project Public License, either version 1.3c of this license
@@ -21,7 +21,7 @@
 
 This is a generated file.
 
-Copyright (C) 2016-2023 by Josef Friedrich <josef@friedrich.rocks>
+Copyright (C) 2016-2024 by Josef Friedrich <josef@friedrich.rocks>
 ----------------------------------------------------------------------
 This work may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version 1.3c of this license
diff --git a/Master/texmf-dist/tex/luatex/nodetree/nodetree-embed.sty b/Master/texmf-dist/tex/luatex/nodetree/nodetree-embed.sty
index ddff12f436d..ec7ed8bd4bb 100644
--- a/Master/texmf-dist/tex/luatex/nodetree/nodetree-embed.sty
+++ b/Master/texmf-dist/tex/luatex/nodetree/nodetree-embed.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016-2023 by Josef Friedrich <josef@friedrich.rocks>
+%% Copyright (C) 2016-2024 by Josef Friedrich <josef@friedrich.rocks>
 %% ----------------------------------------------------------------------
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3c of this license
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
 \ProvidesPackage{nodetree-embed}
-  [2023/09/10 v2.3.0 Embed node trees into a LaTeX document]
+  [2024/09/17 v2.4.0 Embed node trees into a LaTeX document]
 \RequirePackage{xcolor,mdframed,expl3,xparse,fontspec}
 \input{nodetree}
 \RequirePackage{kvoptions}
diff --git a/Master/texmf-dist/tex/luatex/nodetree/nodetree.lua b/Master/texmf-dist/tex/luatex/nodetree/nodetree.lua
index 18a1f204c34..82a3e294d33 100644
--- a/Master/texmf-dist/tex/luatex/nodetree/nodetree.lua
+++ b/Master/texmf-dist/tex/luatex/nodetree/nodetree.lua
@@ -30,7 +30,7 @@
 ---  be either `continue` or `stop`.
 
 if not modules then modules = {} end modules ['nodetree'] = {
-  version   = '2.3.0',
+  version   = '2.4.0',
   comment   = 'nodetree',
   author    = 'Josef Friedrich',
   copyright = 'Josef Friedrich',
@@ -649,30 +649,37 @@ end
 
 --- Convert a Lua table into a format string.
 ---
----@param table table # A table to generate an inline view of.
+---@param tbl table # A table to generate an inline view of.
 ---
 ---@return string
-function template.table_inline(table)
+function template.table_inline(tbl)
   local tex_escape = ''
   if options.channel == 'tex' then
     tex_escape = '\\'
   end
-  if type(table) == 'table' then
-    table = get_all_table_data(table)
+  if type(tbl) == 'table' then
+    tbl = get_all_table_data(tbl)
     local output = tex_escape .. '{'
     local kv_list = ''
-    for key, value in pairs(table) do
-        if type(key) ~= 'numbers' then
-          key = '\'' ..
-            template.colored_string(key, 'cyan', 'dim') .. '\''
-        end
-        kv_list = kv_list .. '[' .. key .. '] = ' ..
-          template.table_inline(value) .. ', '
+    local keys = {}
+    for key in pairs(tbl) do
+      keys[#keys + 1] = key
+    end
+    table.sort(keys)
+    for i = 1, #keys do
+      local key = keys[i]
+      local value = tbl[key]
+      if type(key) ~= 'numbers' then
+        key = '\'' ..
+          template.colored_string(key, 'cyan', 'dim') .. '\''
+      end
+      kv_list = kv_list .. '[' .. key .. '] = ' ..
+        template.table_inline(value) .. ', '
     end
     output = output .. kv_list:gsub(', $', '')
     return output .. tex_escape .. '}'
   else
-    return tostring(table)
+    return tostring(tbl)
   end
 end
 
diff --git a/Master/texmf-dist/tex/luatex/nodetree/nodetree.sty b/Master/texmf-dist/tex/luatex/nodetree/nodetree.sty
index a450ccdf022..f27e9c856c7 100644
--- a/Master/texmf-dist/tex/luatex/nodetree/nodetree.sty
+++ b/Master/texmf-dist/tex/luatex/nodetree/nodetree.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016-2023 by Josef Friedrich <josef@friedrich.rocks>
+%% Copyright (C) 2016-2024 by Josef Friedrich <josef@friedrich.rocks>
 %% ----------------------------------------------------------------------
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3c of this license
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{nodetree}
-    [2023/09/10 v2.3.0 Visualize node lists in a tree view]
+    [2024/09/17 v2.4.0 Visualize node lists in a tree view]
 \input{nodetree}
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
diff --git a/Master/texmf-dist/tex/luatex/nodetree/nodetree.tex b/Master/texmf-dist/tex/luatex/nodetree/nodetree.tex
index 919ea275f7a..180bb1fb7c4 100644
--- a/Master/texmf-dist/tex/luatex/nodetree/nodetree.tex
+++ b/Master/texmf-dist/tex/luatex/nodetree/nodetree.tex
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2016-2023 by Josef Friedrich <josef@friedrich.rocks>
+%% Copyright (C) 2016-2024 by Josef Friedrich <josef@friedrich.rocks>
 %% ----------------------------------------------------------------------
 %% This work may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3c of this license