diff options
-rw-r--r-- | Master/texmf-dist/doc/luatex/lutabulartools/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/luatex/lutabulartools/lutabulartools.pdf | bin | 112601 -> 112269 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/luatex/lutabulartools/lutabulartools.tex | 18 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.lua | 21 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/lutabulartools/lutabulartools.sty | 8 |
5 files changed, 29 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/luatex/lutabulartools/README.md b/Master/texmf-dist/doc/luatex/lutabulartools/README.md index 51055a89e57..ee3381533bb 100644 --- a/Master/texmf-dist/doc/luatex/lutabulartools/README.md +++ b/Master/texmf-dist/doc/luatex/lutabulartools/README.md @@ -7,7 +7,7 @@ macro-enabled spreadsheet named "LaTeX-Tabular-Generator.xlsm" to help make tabl # License (MIT) -Copyright (C) 2021-2022 Kale Ewasiuk +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 diff --git a/Master/texmf-dist/doc/luatex/lutabulartools/lutabulartools.pdf b/Master/texmf-dist/doc/luatex/lutabulartools/lutabulartools.pdf Binary files differindex 6443b2873a6..eab82037601 100644 --- a/Master/texmf-dist/doc/luatex/lutabulartools/lutabulartools.pdf +++ b/Master/texmf-dist/doc/luatex/lutabulartools/lutabulartools.pdf diff --git a/Master/texmf-dist/doc/luatex/lutabulartools/lutabulartools.tex b/Master/texmf-dist/doc/luatex/lutabulartools/lutabulartools.tex index 9be8dbd330d..b9a4c962549 100644 --- a/Master/texmf-dist/doc/luatex/lutabulartools/lutabulartools.tex +++ b/Master/texmf-dist/doc/luatex/lutabulartools/lutabulartools.tex @@ -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 @@ -67,7 +67,7 @@ \usepackage{ltxtable} \usepackage{longtable} -\usepackage[pl,extras]{penlight} +\usepackage{penlightplus} \RequirePackage{lutabulartools} @@ -100,7 +100,7 @@ so if you have specific settings for these packages, load the \cmd{lutabulartool {xcolor}, {colortbl}, {luacode}, -{penlight}}. +{penlightplus}}. \section{\texttt{\textbackslash settabular}} @@ -455,6 +455,14 @@ Here's an example with long table. Notice the gray rules reliably appear 3 rows %\LTXtable{\linewidth}{ltxexample} - +\begin{tabular}{c} + \\ + \\ + \\ + \\ + \\ + \\ + \\ +\end{tabular} \end{document} 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')} |