summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-06-28 21:29:20 +0000
committerKarl Berry <karl@freefriends.org>2020-06-28 21:29:20 +0000
commitdfe6d6910cb767db961732ceac8f3481683aba08 (patch)
tree8574856d4ed811c7cfc8b1bc10210edb302f24e2
parent0b3e59a800e4c7022cd25df68f3d1f8a657faeb8 (diff)
pdftexcmds (28jun20)
git-svn-id: svn://tug.org/texlive/trunk@55692 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pdftexcmds/README.md (renamed from Master/texmf-dist/doc/latex/pdftexcmds/README.md)2
-rw-r--r--Master/texmf-dist/doc/generic/pdftexcmds/pdftexcmds.bib7
-rw-r--r--Master/texmf-dist/doc/generic/pdftexcmds/pdftexcmds.lua (renamed from Master/texmf-dist/scripts/pdftexcmds/pdftexcmds.lua)6
-rw-r--r--Master/texmf-dist/doc/generic/pdftexcmds/pdftexcmds.pdf (renamed from Master/texmf-dist/doc/latex/pdftexcmds/pdftexcmds.pdf)bin386262 -> 384670 bytes
-rw-r--r--Master/texmf-dist/source/generic/pdftexcmds/pdftexcmds.dtx (renamed from Master/texmf-dist/source/latex/pdftexcmds/pdftexcmds.dtx)71
-rw-r--r--Master/texmf-dist/tex/generic/pdftexcmds/pdftexcmds.sty (renamed from Master/texmf-dist/tex/latex/pdftexcmds/pdftexcmds.sty)10
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds4
7 files changed, 44 insertions, 56 deletions
diff --git a/Master/texmf-dist/doc/latex/pdftexcmds/README.md b/Master/texmf-dist/doc/generic/pdftexcmds/README.md
index ab86311304d..8c1d58e1dc6 100644
--- a/Master/texmf-dist/doc/latex/pdftexcmds/README.md
+++ b/Master/texmf-dist/doc/generic/pdftexcmds/README.md
@@ -1,6 +1,6 @@
# pdftexcmds
-Version: 2020-06-04 v0.32
+Version: 2020-06-27 v0.33
pdftexcmds package for LaTeX
diff --git a/Master/texmf-dist/doc/generic/pdftexcmds/pdftexcmds.bib b/Master/texmf-dist/doc/generic/pdftexcmds/pdftexcmds.bib
new file mode 100644
index 00000000000..68e24763eae
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pdftexcmds/pdftexcmds.bib
@@ -0,0 +1,7 @@
+@online{AndyThomas:Analog,
+ author={Thomas, Andy},
+ title={Analog of {\texttt{\csname textbackslash\endcsname}pdfelapsedtime} for
+ {\hologo{LuaTeX}} and {\hologo{XeTeX}}},
+ url={http://tex.stackexchange.com/a/32531},
+ urldate={2011-11-29},
+}
diff --git a/Master/texmf-dist/scripts/pdftexcmds/pdftexcmds.lua b/Master/texmf-dist/doc/generic/pdftexcmds/pdftexcmds.lua
index 9c9a5d51e68..593ddced020 100644
--- a/Master/texmf-dist/scripts/pdftexcmds/pdftexcmds.lua
+++ b/Master/texmf-dist/doc/generic/pdftexcmds/pdftexcmds.lua
@@ -9,7 +9,7 @@
-- This is a generated file.
--
-- Project: pdftexcmds
--- Version: 2020-06-04 v0.32
+-- Version: 2020-06-27 v0.33
--
-- Copyright (C)
-- 2007, 2009-2011 Heiko Oberdiek
@@ -31,7 +31,6 @@
-- Heiko Oberdiek and the Oberdiek Package Support Group
-- https://github.com/ho-tex/pdftexcmds/issues
--
---
-- The Base Interpreter refers to any `TeX-Format',
-- because some files are installed in TDS:tex/generic//.
--
@@ -45,7 +44,7 @@ local pdftexcmds = oberdiek.pdftexcmds or {}
oberdiek.pdftexcmds = pdftexcmds
local systemexitstatus
function pdftexcmds.getversion()
- tex.write("2020-06-04 v0.32")
+ tex.write("2020-06-27 v0.33")
end
function pdftexcmds.strcmp(A, B)
if A == B then
@@ -372,6 +371,5 @@ function pdftexcmds.pipe(cmdline, patch)
tex.settoks(pdftexcmds.toks, "")
end
end
--- \section{Installation}
--
-- End of File `pdftexcmds.lua'.
diff --git a/Master/texmf-dist/doc/latex/pdftexcmds/pdftexcmds.pdf b/Master/texmf-dist/doc/generic/pdftexcmds/pdftexcmds.pdf
index b75aed4a3a8..67c62c826a4 100644
--- a/Master/texmf-dist/doc/latex/pdftexcmds/pdftexcmds.pdf
+++ b/Master/texmf-dist/doc/generic/pdftexcmds/pdftexcmds.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/pdftexcmds/pdftexcmds.dtx b/Master/texmf-dist/source/generic/pdftexcmds/pdftexcmds.dtx
index 7e9de4e5583..e39a5799df4 100644
--- a/Master/texmf-dist/source/latex/pdftexcmds/pdftexcmds.dtx
+++ b/Master/texmf-dist/source/generic/pdftexcmds/pdftexcmds.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
% File: pdftexcmds.dtx
-% Version: 2020-06-04 v0.32
+% Version: 2020-06-27 v0.33
% Info: Utility functions of pdfTeX for LuaTeX
%
% Copyright (C)
@@ -67,7 +67,7 @@
%
% Installation:
% TDS:tex/generic/pdftexcmds/pdftexcmds.sty
-% TDS:scripts/pdftexcmds/pdftexcmds.lua
+% TDS:tex/generic/pdftexcmds/pdftexcmds.lua
% TDS:doc/latex/pdftexcmds/pdftexcmds.pdf
% TDS:source/latex/pdftexcmds/pdftexcmds.dtx
%
@@ -86,7 +86,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdftexcmds 2020-06-04 v0.32 Utility functions of pdfTeX for LuaTeX (HO)}
+\Msg{* Package: pdftexcmds 2020-06-27 v0.33 Utility functions of pdfTeX for LuaTeX (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -98,7 +98,7 @@
This is a generated file.
Project: pdftexcmds
-Version: 2020-06-04 v0.32
+Version: 2020-06-27 v0.33
Copyright (C)
2007, 2009-2011 Heiko Oberdiek
@@ -155,7 +155,7 @@ and the derived files
}
\def\currentpostamble{\defaultpostamble}%
\generate{%
- \usedir{scripts/pdftexcmds}%
+ \usedir{tex/generic/pdftexcmds}%
\file{pdftexcmds.lua}{\from{pdftexcmds.dtx}{lua}}%
}
@@ -164,12 +164,9 @@ and the derived files
\Msg{************************************************************************}
\Msg{*}
\Msg{* To finish the installation you have to move the following}
-\Msg{* file into a directory searched by TeX:}
+\Msg{* files into a directory searched by TeX:}
\Msg{*}
\Msg{* pdftexcmds.sty}
-\Msg{*}
-\Msg{* And install the following script files:}
-\Msg{*}
\Msg{* pdftexcmds.lua}
\Msg{*}
\Msg{* To produce the documentation run the file `pdftexcmds.drv'}
@@ -196,18 +193,17 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdftexcmds.drv}%
- [2020-06-04 v0.32 Utility functions of pdfTeX for LuaTeX (HO)]%
+ [2020-06-27 v0.33 Utility functions of pdfTeX for LuaTeX (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\usepackage{paralist}
\usepackage{csquotes}
\usepackage[
- backend=bibtex,
- bibencoding=ascii,
- alldates=iso8601,
+ backend=biber,
+ alldates=iso,
]{biblatex}[2011/11/13]
-\bibliography{oberdiek-source}
-\bibliography{pdftexcmds}
+\addbibresource{oberdiek-source.bib}
+\addbibresource{pdftexcmds.bib}
\begin{document}
\DocInput{pdftexcmds.dtx}%
\end{document}
@@ -219,7 +215,7 @@ and the derived files
% \GetFileInfo{pdftexcmds.drv}
%
% \title{The \xpackage{pdftexcmds} package}
-% \date{2020-06-04 v0.32}
+% \date{2020-06-27 v0.33}
% \author{Heiko Oberdiek\thanks
% {Please report any issues at \url{https://github.com/ho-tex/pdftexcmds/issues}}}
%
@@ -597,7 +593,7 @@ and the derived files
\fi
\expandafter\x\csname ver@pdftexcmds.sty\endcsname
\ProvidesPackage{pdftexcmds}%
- [2020-06-04 v0.32 Utility functions of pdfTeX for LuaTeX (HO)]%
+ [2020-06-27 v0.33 Utility functions of pdfTeX for LuaTeX (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -693,6 +689,7 @@ and the derived files
%
% \begin{macrocode}
\ifluatex
+ \ifcsname catcodetable@string\endcsname\else\input{ltluatex}\fi
\else
\def\pdftexcmds@nopdftex{%
\let\pdftexcmds@nopdftex\relax
@@ -772,6 +769,7 @@ and the derived files
\expandafter\ifx\csname pdf#1\endcsname\relax\else pdf\fi#1\endcsname\relax
\pdftexcmds@nopdftex
\else
+ \begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\let\csname pdf@#1\expandafter\endcsname
\csname\expandafter\ifx\csname pdf#1\endcsname\relax\else pdf\fi#1\endcsname
\fi
@@ -1137,7 +1135,7 @@ and the derived files
\fi
\fi
\begingroup
- \def\x{2020-06-04 v0.32}%
+ \def\x{2020-06-27 v0.33}%
\ltx@onelevel@sanitize\x
\edef\y{%
\pdftexcmds@directlua{%
@@ -1544,7 +1542,7 @@ local pdftexcmds = oberdiek.pdftexcmds or {}
oberdiek.pdftexcmds = pdftexcmds
local systemexitstatus
function pdftexcmds.getversion()
- tex.write("2020-06-04 v0.32")
+ tex.write("2020-06-27 v0.33")
end
% \end{macrocode}
%
@@ -1933,7 +1931,7 @@ end
% \begin{macrocode}
%</lua>
% \end{macrocode}
-%% \section{Installation}
+% \section{Installation}
%
% \subsection{Download}
%
@@ -1944,31 +1942,6 @@ end
% \item[\CTAN{macros/latex/contrib/pdftexcmds/pdftexcmds.pdf}] Documentation.
% \end{description}
%
-%
-% \paragraph{Bundle.} All the packages of the bundle `pdftexcmds'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/pdftexcmds.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTANpkg{tds}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{pdftexcmds.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-% |unzip pdftexcmds.tds.zip -d ~/texmf|
-% \end{quote}
-%
-% \paragraph{Script installation.}
-% Check the directory \xfile{TDS:scripts/pdftexcmds/} for
-% scripts that need further installation steps.
-%
% \subsection{Package installation}
%
% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
@@ -1985,7 +1958,7 @@ end
% \def\t{^^A
% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
% pdftexcmds.sty & tex/generic/pdftexcmds/pdftexcmds.sty\\
-% pdftexcmds.lua & scripts/pdftexcmds/pdftexcmds.lua\\
+% pdftexcmds.lua & tex/generic/pdftexcmds/pdftexcmds.lua\\
% pdftexcmds.pdf & doc/latex/pdftexcmds/pdftexcmds.pdf\\
% pdftexcmds.dtx & source/latex/pdftexcmds/pdftexcmds.dtx\\
% \end{tabular}^^A
@@ -2256,6 +2229,12 @@ end
% \begin{Version}{2020-06-04 v0.32}
% \item Updated pdftexcmds.elapsedtime to lua 5.3 (issue 4).
% \end{Version}
+% \begin{Version}{2020-06-24 v0.33}
+% \item avoid that \cs{pdfelapsedtime} and \cs{pdfresettimer} are set to \cs{relax}
+% when using xelatex (issue 5).
+% \item load ltluatex when using plain so that the catcode tables are
+% available.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/tex/latex/pdftexcmds/pdftexcmds.sty b/Master/texmf-dist/tex/generic/pdftexcmds/pdftexcmds.sty
index 1863e0f7514..8ea2259bc9f 100644
--- a/Master/texmf-dist/tex/latex/pdftexcmds/pdftexcmds.sty
+++ b/Master/texmf-dist/tex/generic/pdftexcmds/pdftexcmds.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: pdftexcmds
-%% Version: 2020-06-04 v0.32
+%% Version: 2020-06-27 v0.33
%%
%% Copyright (C)
%% 2007, 2009-2011 Heiko Oberdiek
@@ -31,7 +31,6 @@
%% Heiko Oberdiek and the Oberdiek Package Support Group
%% https://github.com/ho-tex/pdftexcmds/issues
%%
-%%
%% The Base Interpreter refers to any `TeX-Format',
%% because some files are installed in TDS:tex/generic//.
%%
@@ -106,7 +105,7 @@
\fi
\expandafter\x\csname ver@pdftexcmds.sty\endcsname
\ProvidesPackage{pdftexcmds}%
- [2020-06-04 v0.32 Utility functions of pdfTeX for LuaTeX (HO)]%
+ [2020-06-27 v0.33 Utility functions of pdfTeX for LuaTeX (HO)]%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode13=5 % ^^M
\endlinechar=13 %
@@ -187,6 +186,7 @@
\RequirePackage{ltxcmds}[2010/12/02]%
\fi
\ifluatex
+ \ifcsname catcodetable@string\endcsname\else\input{ltluatex}\fi
\else
\def\pdftexcmds@nopdftex{%
\let\pdftexcmds@nopdftex\relax
@@ -262,6 +262,7 @@
\expandafter\ifx\csname pdf#1\endcsname\relax\else pdf\fi#1\endcsname\relax
\pdftexcmds@nopdftex
\else
+ \begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\let\csname pdf@#1\expandafter\endcsname
\csname\expandafter\ifx\csname pdf#1\endcsname\relax\else pdf\fi#1\endcsname
\fi
@@ -505,7 +506,7 @@
\fi
\fi
\begingroup
- \def\x{2020-06-04 v0.32}%
+ \def\x{2020-06-27 v0.33}%
\ltx@onelevel@sanitize\x
\edef\y{%
\pdftexcmds@directlua{%
@@ -740,7 +741,6 @@
}%
\fi
\pdftexcmds@AtEnd%
-%% \section{Installation}
\endinput
%%
%% End of file `pdftexcmds.sty'.
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 6e00274b9d5..b14434af592 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1695,6 +1695,7 @@ $standarddest = "texmf-dist";
'passivetex', 'xmltex',
'pdcmac', 'plain',
'pdf-trans', 'generic',
+ 'pdftexcmds', 'generic',
'philokalia', 'xelatex',
'pictex', 'generic',
'placeins-plain', 'plain',
@@ -2382,6 +2383,7 @@ $standardtex
'pdcmac', 'plain',
'pdf-trans', 'generic',
'pdfcrop', 'support',
+ 'pdftexcmds', 'generic',
'pedigree-perl', 'support',
'persian-bib', 'xelatex',
'phaistos', 'fonts',
@@ -2551,6 +2553,7 @@ $standarddocfmt='latex';
'ot2cyr', 'fonts',
'patch', 'generic',
'pdcmac', 'plain',
+ 'pdftexcmds', 'generic',
'philokalia', 'xelatex',
'pictex', 'generic',
'pstricks', 'generic',
@@ -2855,6 +2858,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
'pageslts' => 'tex -translate-file=empty.tcx', # no 8-bit
'papermas' => 'tex',
'pauldoc' => 'latex', # requires interaction
+ 'pdftexcmds' => 'etex',
'picture' => 'etex',
'placeat' => 'luatex',
'poemscol' => 'latex', # requires interaction