lua-ul (27feb24)

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

8 files changed, 21 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/lualatex/lua-ul/README b/Master/texmf-dist/doc/lualatex/lua-ul/README.md
index d4f53f32322..d4f53f32322 100644
--- a/Master/texmf-dist/doc/lualatex/lua-ul/README
+++ b/Master/texmf-dist/doc/lualatex/lua-ul/README.md
diff --git a/Master/texmf-dist/doc/lualatex/lua-ul/lua-ul.pdf b/Master/texmf-dist/doc/lualatex/lua-ul/lua-ul.pdf
index b8f1bbc8f06..103ac5c9c6b 100644
--- a/Master/texmf-dist/doc/lualatex/lua-ul/lua-ul.pdf
+++ b/Master/texmf-dist/doc/lualatex/lua-ul/lua-ul.pdf
diff --git a/Master/texmf-dist/source/lualatex/lua-ul/lua-ul.dtx b/Master/texmf-dist/source/lualatex/lua-ul/lua-ul.dtx
index addff775bc5..d3895733f40 100644
--- a/Master/texmf-dist/source/lualatex/lua-ul/lua-ul.dtx
+++ b/Master/texmf-dist/source/lualatex/lua-ul/lua-ul.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% Copyright (C) 2020-2022 by Marcel Krueger
+%% Copyright (C) 2020-2024 by Marcel Krueger
 %%
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -244,16 +244,13 @@ local callback_define
 %    \end{macrocode}
 % HACK: Do not do this at home! We need to define the engine callback directly,
 % so we use the debug library to get the ``real'' \verb+callback.define+:
+% \changes{0.2.1}{2024-02-26}{Reimplement callback patching to be TL 2024 compatible}
 %    \begin{macrocode}
-for i=1,5 do
-local name, func = require'debug'.getupvalue(luatexbase.disable_callback, i)
-  if name == 'callback_register' then
-    callback_define = func
-    break
-  end
-end
-if not callback_define then
-  error[[Unable to find callback.define]]
+do
+  local saved_luatexbase, saved_callback_register = luatexbase, callback.register
+  luatexbase.uninstall()
+  callback_define = callback.register
+  luatexbase, callback.register = saved_luatexbase, saved_callback_register
 end
 
 local function filtered_append_to_vlist_filter(box,
@@ -941,7 +938,7 @@ require'lua-ul-patches-preserve-attr'
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesExplPackage
   {lua-ul}
-  {2022-05-31}{0.2.0}{Underlining and related functionality for LuaTeX}
+  {2024-02-26}{0.2.1}{Underlining and related functionality for LuaTeX}
 % \fi
 % First define some messages.
 %    \begin{macrocode}
@@ -1206,7 +1203,7 @@ require'lua-ul-patches-preserve-attr'
   }
   \NewDocumentCommand \strikeThrough {o +m} {
     \group_begin:
-    \@strikeThrough #2
+    \@strikeThrough[#1] #2
     \group_end:
   }
 
diff --git a/Master/texmf-dist/tex/lualatex/lua-ul/docstrip-luacode.sty b/Master/texmf-dist/tex/lualatex/lua-ul/docstrip-luacode.sty
index bcd35b8c4e5..1c69c66dac8 100644
--- a/Master/texmf-dist/tex/lualatex/lua-ul/docstrip-luacode.sty
+++ b/Master/texmf-dist/tex/lualatex/lua-ul/docstrip-luacode.sty
@@ -1,4 +1,4 @@
-%% Copyright (C) 2020-2022 by Marcel Krueger
+%% Copyright (C) 2020-2024 by Marcel Krueger
 %%
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul-patches-preserve-attr.lua b/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul-patches-preserve-attr.lua
index 2b0f0720553..444567e25a5 100644
--- a/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul-patches-preserve-attr.lua
+++ b/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul-patches-preserve-attr.lua
@@ -6,7 +6,7 @@
 --
 -- lua-ul.dtx  (with options: `preserve-attr')
 -- 
--- Copyright (C) 2020-2022 by Marcel Krueger
+-- Copyright (C) 2020-2024 by Marcel Krueger
 --
 -- This file may be distributed and/or modified under the
 -- conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.lua b/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.lua
index db4acae9659..7b85a4309f1 100644
--- a/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.lua
+++ b/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.lua
@@ -6,7 +6,7 @@
 --
 -- lua-ul.dtx  (with options: `luacode')
 -- 
--- Copyright (C) 2020-2022 by Marcel Krueger
+-- Copyright (C) 2020-2024 by Marcel Krueger
 --
 -- This file may be distributed and/or modified under the
 -- conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.sty b/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.sty
index 562beef0f9e..c87f8ca83d7 100644
--- a/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.sty
+++ b/Master/texmf-dist/tex/lualatex/lua-ul/lua-ul.sty
@@ -6,7 +6,7 @@
 %%
 %% lua-ul.dtx  (with options: `package')
 %% 
-%% Copyright (C) 2020-2022 by Marcel Krueger
+%% Copyright (C) 2020-2024 by Marcel Krueger
 %%
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesExplPackage
   {lua-ul}
-  {2022-05-31}{0.2.0}{Underlining and related functionality for LuaTeX}
+  {2024-02-26}{0.2.1}{Underlining and related functionality for LuaTeX}
 \msg_new:nnnn {lua-ul} {luatex-required} {LuaLaTeX~required} {
   Lua-UL~requires~LuaLaTeX.~
   Maybe~you~forgot~to~switch~the~engine~in~your~editor?
@@ -237,7 +237,7 @@
   }
   \NewDocumentCommand \strikeThrough {o +m} {
     \group_begin:
-    \@strikeThrough #2
+    \@strikeThrough[#1] #2
     \group_end:
   }
 
diff --git a/Master/texmf-dist/tex/lualatex/lua-ul/pre_append_to_vlist_filter.lua b/Master/texmf-dist/tex/lualatex/lua-ul/pre_append_to_vlist_filter.lua
index 0fdc6c4f84e..525349614a4 100644
--- a/Master/texmf-dist/tex/lualatex/lua-ul/pre_append_to_vlist_filter.lua
+++ b/Master/texmf-dist/tex/lualatex/lua-ul/pre_append_to_vlist_filter.lua
@@ -6,7 +6,7 @@
 --
 -- lua-ul.dtx  (with options: `callback')
 -- 
--- Copyright (C) 2020-2022 by Marcel Krueger
+-- Copyright (C) 2020-2024 by Marcel Krueger
 --
 -- This file may be distributed and/or modified under the
 -- conditions of the LaTeX Project Public License, either
@@ -26,15 +26,11 @@ local flush_node = node.flush_node
 local prepend_prevdepth = node.prepend_prevdepth
 local callback_define
 
-for i=1,5 do
-local name, func = require'debug'.getupvalue(luatexbase.disable_callback, i)
-  if name == 'callback_register' then
-    callback_define = func
-    break
-  end
-end
-if not callback_define then
-  error[[Unable to find callback.define]]
+do
+  local saved_luatexbase, saved_callback_register = luatexbase, callback.register
+  luatexbase.uninstall()
+  callback_define = callback.register
+  luatexbase, callback.register = saved_luatexbase, saved_callback_register
 end
 
 local function filtered_append_to_vlist_filter(box,