From 9892241bb3eac84c80f41c5fa7d6996af248a38d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 4 Apr 2023 20:12:31 +0000 Subject: luamplib (4apr23) git-svn-id: svn://tug.org/texlive/trunk@66762 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luamplib/NEWS | 3 +++ Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf | Bin 153902 -> 153447 bytes .../texmf-dist/source/luatex/luamplib/luamplib.dtx | 27 +++++++++++++-------- Master/texmf-dist/tex/luatex/luamplib/luamplib.lua | 19 ++++++++++----- Master/texmf-dist/tex/luatex/luamplib/luamplib.sty | 2 +- 5 files changed, 34 insertions(+), 17 deletions(-) diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS index 0a4d0ea0680..b76bd8b562a 100644 --- a/Master/texmf-dist/doc/luatex/luamplib/NEWS +++ b/Master/texmf-dist/doc/luatex/luamplib/NEWS @@ -1,5 +1,8 @@ History of the luamplib package +2024/04/04 2.24.0 + respect '-recorder' command-line option + 2022/01/12 2.23.0 In parellel with the functionality introduced at previous version, \everymplib (\everyendmplib as well, of course) supports diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf index 58ee697d5f0..b9aadd7e0c0 100644 Binary files a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf and b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf differ diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx index 4e9eb71356d..35615062d22 100644 --- a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx +++ b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment -- by the way, this file contains UTF-8 % -% Copyright (C) 2008-2022 by Hans Hagen, Taco Hoekwater, Elie Roux, +% Copyright (C) 2008-2023 by Hans Hagen, Taco Hoekwater, Elie Roux, % Manuel Pégourié-Gonnard, Philipp Gesang and Kim Dohyun. % Currently maintained by the LuaLaTeX development team. % Support: @@ -85,7 +85,7 @@ See source file '\inFileName' for licencing and contact information. %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luamplib.drv}% - [2022/01/12 v2.23.0 Interface for using the mplib library]% + [2023/04/04 v2.24.0 Interface for using the mplib library]% \documentclass{ltxdoc} \usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace} \usepackage[x11names]{xcolor} @@ -153,7 +153,7 @@ See source file '\inFileName' for licencing and contact information. % \author{Hans Hagen, Taco Hoekwater, Elie Roux, Philipp Gesang and Kim Dohyun\\ % Maintainer: LuaLaTeX Maintainers --- % Support: \email{lualatex-dev@tug.org}} -% \date{2022/01/12 v2.23.0} +% \date{2023/04/04 v2.24.0} % % \maketitle % @@ -446,8 +446,8 @@ See source file '\inFileName' for licencing and contact information. luatexbase.provides_module { name = "luamplib", - version = "2.23.0", - date = "2022/01/12", + version = "2.24.0", + date = "2023/04/04", description = "Lua package to typeset Metapost with LuaTeX's MPLib.", } @@ -720,17 +720,24 @@ local special_ftype = { local function finder(name, mode, ftype) if mode == "w" then + if name and name ~= "mpout.log" then + kpse.record_output_file(name) -- recorder + end return name else ftype = special_ftype[ftype] or ftype local file = mpkpse:find_file(name,ftype) if file then - if not lfstouch or ftype ~= "mp" or noneedtoreplace[name] then - return file + if lfstouch and ftype == "mp" and not noneedtoreplace[name] then + file = replaceinputmpfile(name,file) end - return replaceinputmpfile(name,file) + else + file = mpkpse:find_file(name, name:match("%a+$")) end - return mpkpse:find_file(name, name:match("%a+$")) + if file then + kpse.record_input_file(file) -- recorder + end + return file end end luamplib.finder = finder @@ -2056,7 +2063,7 @@ luamplib.colorconverter = colorconverter \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luamplib} - [2022/01/12 v2.23.0 mplib package for LuaTeX] + [2023/04/04 v2.24.0 mplib package for LuaTeX] \ifx\newluafunction\@undefined \input ltluatex \fi diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua index 35b7e435c1c..4ce639cbcca 100644 --- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua +++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua @@ -11,8 +11,8 @@ luatexbase.provides_module { name = "luamplib", - version = "2.23.0", - date = "2022/01/12", + version = "2.24.0", + date = "2023/04/04", description = "Lua package to typeset Metapost with LuaTeX's MPLib.", } @@ -232,17 +232,24 @@ local special_ftype = { local function finder(name, mode, ftype) if mode == "w" then + if name and name ~= "mpout.log" then + kpse.record_output_file(name) -- recorder + end return name else ftype = special_ftype[ftype] or ftype local file = mpkpse:find_file(name,ftype) if file then - if not lfstouch or ftype ~= "mp" or noneedtoreplace[name] then - return file + if lfstouch and ftype == "mp" and not noneedtoreplace[name] then + file = replaceinputmpfile(name,file) end - return replaceinputmpfile(name,file) + else + file = mpkpse:find_file(name, name:match("%a+$")) end - return mpkpse:find_file(name, name:match("%a+$")) + if file then + kpse.record_input_file(file) -- recorder + end + return file end end luamplib.finder = finder diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty index 97ebcc2789d..457fa45f173 100644 --- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty +++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty @@ -14,7 +14,7 @@ \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luamplib} - [2022/01/12 v2.23.0 mplib package for LuaTeX] + [2023/04/04 v2.24.0 mplib package for LuaTeX] \ifx\newluafunction\@undefined \input ltluatex \fi -- cgit v1.2.3