summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/texosquery
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-04 22:21:35 +0000
committerKarl Berry <karl@freefriends.org>2020-02-04 22:21:35 +0000
commit917d88e18565c63eafc33a5257b48626365dddef (patch)
tree0aab66e45586e37af6996eff20be341d87ebbedc /Master/texmf-dist/tex/latex/texosquery
parent8f297a0f3c1cb1bae98db441a5f5964a066150e1 (diff)
texosquery (4feb20)
git-svn-id: svn://tug.org/texlive/trunk@53676 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/texosquery')
-rw-r--r--Master/texmf-dist/tex/latex/texosquery/texosquery.cfg23
-rw-r--r--Master/texmf-dist/tex/latex/texosquery/texosquery.sty2
-rw-r--r--Master/texmf-dist/tex/latex/texosquery/texosquery.tex8
3 files changed, 18 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/texosquery/texosquery.cfg b/Master/texmf-dist/tex/latex/texosquery/texosquery.cfg
index 0e76d55006d..416eb95427a 100644
--- a/Master/texmf-dist/tex/latex/texosquery/texosquery.cfg
+++ b/Master/texmf-dist/tex/latex/texosquery/texosquery.cfg
@@ -18,27 +18,30 @@
% from your command line.
% * If the version number starts with "1.5" or "1.6" then
-% \TeXOSInvokerName must be texosquery-jre5
+% \TeXOSInvokerName must be texosquery-jre5
+% and \TeXOSQueryAllowRestricted must be commented out
%
% * If the version number starts with "1.7" then
-% \TeXOSInvokerName must be texosquery
+% \TeXOSInvokerName must be texosquery
+% and \TeXOSQueryAllowRestricted must be commented out
%
-% * If the version number starts with "1.8" then
-% \TeXOSInvokerName must be texosquery-jre8
+% * If the version number starts with "1.8" or above then
+% \TeXOSInvokerName must be texosquery-jre8
+% and \TeXOSQueryAllowRestricted should be uncommented if
+% texosquery-jre8 is on the restricted list. (This has been the
+% case since TeX Live 2017.)
% (bash users need to check that the .sh extension has been removed
% from the bash scripts.)
-\def\TeXOSInvokerName{texosquery}
+\def\TeXOSInvokerName{texosquery-jre8}
% 2. If the invoker name given in the definition above is on the
-% restricted list, uncomment the line below to allow it to be run
-% in restricted mode:
+% restricted list, the line below should be uncommented to allow it to be run
+% in restricted mode. Otherwise comment it out.
-%\TeXOSQueryAllowRestricted
+\TeXOSQueryAllowRestricted
-% Leave it commented out if the invoker name is not on the
-% restricted list.
\endinput
%%
%% End of file `texosquery.cfg'.
diff --git a/Master/texmf-dist/tex/latex/texosquery/texosquery.sty b/Master/texmf-dist/tex/latex/texosquery/texosquery.sty
index 3d7638ae000..137f14da601 100644
--- a/Master/texmf-dist/tex/latex/texosquery/texosquery.sty
+++ b/Master/texmf-dist/tex/latex/texosquery/texosquery.sty
@@ -44,7 +44,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{texosquery}[2017/06/20 v1.6 (NLCT)]
+\ProvidesPackage{texosquery}[2020/02/04 v1.7 (NLCT)]
\input{texosquery}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/texosquery/texosquery.tex b/Master/texmf-dist/tex/latex/texosquery/texosquery.tex
index ebda9b227af..4238ed7d50d 100644
--- a/Master/texmf-dist/tex/latex/texosquery/texosquery.tex
+++ b/Master/texmf-dist/tex/latex/texosquery/texosquery.tex
@@ -55,7 +55,7 @@
\@texosquery@restore@at
\expandafter\endinput
\fi
-\expandafter\def\csname ver@texosquery.tex\endcsname{2017/06/20 v1.6 (NLCT)}
+\expandafter\def\csname ver@texosquery.tex\endcsname{2020/02/04 v1.7 (NLCT)}
\ifx\@tracklang@pkgwarn\undefined
\ifx\PackageWarning\undefined
\def\@texosquery@warn#1{%
@@ -511,7 +511,7 @@
\catcode`\;=12\relax
\catcode`\%=12\relax
\everyeof{\noexpand}\relax
- \@texosquery@edef\x{\endgroup\def\noexpand#1{\TeXOSQueryInvoker{#2}}}\x
+ \@texosquery@edef\@texosquery@tmp{\endgroup\def\noexpand#1{\TeXOSQueryInvoker{#2}}}\@texosquery@tmp
\fi
}
\def\TeXOSQueryFromFile#1#2{%
@@ -537,7 +537,7 @@
\catcode`\;=12\relax
\catcode`\%=12\relax
\everyeof{\noexpand}\relax
- \@texosquery@edef\x{\endgroup\def\noexpand#1{\texosquery@input #2 }}\x
+ \@texosquery@edef\@texosquery@tmp{\endgroup\def\noexpand#1{\texosquery@input #2 }}\@texosquery@tmp
\fi
}
\def\texosquerycurrency#1{%
@@ -1024,7 +1024,7 @@
\def\texosquerydefpattern#1#2{%
\begingroup
\@texosquery@pattern@shortcuts
- \@texosquery@edef\x{\endgroup\def\noexpand#1{#2}}\x
+ \@texosquery@edef\@texosquery@tmp{\endgroup\def\noexpand#1{#2}}\@texosquery@tmp
}
\def\texosqueryfmtdatetime#1{%
\def\@texosquery@fmt@dt@pattern{#1}%