summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-07-23 20:46:30 +0000
committerKarl Berry <karl@freefriends.org>2023-07-23 20:46:30 +0000
commit926e0e5dbdcefe4dd025ae534fd87a5fbc50b826 (patch)
tree2b827522a2d5b9326911cdee933eb5719248ea12 /Master/texmf-dist/tex/luatex
parentae1332fafcfb17b37645719d7ccac4fd6dbbe911 (diff)
lutabulartools (23jul23)
git-svn-id: svn://tug.org/texlive/trunk@67714 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
-rw-r--r--Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.lua21
-rw-r--r--Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.sty8
2 files changed, 15 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.lua b/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.lua
index 3ea21518342..92ce2367156 100644
--- a/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.lua
+++ b/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.lua
@@ -1,6 +1,6 @@
--% Kale Ewasiuk (kalekje@gmail.com)
---% 2023-07-18
---% Copyright (C) 2021-2022 Kale Ewasiuk
+--% 2023-07-22
+--% Copyright (C) 2021-2023 Kale Ewasiuk
--%
--% Permission is hereby granted, free of charge, to any person obtaining a copy
--% of this software and associated documentation files (the "Software"), to deal
@@ -23,15 +23,16 @@
--% OR OTHER DEALINGS IN THE SOFTWARE.
-local pl = _G['penlight'] or _G['pl'] -- penlight for this namespace is pl
-if (__PL_EXTRAS__ == nil) or (__PENLIGHT__ == nil) then
- tex.sprint('\\PackageError{lutabulartools}{penlight package with extras (or extrasglobals) option must be loaded before this package}{}')
- tex.print('\\stop')
-end
-local T = pl.tablex
+
local lutabt = {}
+local pl = penlight
+local T = pl.tablex
+
+lutabt.luakeys = require'luakeys'() -- note: YAMLvars.sty will have checked existence of this already
+
+
lutabt.tablelevel = 0
lutabt.debug = false
@@ -98,7 +99,7 @@ end
function lutabt.set_tabular(sett)
- sett = luakeys.parse(sett)
+ sett = lutabt.luakeys.parse(sett)
local trim = ''
for k, v in pairs(sett) do
if k == 'tbrule' then
@@ -435,7 +436,7 @@ function lutabt.mrX.off()
end
function lutabt.mrX.set_midruleX(new_sett, def)
- lutabt.mrX.settings = T.update(lutabt.mrX.settings, T.union(lutabt.mrX.resets, luakeys.parse(new_sett)))
+ lutabt.mrX.settings = T.update(lutabt.mrX.settings, T.union(lutabt.mrX.resets, lutabt.luakeys.parse(new_sett)))
lutabt.debugtalk(lutabt.mrX.settings, 'new midruleX settings')
if lutabt.mrX.settings.head ~= nil then
lutabt.mrX.settings.cntr = -1*tonumber(lutabt.mrX.settings.head)
diff --git a/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.sty b/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.sty
index c1e74802c02..ee36589cd50 100644
--- a/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.sty
+++ b/Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.sty
@@ -1,6 +1,6 @@
% Kale Ewasiuk (kalekje@gmail.com)
-% 2023-07-18
-% Copyright (C) 2021-2022 Kale Ewasiuk
+% 2023-07-22
+% Copyright (C) 2021-2023 Kale Ewasiuk
%
% Permission is hereby granted, free of charge, to any person obtaining a copy
% of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
% OR OTHER DEALINGS IN THE SOFTWARE.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lutabulartools}[2023-07-18]
+\ProvidesPackage{lutabulartools}[2023-07-22]
\RequirePackage{booktabs}
\RequirePackage{multirow}
@@ -34,7 +34,7 @@
\RequirePackage{xcolor}
\RequirePackage{colortbl}
\RequirePackage{luacode}
-\RequirePackage{penlight} % NEEDED, extras option must be used so penlight should be loaded before this...
+\RequirePackage{penlightplus} % NEEDED, extras option must be used so penlight should be loaded before this...
\luadirect{lutabt = require('lutabulartools')}