texlive[64781] Master/texmf-dist: penlight (22oct22)
commits+karl at tug.org
commits+karl at tug.org
Sat Oct 22 22:19:58 CEST 2022
Revision: 64781
http://tug.org/svn/texlive?view=revision&revision=64781
Author: karl
Date: 2022-10-22 22:19:58 +0200 (Sat, 22 Oct 2022)
Log Message:
-----------
penlight (22oct22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/penlight/penlight.pdf
trunk/Master/texmf-dist/doc/luatex/penlight/penlight.tex
trunk/Master/texmf-dist/tex/luatex/penlight/penlight.lua
trunk/Master/texmf-dist/tex/luatex/penlight/penlight.sty
trunk/Master/texmf-dist/tex/luatex/penlight/penlightextras.lua
Modified: trunk/Master/texmf-dist/doc/luatex/penlight/penlight.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/penlight/penlight.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/penlight/penlight.tex 2022-10-22 20:19:45 UTC (rev 64780)
+++ trunk/Master/texmf-dist/doc/luatex/penlight/penlight.tex 2022-10-22 20:19:58 UTC (rev 64781)
@@ -1,5 +1,5 @@
% Kale Ewasiuk (kalekje at gmail.com)
-% 2022-10-15
+% 2022-10-22
% Copyright (C) 2021-2022 Kale Ewasiuk
%
% Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -29,6 +29,7 @@
\newcommand{\cmd}[1]{\texttt{\detokenize{#1}}}
\newcommand{\qcmd}[1]{``\cmd{#1}''}
\usepackage{url}
+\usepackage{xcolor}
\usepackage{showexpl}
\lstset{explpreset={justification=\raggedright,pos=r,wide=true}}
\setlength\ResultBoxRule{0mm}
@@ -57,11 +58,14 @@
\subtitle{Lua libraries for use in LuaLaTeX}
\begin{document}
+
+%{\Huge todo add split to text example with ltxexample\\reference the exact version of penlight used in this library. consider no globals by default\\ COVERT existing examples to extras globals, document hyperref}
+
\maketitle
- The official documentation for the Lua library can be found here:\\
+ Documentation for the Lua library this includes can be found here:\\
\mbox{\url{https://lunarmodules.github.io/Penlight}}
- \\
+ \\ This package uses version \cmd{1.13.1}
\subsection*{Required Package Option}
The first option sent to this package MUST be one of: \\
@@ -80,7 +84,7 @@
-- below is optional
__SKIP_TEX__ = true --only required if you want to use
--penlightextras without a LaTeX run
--- __PL_NO_GLOBALS__ = true -- optional, skip global definitions
+__PL_GLOBALS__ = true -- optional, include global definitions
__SKIP_LUAKEYS__ = true -- luakeys is laoded in penlightextras be default, you may skip it with this
require'penlightextras'
\end{verbatim}
@@ -101,8 +105,8 @@
\texttt{func} & allows placehold expressions eg. \texttt{\_1+1} to be used \\
& this will be ran in pre-amble: \texttt{penlight.utils.import('pl.func')}\\
& \url{https://lunarmodules.github.io/Penlight/libraries/pl.func}\\
- \texttt{\llap{extras}noglobals} & does the above three (\cmd{func,stringx,format}); adds some additional functions to \cmd{penlight} module; and adds the \cmd{pl.tex} sub-module.\\
- \texttt{extras} & does the above \texttt{extrasnoglobals} but makes many of the functions global variables.
+ \texttt{extras} & does the above three (\cmd{func,stringx,format}); adds some additional functions to \cmd{penlight} module; and adds the \cmd{pl.tex} sub-module.\\
+ \texttt{extrasglobals} & does the above \texttt{extras} but makes many of the functions global variables as well.
\end{tabular}
@@ -114,7 +118,12 @@
\subsubsection*{Misc stuff}
\llcmd{__SKIP_TEX__} If using package with \cmd{texlua}, set this global before loading \cmd{penlight}\\
-\llcmd{__PL_NO_}\cmd{GLOBALS__} If using package with \cmd{texlua} and you don't want to set some globals (described in next sections), set this global before to \cmd{true} loading \cmd{penlight}\\
+The gloals flags below are taken care of in the package options:\\
+\llcmd{__PL_}\cmd{GLOBALS__} If using package with \cmd{texlua} and you don't want to set some globals (described in next sections), set this global before to \cmd{true} loading \cmd{penlight}\\
+\cmd{__SKIP_LUAKEYS__}\\
+\cmd{__PL_NO_HYPERREF__}\\
+\cmd{__PL_EXTRAS__} false, 1 or 2\\
+
\llcmd{hasval(x)} Python-like boolean testing\\
\llcmd{COMP'xyz'()} Python-like comprehensions:\\\url{https://lunarmodules.github.io/Penlight/libraries/pl.comprehension.html}\\
\llcmd{math.mod(n,d)}, \cmd{math.mod2(n)} math modulous\\
@@ -124,11 +133,11 @@
\llcmd{pl.}\cmd{Char(n)} return letter corresponding to 1=A, 2=B, etc.\\
\llcmd{kpairs(t), }\cmd{npairs(t)} iterate over keys only, or include nil value from table ipairs\\
-{\Large todo document all string helper functions}
+%{\Large todo document all string helper functions}
+
\llcmd{pl.utils.}\cmd{filterfiles}\cmd{(dir,filt,rec)} Get files from dir and apply glob-like filters. Set rec to \cmd{true} to include sub directories\\
-\pagebreak
\subsubsection*{\cmd{pl.tex.} module is added}
\llcmd{add_bkt}\cmd{_cnt(n), }\cmd{close_bkt_cnt(n), reset_bkt_cnt} functions to keep track of adding curly brackets as strings. \cmd{add} will return \cmd{n} (default 1) \{'s and increment a counter. \cmd{close} will return \cmd{n} \}'s (default will close all brackets) and decrement.\\
@@ -153,9 +162,45 @@
\llcmd{deccmd}\cmd{(cs, dft, overwrite)} declare a command. If \cmd{dft} (default) is \cmd{nil}, \cmd{cs} is set
to a package warning saying \cmd{'cs' was declared and used in document, but never set}. If \cmd{overwrite}
is true, it will overwrite an existing command (using \cmd{defcmd}), otherwise, it will throw error like \cmd{newcmd}.\\
+\llcmd{get_ref_info(l)}accesses the \cmd{\r at label} and returns a table\\
-\subsection{Split stuff}
-splitToComma:
+
+
+
+\subsection*{Macro helpers}
+\cmd{\MakeluastringCommands[def]{spec}} will let \cmd{\plluastring(A|B|C..)} be \cmd{\luastring(N|O|T|F)}
+based on the letters that \cmd{spec} is set to (or \cmd{def} if nothing is provided)
+This is useful if you want to write a command with flexibility on argument expansion.
+The user can specify \cmd{n}, \cmd{o}, \cmd{t}, and \cmd{f} (case insensitve) if they want
+no, once, twice, or full expansion.
+
+% BELOW IS FOR TROUBLESHOOTING ABOVE
+%\def\NOTexp{\ONEexp}
+%\def\ONEexp{\TWOexp}
+%\def\TWOexp{\TREexp}
+%\def\TREexp{Fully expanded}
+%
+%\NewDocumentCommand{\luastringExpTest}{m m}{
+% \MakeluastringCommands{#1}
+% \luadirect{texio.write_nl('VVVVVVVVVVVVVVVVVVVVVVVVVVVVV')}
+% \luadirect{texio.write_nl(\plluastringA{#2}..' | Not')}
+% \luadirect{texio.write_nl(\plluastringB{#2}..' | Once')}
+% \luadirect{texio.write_nl(\plluastringC{#2}..' | Twice')}
+% \luadirect{texio.write_nl(\plluastringD{#2}..' | Full')}
+% \luadirect{texio.write_nl('VVVVVVVVVVVVVVVVVVVVVVVVVVVVV')}
+%}
+%
+%\luastringExpTest{ n o t f }{\NOTexp}
+
+
+
+
+\subsection*{Split stuff}
+Splitting text (or a cmd) into oxford comma format via:
+\cmd{\splitToComma[expansion level]{text}{text to split on}}:
+
+\begin{LTXexample}
+
-\splitToComma{ j doe }{\and}-\\
-\splitToComma{ j doe \and s else }{\and}-\\
-\splitToComma{ j doe \and s else \and a per }{\and}-\\
@@ -163,44 +208,23 @@
\def\authors{j doe \and s else \and a per \and f guy}
\splitToComma[o]{\authors}{\and}
+\end{LTXexample}
+The expansion level is up to two characters, \cmd{n|o|t|f}, to control teh expasion of each argument.
+\begin{LTXexample}
spliToItems:
\begin{itemize}
\splitToItems{kale\and john}{\and}
\splitToItems{kale -john -someone else}{-}
\end{itemize}
+\end{LTXexample}
-\subsection{Macro helpers}
-\cmd{\MakeluastringCommands[def]{spec}} will let \cmd{\plluastring(A|B|C..)} be \cmd{\luastring(N|O|T|F)}
-based on the letters that \cmd{spec} is set to (or \cmd{def} if nothing is provided)
-This is useful if you want to write a command with flexibility on argument expansion.
-The user can specify \cmd{n}, \cmd{o}, \cmd{t}, and \cmd{f} (case insensitve) if they want
-no, once, twice, or full expansion.
-
-\def\NOTexp{\ONEexp}
-\def\ONEexp{\TWOexp}
-\def\TWOexp{\TREexp}
-\def\TREexp{Fully expanded}
-
-\NewDocumentCommand{\luastringExpTest}{m m}{
- \MakeluastringCommands{#1}
- \luadirect{texio.write_nl('VVVVVVVVVVVVVVVVVVVVVVVVVVVVV')}
- \luadirect{texio.write_nl(\plluastringA{#2}..' | Not')}
- \luadirect{texio.write_nl(\plluastringB{#2}..' | Once')}
- \luadirect{texio.write_nl(\plluastringC{#2}..' | Twice')}
- \luadirect{texio.write_nl(\plluastringD{#2}..' | Full')}
- \luadirect{texio.write_nl('VVVVVVVVVVVVVVVVVVVVVVVVVVVVV')}
-}
-
-\luastringExpTest{ n o t f }{\NOTexp}
-
\subsubsection*{global extras}
-If \cmd{extras} is used and NOT \cmd{extrasnoglobals}, then some globals are set.\\
-All \cmd{pl.tex} modules are added.\\
+If \cmd{extrasglobals} is used and NOT \cmd{extras}, many globals are set.\\
+All \cmd{pl.tex} modules are made global.\\
\cmd{hasval}, \cmd{COMP}, \cmd{kpairs}, \cmd{npairs} are globals.\\
-\cmd{pl.tablex} functions are added to the \cmd{table} table.\\
\section*{}
Disclaimer: I am not the author of the Lua Penlight library.
Modified: trunk/Master/texmf-dist/tex/luatex/penlight/penlight.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/penlight/penlight.lua 2022-10-22 20:19:45 UTC (rev 64780)
+++ trunk/Master/texmf-dist/tex/luatex/penlight/penlight.lua 2022-10-22 20:19:58 UTC (rev 64781)
@@ -133,10 +133,11 @@
end
if is_file then
- local text_or_filename, err = utils.readfile(text_or_filename)
- if not text_or_filename then
+ local text, err = utils.readfile(text_or_filename)
+ if not text then
return nil, err
end
+ text_or_filename = text
end
local doc, err = parser(text_or_filename)
@@ -1219,12 +1220,24 @@
--
-- Note: the path is prefixed, so it is searched first when requiring modules.
-- @string base optional base directory (absolute, or relative path).
+-- @bool nofollow always use the invocation's directory, even if the invoked file is a symlink
-- @treturn string the current script's path with a trailing slash
-function app.require_here (base)
- local p = path.dirname(app.script_name())
+function app.require_here (base, nofollow)
+ local p = app.script_name()
if not path.isabs(p) then
p = path.join(path.currentdir(),p)
end
+ if not nofollow then
+ local t = path.link_attrib(p)
+ if t and t.mode == 'link' then
+ t = t.target
+ if not path.isabs(t) then
+ t = path.join(path.dirname(p), t)
+ end
+ p = t
+ end
+ end
+ p = path.normpath(path.dirname(p))
if p:sub(-1,-1) ~= path.sep then
p = p..path.sep
end
@@ -2583,9 +2596,9 @@
-- This functions mimics the `warn` function added in Lua 5.4.
-- @function warn
-- @param ... any arguments
-if not warn then -- luacheck: ignore
+if not rawget(_G, "warn") then
local enabled = false
- local function warn(arg1, ...) -- luacheck: ignore
+ local function warn(arg1, ...)
if type(arg1) == "string" and arg1:sub(1, 1) == "@" then
-- control message
if arg1 == "@on" then
@@ -2957,7 +2970,7 @@
local config = {}
---- like io.lines(), but allows for lines to be continued with '\'.
+--- like `io.lines`, but allows for lines to be continued with '`\`'.
-- @param file a file-like object (anything where read() returns the next line) or a filename.
-- Defaults to stardard input.
-- @return an iterator over the lines, or nil
@@ -5993,7 +6006,8 @@
elseif check '$<{name} $' then -- is it <parameter_name>?
-- so <input file...> becomes input_file ...
optparm,rest = res.name:match '([^%.]+)(.*)'
- optparm = optparm:gsub('%A','_')
+ -- follow lua legal variable names
+ optparm = optparm:sub(1,1):gsub('%A','_') .. optparm:sub(2):gsub('%W', '_')
varargs = rest == '...'
append(parmlist,optparm)
end
@@ -6002,6 +6016,7 @@
line = res.rest
res = {}
local optional
+ local defval_str
-- do we have ([optional] [<type>] [default <val>])?
if match('$({def} $',line,res) or match('$({def}',line,res) then
local typespec = strip(res.def)
@@ -6044,6 +6059,7 @@
-- optional 'default value' clause. Type is inferred as
-- 'string' or 'number' if there's no explicit type
if default or match('default $r{rest}',typespec,res) then
+ defval_str = res.rest
defval,vtype = process_default(res.rest,vtype)
end
else -- must be a plain flag, no extra parameter required
@@ -6053,6 +6069,7 @@
local ps = {
type = vtype,
defval = defval,
+ defval_str = defval_str,
required = defval == nil and not optional,
comment = res.rest or optparm,
constraint = constraint,
@@ -6182,6 +6199,9 @@
if not ps.used then
if ps.required then lapp.error("missing required parameter: "..parm) end
set_result(ps,parm,ps.defval)
+ if builtin_types[ps.type] == "file" then
+ set_result(ps, parm .. "_name", ps.defval_str)
+ end
end
end
return results
@@ -8279,9 +8299,6 @@
-- @string P A file path
function path.isdir(P)
assert_string(1,P)
- if P:match("\\$") then
- P = P:sub(1,-2)
- end
return attrib(P,'mode') == 'directory'
end
@@ -9227,10 +9244,11 @@
end
end
table.sort(ordered_keys, function (a, b)
- if type(a) == type(b) and type(a) == 'string' then
- return a < b
+ if type(a) == type(b) then
+ return tostring(a) < tostring(b)
+ else
+ return type(a) < type(b)
end
- return type(a) == 'boolean' or (type(b) ~= 'boolean' and type(a) == 'table')
end)
local function write_entry (key, val)
local tkey = type(key)
@@ -12327,7 +12345,7 @@
--- return all the keys of a table in arbitrary order.
-- @within Extraction
--- @tab t A table
+-- @tab t A list-like table where the values are the keys of the input table
function tablex.keys(t)
assert_arg_iterable(1,t)
return makelist(tablex.pairmap(keys_op,t))
@@ -12337,7 +12355,7 @@
--- return all the values of the table in arbitrary order
-- @within Extraction
--- @tab t A table
+-- @tab t A list-like table where the values are the values of the input table
function tablex.values(t)
assert_arg_iterable(1,t)
return makelist(tablex.pairmap(values_op,t))
@@ -13425,6 +13443,8 @@
local _unpack = table.unpack -- always injected by 'compat'
local find = string.find
local sub = string.sub
+local next = next
+local floor = math.floor
local is_windows = compat.is_windows
local err_mode = 'default'
@@ -13433,7 +13453,7 @@
local _function_factories = {}
-local utils = { _VERSION = "1.12.0" }
+local utils = { _VERSION = "1.13.1" }
for k, v in pairs(compat) do utils[k] = v end
--- Some standard patterns
@@ -13635,6 +13655,47 @@
+--- an iterator over all non-integer keys (inverse of `ipairs`).
+-- It will skip any key that is an integer number, so negative indices or an
+-- array with holes will not return those either (so it returns slightly less than
+-- 'the inverse of `ipairs`').
+--
+-- This uses `pairs` under the hood, so any value that is iterable using `pairs`
+-- will work with this function.
+-- @tparam table t the table to iterate over
+-- @treturn key
+-- @treturn value
+-- @usage
+-- local t = {
+-- "hello",
+-- "world",
+-- hello = "hallo",
+-- world = "Welt",
+-- }
+--
+-- for k, v in utils.kpairs(t) do
+-- print("German: ", v)
+-- end
+--
+-- -- output;
+-- -- German: hallo
+-- -- German: Welt
+function utils.kpairs(t)
+ local index
+ return function()
+ local value
+ while true do
+ index, value = next(t, index)
+ if type(index) ~= "number" or floor(index) ~= index then
+ break
+ end
+ end
+ return index, value
+ end
+end
+
+
+
--- Error handling
-- @section Error-handling
@@ -13661,17 +13722,20 @@
return val
end
---- creates an Enum table.
+--- creates an Enum or constants lookup table for improved error handling.
-- This helps prevent magic strings in code by throwing errors for accessing
--- non-existing values.
+-- non-existing values, and/or converting strings/identifiers to other values.
--
--- Calling on the object does the same, but returns a soft error; `nil + err`.
+-- Calling on the object does the same, but returns a soft error; `nil + err`, if
+-- the call is succesful (the key exists), it will return the value.
--
--- The values are equal to the keys. The enum object is
--- read-only.
--- @param ... strings that make up the enumeration.
--- @return Enum object
--- @usage -- accessing at runtime
+-- When calling with varargs or an array the values will be equal to the keys.
+-- The enum object is read-only.
+-- @tparam table|vararg ... the input for the Enum. If varargs or an array then the
+-- values in the Enum will be equal to the names (must be strings), if a hash-table
+-- then values remain (any type), and the keys must be strings.
+-- @return Enum object (read-only table/object)
+-- @usage -- Enum access at runtime
-- local obj = {}
-- obj.MOVEMENT = utils.enum("FORWARD", "REVERSE", "LEFT", "RIGHT")
--
@@ -13683,23 +13747,83 @@
-- -- "'REVERES' is not a valid value (expected one of: 'FORWARD', 'REVERSE', 'LEFT', 'RIGHT')"
--
-- end
--- @usage -- validating user-input
--- local parameter = "...some user provided option..."
--- local ok, err = obj.MOVEMENT(parameter) -- calling on the object
--- if not ok then
--- print("bad 'parameter', " .. err)
+-- @usage -- standardized error codes
+-- local obj = {
+-- ERR = utils.enum {
+-- NOT_FOUND = "the item was not found",
+-- OUT_OF_BOUNDS = "the index is outside the allowed range"
+-- },
+--
+-- some_method = function(self)
+-- return self.ERR.OUT_OF_BOUNDS
+-- end,
+-- }
+--
+-- local result, err = obj:some_method()
+-- if not result then
+-- if err == obj.ERR.NOT_FOUND then
+-- -- check on error code, not magic strings
+--
+-- else
+-- -- return the error description, contained in the constant
+-- return nil, "error: "..err -- "error: the index is outside the allowed range"
+-- end
+-- end
+-- @usage -- validating/converting user-input
+-- local color = "purple"
+-- local ansi_colors = utils.enum {
+-- black = 30,
+-- red = 31,
+-- green = 32,
+-- }
+-- local color_code, err = ansi_colors(color) -- calling on the object, returns the value from the enum
+-- if not color_code then
+-- print("bad 'color', " .. err)
+-- -- "bad 'color', 'purple' is not a valid value (expected one of: 'black', 'red', 'green')"
-- os.exit(1)
-- end
function utils.enum(...)
- local lst = utils.pack(...)
- utils.assert_arg(1, lst[1], "string") -- at least 1 string
+ local first = select(1, ...)
+ local enum = {}
+ local lst
- local enum = {}
- for i, value in ipairs(lst) do
- utils.assert_arg(i, value, "string")
- enum[value] = value
+ if type(first) ~= "table" then
+ -- vararg with strings
+ lst = utils.pack(...)
+ for i, value in utils.npairs(lst) do
+ utils.assert_arg(i, value, "string")
+ enum[value] = value
+ end
+
+ else
+ -- table/array with values
+ utils.assert_arg(1, first, "table")
+ lst = {}
+ -- first add array part
+ for i, value in ipairs(first) do
+ if type(value) ~= "string" then
+ error(("expected 'string' but got '%s' at index %d"):format(type(value), i), 2)
+ end
+ lst[i] = value
+ enum[value] = value
+ end
+ -- add key-ed part
+ for key, value in utils.kpairs(first) do
+ if type(key) ~= "string" then
+ error(("expected key to be 'string' but got '%s'"):format(type(key)), 2)
+ end
+ if enum[key] then
+ error(("duplicate entry in array and hash part: '%s'"):format(key), 2)
+ end
+ enum[key] = value
+ lst[#lst+1] = key
+ end
end
+ if not lst[1] then
+ error("expected at least 1 entry", 2)
+ end
+
local valid = "(expected one of: '" .. concat(lst, "', '") .. "')"
setmetatable(enum, {
__index = function(self, key)
@@ -13711,7 +13835,7 @@
__call = function(self, key)
if type(key) == "string" then
local v = rawget(self, key)
- if v then
+ if v ~= nil then
return v
end
end
Modified: trunk/Master/texmf-dist/tex/luatex/penlight/penlight.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/penlight/penlight.sty 2022-10-22 20:19:45 UTC (rev 64780)
+++ trunk/Master/texmf-dist/tex/luatex/penlight/penlight.sty 2022-10-22 20:19:58 UTC (rev 64781)
@@ -1,5 +1,5 @@
% Kale Ewasiuk (kalekje at gmail.com)
-% 2022-10-15
+% 2022-10-22
% Copyright (C) 2021-2022 Kale Ewasiuk
%
% Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -22,7 +22,7 @@
% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
% OR OTHER DEALINGS IN THE SOFTWARE.
-\ProvidesPackage{penlight}[2022-10-15]
+\ProvidesPackage{penlight}[2022-10-22]
\RequirePackage{luacode}
@@ -43,8 +43,8 @@
\DeclareOption{format}{\luadirect{_G[__PENLIGHT__].stringx.format_operator()}}
\DeclareOption{func}{\luadirect{_G[__PENLIGHT__].utils.import(__PENLIGHT__..'.func')}}
\DeclareOption{extras}{\luadirect{require'penlightextras'}}
-\DeclareOption{extrasnoglobals}{\luadirect{
- __PL_NO_GLOBALS__ = true
+\DeclareOption{extrasglobals}{\luadirect{
+ __PL_GLOBALS__ = true
require'penlightextras'
}}
@@ -58,23 +58,23 @@
-\newcommand{\writePDFmetadata}{\luadirect{writePDFmetadata()}}
+\newcommand{\writePDFmetadata}{\luadirect{_G[__PENLIGHT__].tex.writePDFmetadata()}}
\NewDocumentCommand{\writePDFmetadatakv}{ s m }{
\IfBooleanTF{#1}{% if *, overwrite everything
\luadirect{
__PDFmetadata__ = luakeys.parse(\luastring{#2})
- writePDFmetadata()
+ _G[__PENLIGHT__].tex.writePDFmetadata()
}}{
\luadirect{
__PDFmetadata__ = __PDFmetadata__ or {}
- table.update(__PDFmetadata__, luakeys.parse(\luastring{#2}))
- writePDFmetadata()
+ _G[__PENLIGHT__].tablex.update(__PDFmetadata__, luakeys.parse(\luastring{#2}))
+ _G[__PENLIGHT__].tex.writePDFmetadata()
}}
}
-\def\luastringT#1{\luastring{\unexpanded\expandafter\expandafter\expandafter{#1}}}
+\def\luastringT#1{\luastring{\unexpanded\expandafter\expandafter\expandafter{#1}}} % expand luastring twice
\let\luastringF\luastring % fully expanded luastring
% allow control over expansion of arguments to a latex function
Modified: trunk/Master/texmf-dist/tex/luatex/penlight/penlightextras.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/penlight/penlightextras.lua 2022-10-22 20:19:45 UTC (rev 64780)
+++ trunk/Master/texmf-dist/tex/luatex/penlight/penlightextras.lua 2022-10-22 20:19:58 UTC (rev 64781)
@@ -1,5 +1,5 @@
--% Kale Ewasiuk (kalekje at gmail.com)
---% 2022-10-15
+--% 2022-10-22
--% Copyright (C) 2021-2022 Kale Ewasiuk
--%
--% Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -22,16 +22,17 @@
--% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
--% OR OTHER DEALINGS IN THE SOFTWARE.
-__SKIP_TEX__ = __SKIP_TEX__ or false --if declared true before here, it will use regular print functions
+__PL_SKIP_TEX__ = __PL_SKIP_TEX__ or false --if declared true before here, it will use regular print functions
-- (for troubleshooting with texlua instead of actual use in lua latex)
-__SKIP_LUAKEYS__ = __SKIP_LUAKEYS__ or false
-__PL_NO_GLOBALS__ = __PL_NO_GLOBALS__ or false
+__PL_SKIP_LUAKEYS__ = __PL_SKIP_LUAKEYS__ or false
+__PL_GLOBALS__ = __PL_GLOBALS__ or false
__PL_EXTRAS__ = 1
+__PL_NO_HYPERREF__ = __PL_NO_HYPERREF__ or false
-- requires penlight
local pl = _G['penlight'] or _G['pl'] -- penlight for this namespace is pl
-if not __SKIP_LUAKEYS__ then
+if not __PL_SKIP_LUAKEYS__ then
luakeys = require'luakeys'
end
@@ -74,7 +75,7 @@
--Generic LuaLaTeX utilities for print commands or environments
-if not __SKIP_TEX__ then
+if not __PL_SKIP_TEX__ then
local function check_special_chars(s) -- todo extend to toher special chars?
if type(s) == 'string' then
if string.find(s, '[\n\r\t\0]') then
@@ -142,6 +143,7 @@
end
wrt2('\n^^^^^\n')
end
+pl.help_wrt = pl.tex.help_wrt
function pl.tex.prt_array2d(t)
for _, r in ipairs(t) do
@@ -292,16 +294,38 @@
+
+
function pl.tex.get_ref_info(l)
+ local n = 5
+ if __PL_NO_HYPERREF__ then
+ local n = 2
+ end
local r = token.get_macro('r@'..l)
+ local t = {}
if r == nil then
- return 0, 0
+ t = pl.tablex.new(n, 0) -- make all 0s
+ r = '-not found-'
+ else
+ t = {r:match(("(%b{})"):rep(n))}
+ t = pl.tablex.map(string.trimfl, t)
end
- local sec, page = r:match("{([^}]*)}{([^}]*)}")
- return sec, page
+ t[#t+1] = r -- add the og return of label
+ pl.help_wrt(t, 'ref info')
+ return t
end
+-- todo add regex pattern for cref info
+--function pl.tex.get_ref_info_all_cref(l)
+-- local r = token.get_macro('r@'..l..'@cref')
+-- if r == nil then
+-- return r, 0, 0
+-- end
+-- local sec, page = r:match("{([^}]*)}{([^}]*)}")
+-- return r, sec, page
+--end
+
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
@@ -420,8 +444,12 @@
return str:gsub('%s','')
end
+function str_mt.__index.trimfl(str)
+ return str:sub(2,-2)
+end
+
-- -- -- -- function stuff
function pl.clone_function(fn)
@@ -750,7 +778,7 @@
-if not __PL_NO_GLOBALS__ then
+if _PL_GLOBALS__ then
__PL_EXTRAS__ = 2
-- iterators
kpairs = pl.utils.kpairs
@@ -767,7 +795,14 @@
end
end
table.join = table.concat -- alias
+ -- todo should tablex have all table functions
+ pl.tablex.concat = table.concat
+ pl.tablex.insert = table.insert
+ pl.tablex.maxn = table.maxn
+ pl.tablex.remove = table.remove
+ pl.tablex.sort = table.sort
+
hasval = pl.hasval
COMP = pl.COMP
More information about the tex-live-commits
mailing list.