From 93570294d6aa702f5ac83233dbacda328ea8fa28 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 5 Apr 2023 20:09:08 +0000 Subject: texfindpkg (5apr23) git-svn-id: svn://tug.org/texlive/trunk@66777 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/texk/texlive/linked_scripts/Makefile.am | 1 + .../source/texk/texlive/linked_scripts/Makefile.in | 1 + .../source/texk/texlive/linked_scripts/scripts.lst | 1 + .../linked_scripts/texfindpkg/texfindpkg.lua | 522 +++++++++++++++++++++ Master/bin/aarch64-linux/texfindpkg | 1 + Master/bin/amd64-freebsd/texfindpkg | 1 + Master/bin/amd64-netbsd/texfindpkg | 1 + Master/bin/armhf-linux/texfindpkg | 1 + Master/bin/i386-freebsd/texfindpkg | 1 + Master/bin/i386-linux/texfindpkg | 1 + Master/bin/i386-netbsd/texfindpkg | 1 + Master/bin/i386-solaris/texfindpkg | 1 + Master/bin/universal-darwin/texfindpkg | 1 + Master/bin/windows/texfindpkg.exe | Bin 0 -> 6144 bytes Master/bin/x86_64-cygwin/texfindpkg | 1 + Master/bin/x86_64-darwinlegacy/texfindpkg | 1 + Master/bin/x86_64-linux/texfindpkg | 1 + Master/bin/x86_64-linuxmusl/texfindpkg | 1 + Master/bin/x86_64-solaris/texfindpkg | 1 + Master/texmf-dist/doc/man/man1/texfindpkg.1 | 26 + Master/texmf-dist/doc/man/man1/texfindpkg.man1.pdf | Bin 0 -> 12726 bytes Master/texmf-dist/doc/support/texfindpkg/README.md | 58 +++ .../texmf-dist/scripts/texfindpkg/texfindpkg.lua | 522 +++++++++++++++++++++ .../tex/latex/texfindpkg/texfindpkg.json.gz | Bin 0 -> 892907 bytes Master/tlpkg/bin/tlpkg-ctan-check | 4 +- Master/tlpkg/libexec/ctan2tds | 4 +- Master/tlpkg/tlpsrc/collection-luatex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/texfindpkg.tlpsrc | 1 + 28 files changed, 1152 insertions(+), 4 deletions(-) create mode 100755 Build/source/texk/texlive/linked_scripts/texfindpkg/texfindpkg.lua create mode 120000 Master/bin/aarch64-linux/texfindpkg create mode 120000 Master/bin/amd64-freebsd/texfindpkg create mode 120000 Master/bin/amd64-netbsd/texfindpkg create mode 120000 Master/bin/armhf-linux/texfindpkg create mode 120000 Master/bin/i386-freebsd/texfindpkg create mode 120000 Master/bin/i386-linux/texfindpkg create mode 120000 Master/bin/i386-netbsd/texfindpkg create mode 120000 Master/bin/i386-solaris/texfindpkg create mode 120000 Master/bin/universal-darwin/texfindpkg create mode 100755 Master/bin/windows/texfindpkg.exe create mode 120000 Master/bin/x86_64-cygwin/texfindpkg create mode 120000 Master/bin/x86_64-darwinlegacy/texfindpkg create mode 120000 Master/bin/x86_64-linux/texfindpkg create mode 120000 Master/bin/x86_64-linuxmusl/texfindpkg create mode 120000 Master/bin/x86_64-solaris/texfindpkg create mode 100644 Master/texmf-dist/doc/man/man1/texfindpkg.1 create mode 100644 Master/texmf-dist/doc/man/man1/texfindpkg.man1.pdf create mode 100644 Master/texmf-dist/doc/support/texfindpkg/README.md create mode 100755 Master/texmf-dist/scripts/texfindpkg/texfindpkg.lua create mode 100644 Master/texmf-dist/tex/latex/texfindpkg/texfindpkg.json.gz create mode 100644 Master/tlpkg/tlpsrc/texfindpkg.tlpsrc diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index 32ea8d403d1..9136aa74381 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -221,6 +221,7 @@ texmf_other_scripts = \ texdef/texdef.pl \ texdiff/texdiff \ texdirflatten/texdirflatten \ + texfindpkg/texfindpkg.lua \ texdoc/texdoc.tlu \ texfot/texfot.pl \ texlive/fmtutil-sys.sh \ diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index 9bcdbc030da..6ffffc5c98b 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -437,6 +437,7 @@ texmf_other_scripts = \ texdef/texdef.pl \ texdiff/texdiff \ texdirflatten/texdirflatten \ + texfindpkg/texfindpkg.lua \ texdoc/texdoc.tlu \ texfot/texfot.pl \ texlive/fmtutil-sys.sh \ diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst index 2e005ab1c3a..7e58eb6cc3d 100644 --- a/Build/source/texk/texlive/linked_scripts/scripts.lst +++ b/Build/source/texk/texlive/linked_scripts/scripts.lst @@ -163,6 +163,7 @@ texcount/texcount.pl texdef/texdef.pl texdiff/texdiff texdirflatten/texdirflatten +texfindpkg/texfindpkg.lua texdoc/texdoc.tlu texfot/texfot.pl texlive/fmtutil-sys.sh diff --git a/Build/source/texk/texlive/linked_scripts/texfindpkg/texfindpkg.lua b/Build/source/texk/texlive/linked_scripts/texfindpkg/texfindpkg.lua new file mode 100755 index 00000000000..f2845f9d907 --- /dev/null +++ b/Build/source/texk/texlive/linked_scripts/texfindpkg/texfindpkg.lua @@ -0,0 +1,522 @@ +#!/usr/bin/env texlua + +-- Description: Install TeX packages and their dependencies +-- Copyright: 2023 (c) Jianrui Lyu +-- Repository: https://github.com/lvjr/texfindpkg +-- License: GNU General Public License v3.0 + +local tfpversion = "2023D" +local tfpdate = "2023-04-05" + +------------------------------------------------------------ +--> \section{Some variables and functions} +------------------------------------------------------------ + +local lfs = require("lfs") +local insert = table.insert +local match = string.match + +local lookup = kpse.lookup +kpse.set_program_name("kpsewhich") + +require(lookup("lualibs.lua")) +local json = utilities.json -- for json.tostring and json.tolua +local gzip = gzip -- for gzip.compress and gzip.decompress + +local function tfpPrint(msg) + print("[tfp] " .. msg) +end + +local showdbg = false + +local function dbgPrint(msg) + if showdbg then print("[debug] " .. msg) end +end + +local function valueExists(tab, val) + for _, v in ipairs(tab) do + if v == val then return true end + end + return false +end + +local function getFiles(path, pattern) + local files = { } + for entry in lfs.dir(path) do + if match(entry, pattern) then + insert(files, entry) + end + end + return files +end + +local function fileRead(input) + local f = io.open(input, "rb") + local text + if f then -- file exists and is readable + text = f:read("*all") + f:close() + --print(#text) + return text + end + -- return nil if file doesn't exists or isn't readable +end + +local function fileWrite(text, output) + -- using "wb" keeps unix eol characters + f = io.open(output, "wb") + f:write(text) + f:close() +end + +local function testDistribution() + -- texlive returns "texmf-dist/web2c/updmap.cfg" + -- miktex returns nil although there is "texmfs/install/miktex/config/updmap.cfg" + local d = lookup("updmap.cfg") + if d then + return "texlive" + else + return "miktex" + end +end + +------------------------------------------------------------ +--> \section{Handle TeX Live package database} +------------------------------------------------------------ + +local tlpkgtext + +local function tlReadPackageDB() + local tlroot = kpse.var_value("TEXMFROOT") + if tlroot then + tlroot = tlroot .. "/tlpkg" + else + tfpPrint("error in finding texmf root!") + end + local list = getFiles(tlroot, "^texlive%.tlpdb%.main") + if #list > 0 then + tlpkgtext = fileRead(tlroot .. "/" .. list[1]) + if not tlpkgtext then + tfpPrint("error in reading texlive package database!") + end + else + -- no texlive.tlpdb.main file in a fresh TeX live + tfpPrint("error in finding texlive package database!") + tfpPrint("please run 'tlmgr update --self' first.") + end +end + +local tlpkgdata = {} + +local function tlExtractFiles(name, desc) + -- ignore binary packages + -- also ignore latex-dev packages + if name:find("%.") or name:find("^latex%-[%a]-%-dev") then + --print(name) + return + end + -- ignore package files in doc folder + desc = desc:match("\nrunfiles .+") or "" + for base, ext in desc:gmatch("/([%a%d%-]+)%.([%a%d]+)\n") do + if ext == "sty" or ext == "cls" then + dbgPrint(name, base .. "." .. ext) + tlpkgdata[base .. "." .. ext] = name + end + end +end + +local function tlParsePackageDB() + tlpkgtext:gsub("name (.-)\n(.-)\n\n", tlExtractFiles) +end + +------------------------------------------------------------ +--> \section{Handle MiKTeX package database} +------------------------------------------------------------ + +local mtpkgtext + +local function mtReadPackageDB() + local mtvar = kpse.var_value("TEXMFVAR") + if mtvar then + mtpdb = mtvar .. "/miktex/cache/packages/miktex-zzdb3-2.9/package-manifests.ini" + else + tfpPrint("error in finding texmf root!") + end + mtpkgtext = fileRead(mtpdb) + if not mtpkgtext then + tfpPrint("error in reading miktex package database!") + end +end + +local mtpkgdata = {} + +local function mtExtractFiles(name, desc) + -- ignore package files in source or doc folders + -- also ignore latex-dev packages + if name:find("_") or name:find("^latex%-[%a]-%-dev") then + --print(name) + return + end + for base, ext in desc:gmatch("/([%a%d%-]+)%.([%a%d]+)\r?\n") do + if ext == "sty" or ext == "cls" then + dbgPrint(name, base .. "." .. ext) + mtpkgdata[base .. "." .. ext] = name + end + end +end + +local function mtParsePackageDB() + -- package-manifests.ini might use different eol characters + mtpkgtext:gsub("%[(.-)%]\r?\n(.-)\r?\n\r?\n", mtExtractFiles) +end + +------------------------------------------------------------ +--> \section{Compare TeX Live and MiKTeX packages} +------------------------------------------------------------ + +local tlpkgname = "download/texlive.tlpdb" +local mtpkgname = "download/package-manifests.ini" + +local function compareDistributions() + tlpkgtext = fileRead(tlpkgname) + if tlpkgtext then + tlParsePackageDB() + else + tfpPrint("error in reading texlive package database!") + end + mtpkgtext = fileRead(mtpkgname) + if mtpkgtext then + mtParsePackageDB() + else + tfpPrint("error in reading miktex package database!") + end + local tlmissing, mkmissing = {}, {} + for k, vt in pairs(tlpkgdata) do + local vm = mtpkgdata[k] -- or "[none]" + if vm then + mtpkgdata[k] = nil -- remove it + if vm ~= vt then + print("texlive->" .. vt, "miktex->" .. vm, k) + end + else + insert(mkmissing, {vt, k}) + end + end + for k, v in pairs(mtpkgdata) do + print("texlive doesn't include " .. v .. " -> " .. k) + end + for _, v in ipairs(mkmissing) do + print("miktex doesn't include " .. v[1] .. " -> " .. v[2]) + end +end + +------------------------------------------------------------ +--> \section{Generate json file from cwl files} +------------------------------------------------------------ + +local function insertNewValue(tbl, val) + if not valueExists(tbl, val) then + insert(tbl, val) + end +end + +local function extractFileData(cwl) + -- the cwl files have different eol characters + local deps = {} + for d in cwl:gmatch("\n#include:(.-)[\r\n]") do + --dbgPrint(d) + n = d:match("^class-(.+)$") + if n then + insertNewValue(deps, n .. ".cls") + else + insertNewValue(deps, d .. ".sty") + end + end + local envs = {} + for b, e in cwl:gmatch("\n\\begin{(.-)}.-\n\\end{(.-)}") do + if b == e then + --dbgPrint("{" .. e .. "}") + insert(envs, e) + end + end + local cmds = {} + for c in cwl:gmatch("\n\\(%a+)") do + if c ~= "begin" and c ~= "end" then + --dbgPrint("\\" .. c) + if not valueExists(cmds, c) then + insert(cmds, c) + end + end + end + --return {deps, envs, cmds} + return {deps = deps, envs = envs, cmds = cmds} +end + +local function writeJson(cwldata) + tfpPrint("writing json database to file...") + local tbl1 = {} + for k, v in pairs(cwldata) do + table.insert(tbl1, {k, v}) + end + table.sort(tbl1, function(a, b) + if a[1] < b[1] then return true end + end) + local tbl2 = {} + for _, v in ipairs(tbl1) do + local item = '"' .. v[1] .. '":' .. json.tostring(v[2]) + table.insert(tbl2, item) + end + local text = "{\n" .. table.concat(tbl2, "\n,\n") .. "\n}" + fileWrite(text, "texfindpkg.json") + fileWrite(gzip.compress(text), "texfindpkg.json.gz") +end + +local cwlpath = "completion" + +local function generateJsonData() + local list = getFiles(cwlpath, "%.cwl$") + local fname + local cwldata = {} + for _, v in ipairs(list) do + local a, b = match(v, "^([^%-]-)%-(.+)%.cwl") + if a == "class" then + fname = b .. ".cls" + else + b = match(v, "^(.+)%.cwl") + fname = b .. ".sty" + end + --print(fname) + local cwl = fileRead(cwlpath .. "/" .. v) + --print(cwl) + if cwl then + local item = extractFileData(cwl) + dbgPrint(item) + cwldata[fname] = item + else + tfpPrint("error in reading " .. v) + end + end + writeJson(cwldata) +end + +------------------------------------------------------------ +--> \section{Install packages in current TeX distribution} +------------------------------------------------------------ + +local dist -- name of current tex distribution + +local function initPackageDB() + dist = testDistribution() + tfpPrint("you are using " .. dist) + if dist == "texlive" then + tlReadPackageDB() + tlParsePackageDB() + else + mtReadPackageDB() + mtParsePackageDB() + end +end + +local function findOnePackage(fname) + if dist == "texlive" then + return tlpkgdata[fname] + else + return mtpkgdata[fname] + end +end + +local function tfpExecute(c) + if os.type == "windows" then + os.execute(c) + else + os.execute('sudo env "PATH=$PATH" ' .. c) + end +end + +local function installSomePackages(list) + if not list then return end + if dist == "texlive" then + local p = table.concat(list, " ") + tfpPrint("installing package " .. p) + tfpExecute("tlmgr install " .. p) + else + for _, p in ipairs(list) do + tfpPrint("installing package " .. p) + tfpExecute("miktex packages install " .. p) + end + end +end + +local function listSomePackages(list) + if not list then return end + local p = table.concat(list, " ") + tfpPrint("please install " .. dist .. " package " .. p) +end + +------------------------------------------------------------ +--> \section{Find dependencies of package files} +------------------------------------------------------------ + +local tfptext = "" -- the json text +local tfpdata = {} -- the lua object +local fnlist = {} -- file name list + +local function initDependencyDB() + local ziptext = fileRead(lookup("texfindpkg.json.gz")) + tfptext = gzip.decompress(ziptext) + if tfptext then + --print(tfptext) + tfpdata = json.tolua(tfptext) + else + tfpPrint("error in reading texfindpkg.json.gz!") + end +end + +local function findDependencies(fname) + --print(fname) + if valueExists(fnlist, fname) then return end + local item = tfpdata[fname] + if not item then + tfpPrint("no dependency info for " .. fname) + return + end + tfpPrint("finding dependencies for " .. fname) + table.insert(fnlist, fname) + local deps = item.deps + if deps then + for _, dname in ipairs(deps) do + findDependencies(dname) + end + end +end + +local function queryByFileName(fname) + fnlist = {} -- reset the list + findDependencies(fname) + if #fnlist == 0 then + tfpPrint("could not find any package with file " .. fname) + return + end + local pkglist = {} + for _, fn in ipairs(fnlist) do + local pkg = findOnePackage(fn) + --print(fn, pkg) + if pkg then + table.insert(pkglist, pkg) + end + end + if not pkglist then + tfpPrint("error in finding package in " .. dist) + return + end + return pkglist +end + +local function getFileNameFromCmdEnvName(cmdenv, name) + --print(name) + for line in tfptext:gmatch("(.-)\n[,}]") do + if line:find('"' .. name .. '"') then + --print(line) + local fname, fspec = line:match('"(.-)":(.+)') + --print(fname, fspec) + local item = json.tolua(fspec) + if valueExists(item[cmdenv], name) then + tfpPrint("found package file " .. fname) + return fname + end + end + end +end + +local function queryByCommandName(cname) + --print(cname) + local fname = getFileNameFromCmdEnvName("cmds", cname) + if fname then + return queryByFileName(fname) + else + tfpPrint("could not find any package with command \\" .. cname) + end +end + +local function queryByEnvironmentName(ename) + --print(ename) + local fname = getFileNameFromCmdEnvName("envs", ename) + if fname then + return queryByFileName(fname) + else + tfpPrint("could not find any package with environment {" .. ename .. "}") + end +end + +local function query(name) + local h = name:sub(1,1) + if h == "\\" then + local b = name:sub(2) + return queryByCommandName(b) + elseif h == "{" then + if name:sub(-1) == "}" then + local b = name:sub(2,-2) + return queryByEnvironmentName(b) + else + tfpPrint("invalid input " .. name) + end + else + return queryByFileName(name) + end +end + +local function install(name) + local list = query(name) + installSomePackages(list) +end + +------------------------------------------------------------ +--> \section{Respond to user input} +------------------------------------------------------------ + +local helptext = [[ +usage: texfindpkg [] [] + +Valid actions are: + install Install some package and its dependencies + query Query dependencies for some package + +Valid options are: + --help Print this message and exit + --version Print version information and exit +]] + +local function main() + if arg[1] == nil then + print(helptext) + elseif arg[1] == "--help" then + print(helptext) + elseif arg[1] == "--version" then + print("TeXFindPkg Version " .. tfpversion .. " (" .. tfpdate .. ")\n") + elseif arg[1] == "install" then + if arg[2] then + initPackageDB() + initDependencyDB() + install(arg[2]) + else + tfpPrint("missing the name of file/cmd/env!") + end + elseif arg[1] == "query" then + if arg[2] then + initPackageDB() + initDependencyDB() + local list = query(arg[2]) + listSomePackages(list) + else + tfpPrint("missing the name of file/cmd/env!") + end + elseif arg[1] == "generate" then + generateJsonData() + elseif arg[1] == "compare" then + compareDistributions() + else + tfpPrint("unknown option " .. arg[1]) + end +end + +main() diff --git a/Master/bin/aarch64-linux/texfindpkg b/Master/bin/aarch64-linux/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/aarch64-linux/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/amd64-freebsd/texfindpkg b/Master/bin/amd64-freebsd/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/amd64-freebsd/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/amd64-netbsd/texfindpkg b/Master/bin/amd64-netbsd/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/amd64-netbsd/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/armhf-linux/texfindpkg b/Master/bin/armhf-linux/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/armhf-linux/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/i386-freebsd/texfindpkg b/Master/bin/i386-freebsd/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/i386-freebsd/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/i386-linux/texfindpkg b/Master/bin/i386-linux/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/i386-linux/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/i386-netbsd/texfindpkg b/Master/bin/i386-netbsd/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/i386-netbsd/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/i386-solaris/texfindpkg b/Master/bin/i386-solaris/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/i386-solaris/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/universal-darwin/texfindpkg b/Master/bin/universal-darwin/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/universal-darwin/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/windows/texfindpkg.exe b/Master/bin/windows/texfindpkg.exe new file mode 100755 index 00000000000..3332231b08c Binary files /dev/null and b/Master/bin/windows/texfindpkg.exe differ diff --git a/Master/bin/x86_64-cygwin/texfindpkg b/Master/bin/x86_64-cygwin/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/x86_64-cygwin/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/x86_64-darwinlegacy/texfindpkg b/Master/bin/x86_64-darwinlegacy/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/x86_64-darwinlegacy/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/x86_64-linux/texfindpkg b/Master/bin/x86_64-linux/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/x86_64-linux/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/x86_64-linuxmusl/texfindpkg b/Master/bin/x86_64-linuxmusl/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/x86_64-linuxmusl/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/bin/x86_64-solaris/texfindpkg b/Master/bin/x86_64-solaris/texfindpkg new file mode 120000 index 00000000000..f0483af74c7 --- /dev/null +++ b/Master/bin/x86_64-solaris/texfindpkg @@ -0,0 +1 @@ +../../texmf-dist/scripts/texfindpkg/texfindpkg.lua \ No newline at end of file diff --git a/Master/texmf-dist/doc/man/man1/texfindpkg.1 b/Master/texmf-dist/doc/man/man1/texfindpkg.1 new file mode 100644 index 00000000000..22d7c8534c6 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/texfindpkg.1 @@ -0,0 +1,26 @@ +.TH texfindpkg 1 "2023-04-05" "2023D" +.SH NAME +TexFindPkg \- Install TeX packages and their dependencies +.SH SYNOPSIS +texfindpkg [] [] +.SH DESCRIPTION +TeXFindPkg makes it easy to install TeX packages and their dependencies +by file names, command names or environment names. +.PP +The most commonly used TeXFindPkg actions are: +.IP install +Install some package and its dependencies +.IP query +Query dependencies for some package +.SH OPTIONS +Various options apply +.IP --help +Print a help message and exit +.IP --version +Print version information and exit +.SH BUGS +.SH AUTHOR +Jianrui Lyu +.PP +Please log issues on the GitHub homepage: +https://github.com/lvjr/texfindpkg/issues. diff --git a/Master/texmf-dist/doc/man/man1/texfindpkg.man1.pdf b/Master/texmf-dist/doc/man/man1/texfindpkg.man1.pdf new file mode 100644 index 00000000000..260670a72bf Binary files /dev/null and b/Master/texmf-dist/doc/man/man1/texfindpkg.man1.pdf differ diff --git a/Master/texmf-dist/doc/support/texfindpkg/README.md b/Master/texmf-dist/doc/support/texfindpkg/README.md new file mode 100644 index 00000000000..d0822b625d7 --- /dev/null +++ b/Master/texmf-dist/doc/support/texfindpkg/README.md @@ -0,0 +1,58 @@ +# TeXFindPkg tool for installing TeX packages + +``` +Description: Install TeX packages and their dependencies +Copyright: 2023 (c) Jianrui Lyu +Repository: https://github.com/lvjr/texfindpkg +License: GNU General Public License v3.0 +``` + +## Introduction + +TeXFindPkg makes it easy to install TeX packages and their dependencies by file names, command names or environment names. + +- To install a package by its file name you can run `texfindpkg install array.sty`; +- To install a package by some command name you can run `texfindpkg install \fakeverb`; +- To install a package by some environment name you can run `texfindpkg install {frame}`. + +TeXFindPkg supports both TeXLive and MiKTeX distributions. At present it focuses mainly on LaTeX packages, +but may extend to ConTeXt packages if anyone would like to contribute. + +## Installation + +Your TeX distribution should have created a binary file `texfindpkg` when you install this package. +If not, you could create a symbolic link from `/usr/local/bin/texfindpkg` to `texfindpkg.lua` on Linux or MacOS, +or create a batch file `texfindpkg.bat` in binary folder of the TeX distribution with these lines on Windows: + +``` +@echo off +texlua path\to\texfindpkg.lua %* +``` + +## Usage + +``` +texfindpkg [] [] +``` + +where `` could be `install` or `query`, and `` could be file name, command name or environment name. +For example: + +``` +texfindpkg install array.sty +texfindpkg install \fakeverb +texfindpkg install {frame} +texfindpkg query array.sty +texfindpkg query \fakeverb +texfindpkg query {frame} +``` + +## Building + +TeXFindPkg uses completion files of TeXstudio editor which are in `completion` folder of TeXstudio [repository](https://github.com/texstudio-org/texstudio). + +After putting `completion` folder into current folder, you can run `texlua texfindpkg.lua generate` to generate `texfindpkg.json` and `texfindpkg.json.gz` files. + +## Contributing + +Any updates of dependencies, commands or environments for packages should be contributed directly to TeXstudio project. diff --git a/Master/texmf-dist/scripts/texfindpkg/texfindpkg.lua b/Master/texmf-dist/scripts/texfindpkg/texfindpkg.lua new file mode 100755 index 00000000000..f2845f9d907 --- /dev/null +++ b/Master/texmf-dist/scripts/texfindpkg/texfindpkg.lua @@ -0,0 +1,522 @@ +#!/usr/bin/env texlua + +-- Description: Install TeX packages and their dependencies +-- Copyright: 2023 (c) Jianrui Lyu +-- Repository: https://github.com/lvjr/texfindpkg +-- License: GNU General Public License v3.0 + +local tfpversion = "2023D" +local tfpdate = "2023-04-05" + +------------------------------------------------------------ +--> \section{Some variables and functions} +------------------------------------------------------------ + +local lfs = require("lfs") +local insert = table.insert +local match = string.match + +local lookup = kpse.lookup +kpse.set_program_name("kpsewhich") + +require(lookup("lualibs.lua")) +local json = utilities.json -- for json.tostring and json.tolua +local gzip = gzip -- for gzip.compress and gzip.decompress + +local function tfpPrint(msg) + print("[tfp] " .. msg) +end + +local showdbg = false + +local function dbgPrint(msg) + if showdbg then print("[debug] " .. msg) end +end + +local function valueExists(tab, val) + for _, v in ipairs(tab) do + if v == val then return true end + end + return false +end + +local function getFiles(path, pattern) + local files = { } + for entry in lfs.dir(path) do + if match(entry, pattern) then + insert(files, entry) + end + end + return files +end + +local function fileRead(input) + local f = io.open(input, "rb") + local text + if f then -- file exists and is readable + text = f:read("*all") + f:close() + --print(#text) + return text + end + -- return nil if file doesn't exists or isn't readable +end + +local function fileWrite(text, output) + -- using "wb" keeps unix eol characters + f = io.open(output, "wb") + f:write(text) + f:close() +end + +local function testDistribution() + -- texlive returns "texmf-dist/web2c/updmap.cfg" + -- miktex returns nil although there is "texmfs/install/miktex/config/updmap.cfg" + local d = lookup("updmap.cfg") + if d then + return "texlive" + else + return "miktex" + end +end + +------------------------------------------------------------ +--> \section{Handle TeX Live package database} +------------------------------------------------------------ + +local tlpkgtext + +local function tlReadPackageDB() + local tlroot = kpse.var_value("TEXMFROOT") + if tlroot then + tlroot = tlroot .. "/tlpkg" + else + tfpPrint("error in finding texmf root!") + end + local list = getFiles(tlroot, "^texlive%.tlpdb%.main") + if #list > 0 then + tlpkgtext = fileRead(tlroot .. "/" .. list[1]) + if not tlpkgtext then + tfpPrint("error in reading texlive package database!") + end + else + -- no texlive.tlpdb.main file in a fresh TeX live + tfpPrint("error in finding texlive package database!") + tfpPrint("please run 'tlmgr update --self' first.") + end +end + +local tlpkgdata = {} + +local function tlExtractFiles(name, desc) + -- ignore binary packages + -- also ignore latex-dev packages + if name:find("%.") or name:find("^latex%-[%a]-%-dev") then + --print(name) + return + end + -- ignore package files in doc folder + desc = desc:match("\nrunfiles .+") or "" + for base, ext in desc:gmatch("/([%a%d%-]+)%.([%a%d]+)\n") do + if ext == "sty" or ext == "cls" then + dbgPrint(name, base .. "." .. ext) + tlpkgdata[base .. "." .. ext] = name + end + end +end + +local function tlParsePackageDB() + tlpkgtext:gsub("name (.-)\n(.-)\n\n", tlExtractFiles) +end + +------------------------------------------------------------ +--> \section{Handle MiKTeX package database} +------------------------------------------------------------ + +local mtpkgtext + +local function mtReadPackageDB() + local mtvar = kpse.var_value("TEXMFVAR") + if mtvar then + mtpdb = mtvar .. "/miktex/cache/packages/miktex-zzdb3-2.9/package-manifests.ini" + else + tfpPrint("error in finding texmf root!") + end + mtpkgtext = fileRead(mtpdb) + if not mtpkgtext then + tfpPrint("error in reading miktex package database!") + end +end + +local mtpkgdata = {} + +local function mtExtractFiles(name, desc) + -- ignore package files in source or doc folders + -- also ignore latex-dev packages + if name:find("_") or name:find("^latex%-[%a]-%-dev") then + --print(name) + return + end + for base, ext in desc:gmatch("/([%a%d%-]+)%.([%a%d]+)\r?\n") do + if ext == "sty" or ext == "cls" then + dbgPrint(name, base .. "." .. ext) + mtpkgdata[base .. "." .. ext] = name + end + end +end + +local function mtParsePackageDB() + -- package-manifests.ini might use different eol characters + mtpkgtext:gsub("%[(.-)%]\r?\n(.-)\r?\n\r?\n", mtExtractFiles) +end + +------------------------------------------------------------ +--> \section{Compare TeX Live and MiKTeX packages} +------------------------------------------------------------ + +local tlpkgname = "download/texlive.tlpdb" +local mtpkgname = "download/package-manifests.ini" + +local function compareDistributions() + tlpkgtext = fileRead(tlpkgname) + if tlpkgtext then + tlParsePackageDB() + else + tfpPrint("error in reading texlive package database!") + end + mtpkgtext = fileRead(mtpkgname) + if mtpkgtext then + mtParsePackageDB() + else + tfpPrint("error in reading miktex package database!") + end + local tlmissing, mkmissing = {}, {} + for k, vt in pairs(tlpkgdata) do + local vm = mtpkgdata[k] -- or "[none]" + if vm then + mtpkgdata[k] = nil -- remove it + if vm ~= vt then + print("texlive->" .. vt, "miktex->" .. vm, k) + end + else + insert(mkmissing, {vt, k}) + end + end + for k, v in pairs(mtpkgdata) do + print("texlive doesn't include " .. v .. " -> " .. k) + end + for _, v in ipairs(mkmissing) do + print("miktex doesn't include " .. v[1] .. " -> " .. v[2]) + end +end + +------------------------------------------------------------ +--> \section{Generate json file from cwl files} +------------------------------------------------------------ + +local function insertNewValue(tbl, val) + if not valueExists(tbl, val) then + insert(tbl, val) + end +end + +local function extractFileData(cwl) + -- the cwl files have different eol characters + local deps = {} + for d in cwl:gmatch("\n#include:(.-)[\r\n]") do + --dbgPrint(d) + n = d:match("^class-(.+)$") + if n then + insertNewValue(deps, n .. ".cls") + else + insertNewValue(deps, d .. ".sty") + end + end + local envs = {} + for b, e in cwl:gmatch("\n\\begin{(.-)}.-\n\\end{(.-)}") do + if b == e then + --dbgPrint("{" .. e .. "}") + insert(envs, e) + end + end + local cmds = {} + for c in cwl:gmatch("\n\\(%a+)") do + if c ~= "begin" and c ~= "end" then + --dbgPrint("\\" .. c) + if not valueExists(cmds, c) then + insert(cmds, c) + end + end + end + --return {deps, envs, cmds} + return {deps = deps, envs = envs, cmds = cmds} +end + +local function writeJson(cwldata) + tfpPrint("writing json database to file...") + local tbl1 = {} + for k, v in pairs(cwldata) do + table.insert(tbl1, {k, v}) + end + table.sort(tbl1, function(a, b) + if a[1] < b[1] then return true end + end) + local tbl2 = {} + for _, v in ipairs(tbl1) do + local item = '"' .. v[1] .. '":' .. json.tostring(v[2]) + table.insert(tbl2, item) + end + local text = "{\n" .. table.concat(tbl2, "\n,\n") .. "\n}" + fileWrite(text, "texfindpkg.json") + fileWrite(gzip.compress(text), "texfindpkg.json.gz") +end + +local cwlpath = "completion" + +local function generateJsonData() + local list = getFiles(cwlpath, "%.cwl$") + local fname + local cwldata = {} + for _, v in ipairs(list) do + local a, b = match(v, "^([^%-]-)%-(.+)%.cwl") + if a == "class" then + fname = b .. ".cls" + else + b = match(v, "^(.+)%.cwl") + fname = b .. ".sty" + end + --print(fname) + local cwl = fileRead(cwlpath .. "/" .. v) + --print(cwl) + if cwl then + local item = extractFileData(cwl) + dbgPrint(item) + cwldata[fname] = item + else + tfpPrint("error in reading " .. v) + end + end + writeJson(cwldata) +end + +------------------------------------------------------------ +--> \section{Install packages in current TeX distribution} +------------------------------------------------------------ + +local dist -- name of current tex distribution + +local function initPackageDB() + dist = testDistribution() + tfpPrint("you are using " .. dist) + if dist == "texlive" then + tlReadPackageDB() + tlParsePackageDB() + else + mtReadPackageDB() + mtParsePackageDB() + end +end + +local function findOnePackage(fname) + if dist == "texlive" then + return tlpkgdata[fname] + else + return mtpkgdata[fname] + end +end + +local function tfpExecute(c) + if os.type == "windows" then + os.execute(c) + else + os.execute('sudo env "PATH=$PATH" ' .. c) + end +end + +local function installSomePackages(list) + if not list then return end + if dist == "texlive" then + local p = table.concat(list, " ") + tfpPrint("installing package " .. p) + tfpExecute("tlmgr install " .. p) + else + for _, p in ipairs(list) do + tfpPrint("installing package " .. p) + tfpExecute("miktex packages install " .. p) + end + end +end + +local function listSomePackages(list) + if not list then return end + local p = table.concat(list, " ") + tfpPrint("please install " .. dist .. " package " .. p) +end + +------------------------------------------------------------ +--> \section{Find dependencies of package files} +------------------------------------------------------------ + +local tfptext = "" -- the json text +local tfpdata = {} -- the lua object +local fnlist = {} -- file name list + +local function initDependencyDB() + local ziptext = fileRead(lookup("texfindpkg.json.gz")) + tfptext = gzip.decompress(ziptext) + if tfptext then + --print(tfptext) + tfpdata = json.tolua(tfptext) + else + tfpPrint("error in reading texfindpkg.json.gz!") + end +end + +local function findDependencies(fname) + --print(fname) + if valueExists(fnlist, fname) then return end + local item = tfpdata[fname] + if not item then + tfpPrint("no dependency info for " .. fname) + return + end + tfpPrint("finding dependencies for " .. fname) + table.insert(fnlist, fname) + local deps = item.deps + if deps then + for _, dname in ipairs(deps) do + findDependencies(dname) + end + end +end + +local function queryByFileName(fname) + fnlist = {} -- reset the list + findDependencies(fname) + if #fnlist == 0 then + tfpPrint("could not find any package with file " .. fname) + return + end + local pkglist = {} + for _, fn in ipairs(fnlist) do + local pkg = findOnePackage(fn) + --print(fn, pkg) + if pkg then + table.insert(pkglist, pkg) + end + end + if not pkglist then + tfpPrint("error in finding package in " .. dist) + return + end + return pkglist +end + +local function getFileNameFromCmdEnvName(cmdenv, name) + --print(name) + for line in tfptext:gmatch("(.-)\n[,}]") do + if line:find('"' .. name .. '"') then + --print(line) + local fname, fspec = line:match('"(.-)":(.+)') + --print(fname, fspec) + local item = json.tolua(fspec) + if valueExists(item[cmdenv], name) then + tfpPrint("found package file " .. fname) + return fname + end + end + end +end + +local function queryByCommandName(cname) + --print(cname) + local fname = getFileNameFromCmdEnvName("cmds", cname) + if fname then + return queryByFileName(fname) + else + tfpPrint("could not find any package with command \\" .. cname) + end +end + +local function queryByEnvironmentName(ename) + --print(ename) + local fname = getFileNameFromCmdEnvName("envs", ename) + if fname then + return queryByFileName(fname) + else + tfpPrint("could not find any package with environment {" .. ename .. "}") + end +end + +local function query(name) + local h = name:sub(1,1) + if h == "\\" then + local b = name:sub(2) + return queryByCommandName(b) + elseif h == "{" then + if name:sub(-1) == "}" then + local b = name:sub(2,-2) + return queryByEnvironmentName(b) + else + tfpPrint("invalid input " .. name) + end + else + return queryByFileName(name) + end +end + +local function install(name) + local list = query(name) + installSomePackages(list) +end + +------------------------------------------------------------ +--> \section{Respond to user input} +------------------------------------------------------------ + +local helptext = [[ +usage: texfindpkg [] [] + +Valid actions are: + install Install some package and its dependencies + query Query dependencies for some package + +Valid options are: + --help Print this message and exit + --version Print version information and exit +]] + +local function main() + if arg[1] == nil then + print(helptext) + elseif arg[1] == "--help" then + print(helptext) + elseif arg[1] == "--version" then + print("TeXFindPkg Version " .. tfpversion .. " (" .. tfpdate .. ")\n") + elseif arg[1] == "install" then + if arg[2] then + initPackageDB() + initDependencyDB() + install(arg[2]) + else + tfpPrint("missing the name of file/cmd/env!") + end + elseif arg[1] == "query" then + if arg[2] then + initPackageDB() + initDependencyDB() + local list = query(arg[2]) + listSomePackages(list) + else + tfpPrint("missing the name of file/cmd/env!") + end + elseif arg[1] == "generate" then + generateJsonData() + elseif arg[1] == "compare" then + compareDistributions() + else + tfpPrint("unknown option " .. arg[1]) + end +end + +main() diff --git a/Master/texmf-dist/tex/latex/texfindpkg/texfindpkg.json.gz b/Master/texmf-dist/tex/latex/texfindpkg/texfindpkg.json.gz new file mode 100644 index 00000000000..aec9bb158e3 Binary files /dev/null and b/Master/texmf-dist/tex/latex/texfindpkg/texfindpkg.json.gz differ diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index d354f229cc0..7e1ff979b64 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -327,7 +327,7 @@ my @TLP_working = qw( fifinddo-info fifo-stack fig4latex figbas figbib figchild figflow figput figsize filecontents filecontentsdef filedate filehook fileinfo filemod - findhyph findpkg fink finstrut fira firamath firamath-otf + findhyph fink finstrut fira firamath firamath-otf first-latex-doc firstaid fistrum fitbox fithesis fix2col fixcmex fixdif fixfoot fixjfm fixlatvian fixltxhyph fixmath fixme fixmetodonotes fixpdfmag fiziko @@ -795,7 +795,7 @@ my @TLP_working = qw( tex-refs tex-virtual-academy-pl tex-vpat tex4ebook texaccents texapi texbytopic texcount texdate texdef texdiff texdimens texdirflatten texdoc texdraw - texfot texinfo texilikechaps texilikecover + texfindpkg texfot texinfo texilikechaps texilikecover texliveonfly texloganalyser texlogfilter texlogos texlogsieve texmate texments texnegar texonly texosquery texplate texpower texproposal texshade texsurgery diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 3fda3698936..80dacfb330a 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2092,7 +2092,6 @@ $standardtex 'fancytooltips', 'fancytipmark\..*|' . $standardtex, 'fewerfloatpages', '\.sty$', # not l3doc-TUB.cls 'figflow', '\.tex', - 'findpkg', '\.json.gz|' . $standardtex, 'fjodor', 'fjodor\.sty', # not srbook-mem.sty 'flashmovie', '\.swf|' . $standardtex, 'fltpoint', '\.sty|\.tex', @@ -2413,6 +2412,7 @@ $standardtex 'texdimens', 'texdimens\.tex$|' . $standardtex, 'texdoc', 'NULL', # not texdoc-doc.cls 'texdraw', 'tex$|' . $standardtex, + 'texfindpkg', '\.json.gz$', 'texosquery', '\.tex$|' . $standardtex, 'texproposal', 'NULL', 'texsis', '\.txs|TXS.*tex|texsis.tex', @@ -3699,6 +3699,7 @@ $standardttf = '\.ttf|\.TTC'; 'texdiff' => 'texdiff$', 'texdirflatten' => 'texdirflatten$', 'texdoc', => 'texdoc\.tlu$', + 'texfindpkg' => 'texfindpkg\.lua$', 'texfot' => 'texfot\.pl$', 'texliveonfly' => '\.py$', 'texloganalyser' => 'texloganalyser$', @@ -3789,6 +3790,7 @@ $standardttf = '\.ttf|\.TTC'; 'texdiff' => 'texdiff.1', 'texdirflatten' => 'texdirflatten.1', 'texdoc' => '\.1$', + 'texfindpkg' => '\.1$', 'texfot' => '\.1$', 'texlogfilter' => '\.1$', 'texlogsieve' => '\.1$', diff --git a/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc b/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc index 9ab116a7881..22f6693b5a7 100644 --- a/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc @@ -23,7 +23,6 @@ depend ekdosis depend emoji depend emojicite depend enigma -depend findpkg depend innerscript depend interpreter depend kanaparser @@ -98,6 +97,7 @@ depend showkerning depend spacekern depend spelling depend stricttex +depend texfindpkg depend truthtable depend tsvtemplate depend typewriter diff --git a/Master/tlpkg/tlpsrc/texfindpkg.tlpsrc b/Master/tlpkg/tlpsrc/texfindpkg.tlpsrc new file mode 100644 index 00000000000..dca338c719c --- /dev/null +++ b/Master/tlpkg/tlpsrc/texfindpkg.tlpsrc @@ -0,0 +1 @@ +binpattern f bin/${ARCH}/${PKGNAME} -- cgit v1.2.3