summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-03-28 20:08:03 +0000
committerKarl Berry <karl@freefriends.org>2024-03-28 20:08:03 +0000
commit8a663007cac5d5da877f52490ed1d9063e2d37ad (patch)
tree73cf4167ff149391bfacb16651d63f15e23616c2
parent85ca2f98c34c2ed8193357123c730d35c11d2f9d (diff)
l3sys-query (28mar24)
git-svn-id: svn://tug.org/texlive/trunk@70797 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/l3sys-query/l3sys-query.lua28
-rw-r--r--Master/texmf-dist/doc/man/man1/l3sys-query.12
-rw-r--r--Master/texmf-dist/doc/man/man1/l3sys-query.man1.pdfbin11905 -> 11920 bytes
-rw-r--r--Master/texmf-dist/doc/support/l3sys-query/CHANGELOG.md8
-rw-r--r--Master/texmf-dist/doc/support/l3sys-query/README.md2
-rw-r--r--Master/texmf-dist/doc/support/l3sys-query/l3sys-query-tool.pdfbin374018 -> 373897 bytes
-rw-r--r--Master/texmf-dist/doc/support/l3sys-query/l3sys-query-tool.tex2
-rwxr-xr-xMaster/texmf-dist/scripts/l3sys-query/l3sys-query.lua28
8 files changed, 48 insertions, 22 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3sys-query/l3sys-query.lua b/Build/source/texk/texlive/linked_scripts/l3sys-query/l3sys-query.lua
index 03e86296af4..a47513bd246 100755
--- a/Build/source/texk/texlive/linked_scripts/l3sys-query/l3sys-query.lua
+++ b/Build/source/texk/texlive/linked_scripts/l3sys-query/l3sys-query.lua
@@ -36,7 +36,7 @@ for those people who are interested.
-- Details of the script itself, etc.
--
local copyright = "Copyright (C) 2024 The LaTeX Project"
-local release_date = "2024-03-15"
+local release_date = "2024-03-28"
local script_desc = "System queries for LaTeX using Lua\n"
local script_name = "l3sys-query"
@@ -51,7 +51,7 @@ local option_list =
exclude =
{
cmds = {"ls"},
- desc = "Exclude entries from directory listing",
+ desc = "[<xarg>] Exclude entries from directory listing",
type = "string"
},
["ignore-case"] =
@@ -89,13 +89,13 @@ local option_list =
sort =
{
cmds = {"ls"},
- desc = "Method used to sort directory listing",
+ desc = "[name|date] Method used to sort directory listing",
type = "string"
},
type =
{
cmds = {"ls"},
- desc = "Selects the type of entry in a directory listing",
+ desc = "[d|f] Select just the directories or files in a listing",
type = "string"
},
version =
@@ -235,6 +235,8 @@ local function parse_args()
-- No options are allowed in position 1, so filter those out
if a == "--version" or a == "-v" then
cmd = "version"
+ elseif a == "--help" or a == "-h" then
+ cmd = "help"
elseif not match(a,"^%-") then
cmd = a
end
@@ -523,14 +525,16 @@ end
--
-- Execute the given command
--
-
--- Only 'known' commands do anything at all
-if cmd == "version" then
+if cmd == "help" then
+ help()
+ exit(0)
+elseif cmd == "version" then
version()
exit(0)
+-- Only 'known' commands do anything at all
elseif not cmd_impl[cmd] then
if cmd == "" then
- help()
+ info_and_quit(script_name .. ": No " .. script_name .. " command specified.")
else
info_and_quit(script_name .. ": '" .. cmd .. "' is not a " .. script_name ..
" command.")
@@ -541,7 +545,13 @@ end
-- Check options are valid for cmd
for k,_ in pairs(options) do
local cmds = option_list[k].cmds
- if not cmds then
+ if k == "help" then
+ help()
+ exit(0)
+ elseif k == "version" then
+ version()
+ exit(0)
+ elseif not cmds then
-- Should not be possible:
-- everything except --help and --version should have an entry
print("Internal error")
diff --git a/Master/texmf-dist/doc/man/man1/l3sys-query.1 b/Master/texmf-dist/doc/man/man1/l3sys-query.1
index 146d0e4c2c6..1d8161899cc 100644
--- a/Master/texmf-dist/doc/man/man1/l3sys-query.1
+++ b/Master/texmf-dist/doc/man/man1/l3sys-query.1
@@ -1,4 +1,4 @@
-.TH L3SYS-QUERY 1 "2024-03-15" "LaTeX"
+.TH L3SYS-QUERY 1 "2024-03-28" "LaTeX"
.SH NAME
l3sys-query
diff --git a/Master/texmf-dist/doc/man/man1/l3sys-query.man1.pdf b/Master/texmf-dist/doc/man/man1/l3sys-query.man1.pdf
index e518f97c762..dfd6423ebf0 100644
--- a/Master/texmf-dist/doc/man/man1/l3sys-query.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/l3sys-query.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/l3sys-query/CHANGELOG.md b/Master/texmf-dist/doc/support/l3sys-query/CHANGELOG.md
index b11654d5124..88c4e685bb7 100644
--- a/Master/texmf-dist/doc/support/l3sys-query/CHANGELOG.md
+++ b/Master/texmf-dist/doc/support/l3sys-query/CHANGELOG.md
@@ -7,6 +7,11 @@ Changelog](https://keepachangelog.com/en/1.0.0/), this project uses date-based
## [Unreleased]
+## [2024-03-28]
+
+### Changed
+- Improvements to help
+
## [2024-03-15]
### Added
@@ -21,5 +26,6 @@ Changelog](https://keepachangelog.com/en/1.0.0/), this project uses date-based
### Added
- New script
-[Unreleased]: https://github.com/latex3/l3sys-query/compare/2024-03-15...HEAD
+[Unreleased]: https://github.com/latex3/l3sys-query/compare/2024-03-28...HEAD
+[2024-03-28]: https://github.com/latex3/l3sys-query/compare/2024-03-15...2024-03-28
[2024-03-15]: https://github.com/latex3/l3sys-query/compare/2024-03-14...2024-03-15
diff --git a/Master/texmf-dist/doc/support/l3sys-query/README.md b/Master/texmf-dist/doc/support/l3sys-query/README.md
index 1b9998f29ee..b5303aa1120 100644
--- a/Master/texmf-dist/doc/support/l3sys-query/README.md
+++ b/Master/texmf-dist/doc/support/l3sys-query/README.md
@@ -1,6 +1,6 @@
# `l3sys-query`: System queries for LaTeX using Lua
-Release 2024-03-15
+Release 2024-03-28
## Overview
diff --git a/Master/texmf-dist/doc/support/l3sys-query/l3sys-query-tool.pdf b/Master/texmf-dist/doc/support/l3sys-query/l3sys-query-tool.pdf
index 78e26662695..edccd8a6f1d 100644
--- a/Master/texmf-dist/doc/support/l3sys-query/l3sys-query-tool.pdf
+++ b/Master/texmf-dist/doc/support/l3sys-query/l3sys-query-tool.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/l3sys-query/l3sys-query-tool.tex b/Master/texmf-dist/doc/support/l3sys-query/l3sys-query-tool.tex
index d9b99d59c1c..83274a416bb 100644
--- a/Master/texmf-dist/doc/support/l3sys-query/l3sys-query-tool.tex
+++ b/Master/texmf-dist/doc/support/l3sys-query/l3sys-query-tool.tex
@@ -45,7 +45,7 @@ for those people who are interested.
}%
}
-\date{Release 2024-03-15}
+\date{Release 2024-03-28}
\maketitle
\tableofcontents
diff --git a/Master/texmf-dist/scripts/l3sys-query/l3sys-query.lua b/Master/texmf-dist/scripts/l3sys-query/l3sys-query.lua
index 03e86296af4..a47513bd246 100755
--- a/Master/texmf-dist/scripts/l3sys-query/l3sys-query.lua
+++ b/Master/texmf-dist/scripts/l3sys-query/l3sys-query.lua
@@ -36,7 +36,7 @@ for those people who are interested.
-- Details of the script itself, etc.
--
local copyright = "Copyright (C) 2024 The LaTeX Project"
-local release_date = "2024-03-15"
+local release_date = "2024-03-28"
local script_desc = "System queries for LaTeX using Lua\n"
local script_name = "l3sys-query"
@@ -51,7 +51,7 @@ local option_list =
exclude =
{
cmds = {"ls"},
- desc = "Exclude entries from directory listing",
+ desc = "[<xarg>] Exclude entries from directory listing",
type = "string"
},
["ignore-case"] =
@@ -89,13 +89,13 @@ local option_list =
sort =
{
cmds = {"ls"},
- desc = "Method used to sort directory listing",
+ desc = "[name|date] Method used to sort directory listing",
type = "string"
},
type =
{
cmds = {"ls"},
- desc = "Selects the type of entry in a directory listing",
+ desc = "[d|f] Select just the directories or files in a listing",
type = "string"
},
version =
@@ -235,6 +235,8 @@ local function parse_args()
-- No options are allowed in position 1, so filter those out
if a == "--version" or a == "-v" then
cmd = "version"
+ elseif a == "--help" or a == "-h" then
+ cmd = "help"
elseif not match(a,"^%-") then
cmd = a
end
@@ -523,14 +525,16 @@ end
--
-- Execute the given command
--
-
--- Only 'known' commands do anything at all
-if cmd == "version" then
+if cmd == "help" then
+ help()
+ exit(0)
+elseif cmd == "version" then
version()
exit(0)
+-- Only 'known' commands do anything at all
elseif not cmd_impl[cmd] then
if cmd == "" then
- help()
+ info_and_quit(script_name .. ": No " .. script_name .. " command specified.")
else
info_and_quit(script_name .. ": '" .. cmd .. "' is not a " .. script_name ..
" command.")
@@ -541,7 +545,13 @@ end
-- Check options are valid for cmd
for k,_ in pairs(options) do
local cmds = option_list[k].cmds
- if not cmds then
+ if k == "help" then
+ help()
+ exit(0)
+ elseif k == "version" then
+ version()
+ exit(0)
+ elseif not cmds then
-- Should not be possible:
-- everything except --help and --version should have an entry
print("Internal error")