From 50feb725ad0ce1fb272821696066e85fc54d1123 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Jul 2016 21:41:44 +0000 Subject: texosquery (14jul16) git-svn-id: svn://tug.org/texlive/trunk@41701 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/texosquery/texosquery.sty | 2 +- .../texmf-dist/tex/latex/texosquery/texosquery.tex | 29 ++++++++++++++++------ 2 files changed, 22 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/texosquery/texosquery.sty b/Master/texmf-dist/tex/latex/texosquery/texosquery.sty index 7285f5acb36..70381419f66 100644 --- a/Master/texmf-dist/tex/latex/texosquery/texosquery.sty +++ b/Master/texmf-dist/tex/latex/texosquery/texosquery.sty @@ -41,7 +41,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{texosquery}[2016/07/08 v1.0 (NLCT)] +\ProvidesPackage{texosquery}[2016/07/14 v1.1 (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 b95300ac20d..285b6eb20c9 100644 --- a/Master/texmf-dist/tex/latex/texosquery/texosquery.tex +++ b/Master/texmf-dist/tex/latex/texosquery/texosquery.tex @@ -60,17 +60,17 @@ \def\TeXOSQueryInvoker#1{\@@input|"\TeXOSInvokerName\space#1" } \fi \newif\ifTeXOSQueryDryRun -\TeXOSQueryDryRunfalse +\TeXOSQueryDryRuntrue \ifx\shellescape\undefined \ifx\pdfshellescape\undefined \else - \ifnum\pdfshellescape=0\relax - \TeXOSQueryDryRuntrue + \ifnum\pdfshellescape=1\relax + \TeXOSQueryDryRunfalse \fi \fi \else - \ifnum\shellescape=0\relax - \TeXOSQueryDryRuntrue + \ifnum\shellescape=1\relax + \TeXOSQueryDryRunfalse \fi \fi \def\TeXOSQuery#1#2{% @@ -107,7 +107,13 @@ \def\TeXOSQueryVersion#1{\TeXOSQuery{#1}{\string-r}} \def\TeXOSQueryArch#1{\TeXOSQuery{#1}{\string-a}} \def\TeXOSQueryName#1{\TeXOSQuery{#1}{\string-o}} -\def\TeXOSQueryNow#1{\TeXOSQuery{#1}{\string-n}} +\def\TeXOSQueryNow#1{% + \edef\@texosquery@restore@D{% + \noexpand\catcode`\noexpand\D=\the\catcode`\D\relax}% + \catcode`\D=12\relax + \TeXOSQuery{#1}{\string-n}% + \@texosquery@restore@D +} \def\texosquerystripquotes#1{% \@texosquery@stripquotes#1\@mid@texosquery@stripquotes "\relax"\relax\@end@texosquery@stripquotes @@ -118,8 +124,13 @@ \def\@@texosquery@stripquotes#1\@mid@texosquery@stripquotes#2\@end@texosquery@stripquotes{% #1% } -\def\TeXOSQueryFileDate#1#2{\TeXOSQuery{#1}{\string-d - \string'\texosquerystripquotes{#2}\string'}} +\def\TeXOSQueryFileDate#1#2{% + \edef\@texosquery@restore@D{% + \noexpand\catcode`\noexpand\D=\the\catcode`\D\relax}% + \catcode`\D=12\relax + \TeXOSQuery{#1}{\string-d \string'\texosquerystripquotes{#2}\string'}% + \@texosquery@restore@D +} \def\TeXOSQueryFileSize#1#2{\TeXOSQuery{#1}{\string-s \string'\texosquerystripquotes{#2}\string'}} \def\TeXOSQueryFileList#1#2#3{\TeXOSQuery{#1}{% @@ -132,6 +143,8 @@ \string'\texosquerystripquotes{#2}\string'}} \def\TeXOSQueryFilePath#1#2{\TeXOSQuery{#1}{\string-p \string'\texosquerystripquotes{#2}\string'}} +\def\TeXOSQueryDirName#1#2{\TeXOSQuery{#1}{\string-e + \string'\texosquerystripquotes{#2}\string'}} \@texosquery@restore@at \endinput %% -- cgit v1.2.3