diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/ltxcmds/README.md | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/ltxcmds/ltxcmds.pdf | bin | 0 -> 397106 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/ltxcmds/README.md | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/ltxcmds/ltxcmds.pdf | bin | 393914 -> 0 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/ltxcmds/ltxcmds.dtx | 155 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/ltxcmds/ltxcmds.sty | 85 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 3 |
7 files changed, 81 insertions, 186 deletions
diff --git a/Master/texmf-dist/doc/generic/ltxcmds/README.md b/Master/texmf-dist/doc/generic/ltxcmds/README.md new file mode 100644 index 00000000000..2aef65aa3aa --- /dev/null +++ b/Master/texmf-dist/doc/generic/ltxcmds/README.md @@ -0,0 +1,14 @@ +# ltxcmds package for latex + +Version: 2020-05-10 v1.25 + +The package ltxcmds exports some utility macros +from the LaTeX kernel into a separate namespace and +also provides them for other formats such as plain-TeX. + +## Copyright (C) +* 2007, 2009-2011 Heiko Oberdiek +* 2016-2020 Oberdiek Package Support Group + +## License +LATEX Project Public License, version 1.3c or later. diff --git a/Master/texmf-dist/doc/generic/ltxcmds/ltxcmds.pdf b/Master/texmf-dist/doc/generic/ltxcmds/ltxcmds.pdf Binary files differnew file mode 100644 index 00000000000..1dfb9104f31 --- /dev/null +++ b/Master/texmf-dist/doc/generic/ltxcmds/ltxcmds.pdf diff --git a/Master/texmf-dist/doc/latex/ltxcmds/README.md b/Master/texmf-dist/doc/latex/ltxcmds/README.md deleted file mode 100644 index 9cc3a34e327..00000000000 --- a/Master/texmf-dist/doc/latex/ltxcmds/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# ltxcmds - -ltxcmds package for latex - - - -The package ltxcmds exports some utility macros -from the LaTeX kernel into a separate namespace and -also provides them for other formats such as plain-TeX. - diff --git a/Master/texmf-dist/doc/latex/ltxcmds/ltxcmds.pdf b/Master/texmf-dist/doc/latex/ltxcmds/ltxcmds.pdf Binary files differdeleted file mode 100644 index dc3eabc9e7e..00000000000 --- a/Master/texmf-dist/doc/latex/ltxcmds/ltxcmds.pdf +++ /dev/null diff --git a/Master/texmf-dist/source/latex/ltxcmds/ltxcmds.dtx b/Master/texmf-dist/source/latex/ltxcmds/ltxcmds.dtx index f9169a21db4..9940671d4d3 100644 --- a/Master/texmf-dist/source/latex/ltxcmds/ltxcmds.dtx +++ b/Master/texmf-dist/source/latex/ltxcmds/ltxcmds.dtx @@ -1,12 +1,12 @@ % \iffalse meta-comment % % File: ltxcmds.dtx -% Version: 2019/12/15 v1.24 +% Version: 2020-05-10 v1.25 % Info: LaTeX kernel commands for general use % % Copyright (C) % 2009-2011 Heiko Oberdiek -% 2016-2019 Oberdiek Package Support Group +% 2016-2020 Oberdiek Package Support Group % https://github.com/ho-tex/ltxcmds/issues % % This work may be distributed and/or modified under the @@ -86,7 +86,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: ltxcmds 2019/12/15 v1.24 LaTeX kernel commands for general use (HO)} +\Msg{* Package: ltxcmds 2020-05-10 v1.25 LaTeX kernel commands for general use (HO)} \Msg{************************************************************************} \keepsilent @@ -98,11 +98,11 @@ This is a generated file. Project: ltxcmds -Version: 2019/12/15 v1.24 +Version: 2020-05-10 v1.25 Copyright (C) 2009-2011 Heiko Oberdiek - 2016-2019 Oberdiek Package Support Group + 2016-2020 Oberdiek Package Support Group This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -166,7 +166,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltxcmds.drv}% - [2019/12/15 v1.24 LaTeX kernel commands for general use (HO)]% + [2020-05-10 v1.25 LaTeX kernel commands for general use (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \usepackage{zref-savepos} @@ -183,7 +183,7 @@ and the derived files % \GetFileInfo{ltxcmds.drv} % % \title{The \xpackage{ltxcmds} package} -% \date{2019/12/15 v1.24} +% \date{2020-05-10 v1.25} % \author{Heiko Oberdiek\thanks % {Please report any issues at \url{https://github.com/ho-tex/ltxcmds/issues}}} % @@ -334,7 +334,7 @@ and the derived files % \end{declcs} % % Macros with uppercase letters are expandable in two expansion steps. -% Changes in version 2019/12/15 v1.24: +% Changes in version 2020-05-10 v1.25: % \begin{itemize} % \item % Macros \cs{ltx@carsecond}, \cs{ltx@carthird}, \cs{ltx@carfourth}, @@ -701,7 +701,7 @@ and the derived files \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2019/12/15 v1.24 LaTeX kernel commands for general use (HO)]% + [2020-05-10 v1.25 LaTeX kernel commands for general use (HO)]% % \end{macrocode} % % \begin{macrocode} @@ -1486,103 +1486,46 @@ and the derived files % \end{macro} % % \subsubsection{Version date check} -% -% \begin{macro}{\ltx@iffilelater} -% \begin{macrocode} -\def\ltx@iffilelater#1#2{% - \ltx@iffileloaded{#1}{% - \expandafter\LTXcmds@IfLater\expandafter{% - \number - \expandafter\expandafter\expandafter\LTXcmds@ParseVersion - \expandafter\expandafter\expandafter{% - \csname ver@#1\endcsname - }% - \expandafter}\expandafter{% - \number - \expandafter\LTXcmds@ParseVersion\expandafter{#2}% - }% - }\ltx@secondoftwo +% changed 2020-05-10 to adapt to dates with dashes (ISO) +% The core of the commands are copies from the latex commands. +% \begin{macro}{\ltx@ifl@ter} +% \begin{macro}{\ltx@parse@version@} +% \begin{macrocode} +\def\ltx@ifl@ter#1#2{% + \expandafter\ltx@ifl@t@r + \csname ver@#2.#1\endcsname} +\def\ltx@ifl@t@r#1#2{% + \ifnum\expandafter\ltx@parse@version@#1//00\@nil<% + \expandafter\ltx@parse@version@#2//00\@nil + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi} +\def\ltx@parse@version@#1{\ltx@parse@version0#1} +\def\ltx@parse@version#1/#2/#3#4#5\@nil{% +\ltx@parse@version@dash#1-#2-#3#4\@nil } +\def\ltx@parse@version@dash#1-#2-#3#4#5\@nil{% + \if\relax#2\relax\else#1\fi#2#3#4 } % \end{macrocode} % \end{macro} -% \begin{macro}{\LTXcmds@IfLater} +% \end{macro} +% \begin{macro}{\ltx@iffilelater} % \begin{macrocode} -\def\LTXcmds@IfLater#1#2{% - \ifcase 0% - \ifnum#1<19940101 % - \else - \ifnum#2<19940101 % - \else - \ifnum#2>#1 % - \else - 1% - \fi - \fi - \fi - \ltx@space - \expandafter\ltx@secondoftwo - \else - \expandafter\ltx@firstoftwo - \fi -} +\def\ltx@iffilelater#1{\expandafter\ltx@ifl@t@r\csname ver@#1\endcsname} % \end{macrocode} % \end{macro} % \begin{macro}{\ltx@ifclasslater} % \begin{macrocode} -\def\ltx@ifclasslater#1{% - \ltx@iffilelater{#1.\ltx@clsextension}% -} +\def\ltx@ifclasslater{\ltx@ifl@ter\ltx@clsextension} % \end{macrocode} % \end{macro} % \begin{macro}{\ltx@ifpackagelater} % \begin{macrocode} -\def\ltx@ifpackagelater#1{% - \ltx@iffilelater{#1.\ltx@pkgextension}% -} +\def\ltx@ifpackagelater{\ltx@ifl@ter\ltx@pkgextension} % \end{macrocode} % \end{macro} % -% \begin{macrocode} -\ltx@IfUndefined{pdfmatch}{% -% \end{macrocode} -% \begin{macro}{\LTXcmds@ParseVersion} -% \begin{macrocode} - \def\LTXcmds@ParseVersion#1{% - \LTXcmds@@ParseVersion#10000/00/00\@nil - }% -% \end{macrocode} -% \end{macro} -% \begin{macro}{\LTXcmds@@ParseVersion} -% \begin{macrocode} - \def\LTXcmds@@ParseVersion#1#2#3#4/#5#6/#7#8#9\@nil{% - #1#2#3#4#5#6#7#8% - }% -% \end{macrocode} -% \end{macro} -% \begin{macrocode} -}{% -% \end{macrocode} -% \begin{macro}{\LTXcmds@ParseVersion} -% \begin{macrocode} - \def\LTXcmds@ParseVersion#1{% - \ifnum\pdfmatch{% - ^% - (199[4-9]|[2-9][0-9][0-9][0-9])/% - (0[1-9]|1[0-2])/% - (0[1-9]|[1-2][0-9]|3[0-1])% - }{#1}=1 % - \ltx@StripPrefix\pdflastmatch1 % - \ltx@StripPrefix\pdflastmatch2 % - \ltx@StripPrefix\pdflastmatch3 % - \else - 0% - \fi - }% -% \end{macrocode} -% \end{macro} -% \begin{macrocode} -} -% \end{macrocode} % % \subsection{Macro additions} % @@ -2040,28 +1983,9 @@ $ \next % \end{description} % % -% \paragraph{Bundle.} All the packages of the bundle `ltxcmds' -% 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/ltxcmds.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{ltxcmds.tds.zip} in the -% TDS tree (also known as \xfile{texmf} tree) of your choice. -% Example (linux): -% \begin{quote} -% |unzip ltxcmds.tds.zip -d ~/texmf| -% \end{quote} -% % \subsection{Package installation} -% +% The package is at best installed with the package manager of the \TeX~system. +% Manual installation is possible too: % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting % \docstrip\ archive. The files are extracted by running the % \xfile{.dtx} through \plainTeX: @@ -2417,6 +2341,13 @@ $ \next % \item % Documentation updates. % \end{Version} +% \begin{Version}{2020-05-10 v1.25} +% \item Changed the definitions of \cs{ltx@iffilelater}, \cs{ltx@ifpackagelater} +% and \cs{ltx@ifclasslater} to support dates in ISO format in same way as the +% LaTeX kernel does it since 2017. The commands now use the same test as the +% LaTeX kernel. \cs{pdfmatch} is no longer used with pdftex, and the tests for dates before +% 1994 have been removed +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/tex/generic/ltxcmds/ltxcmds.sty b/Master/texmf-dist/tex/generic/ltxcmds/ltxcmds.sty index 2cc5f77c3ed..ae22901ca8f 100644 --- a/Master/texmf-dist/tex/generic/ltxcmds/ltxcmds.sty +++ b/Master/texmf-dist/tex/generic/ltxcmds/ltxcmds.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: ltxcmds -%% Version: 2019/12/15 v1.24 +%% Version: 2020-05-10 v1.25 %% %% Copyright (C) %% 2009-2011 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2016-2020 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/ltxcmds/issues %% -%% %% The Base Interpreter refers to any `TeX-Format', %% because some files are installed in TDS:tex/generic//. %% @@ -109,7 +108,7 @@ \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2019/12/15 v1.24 LaTeX kernel commands for general use (HO)]% + [2020-05-10 v1.25 LaTeX kernel commands for general use (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -416,67 +415,25 @@ \def\ltx@ifpackageloaded#1{% \ltx@iffileloaded{#1.\ltx@pkgextension}% } -\def\ltx@iffilelater#1#2{% - \ltx@iffileloaded{#1}{% - \expandafter\LTXcmds@IfLater\expandafter{% - \number - \expandafter\expandafter\expandafter\LTXcmds@ParseVersion - \expandafter\expandafter\expandafter{% - \csname ver@#1\endcsname - }% - \expandafter}\expandafter{% - \number - \expandafter\LTXcmds@ParseVersion\expandafter{#2}% - }% - }\ltx@secondoftwo -} -\def\LTXcmds@IfLater#1#2{% - \ifcase 0% - \ifnum#1<19940101 % - \else - \ifnum#2<19940101 % - \else - \ifnum#2>#1 % - \else - 1% - \fi - \fi - \fi - \ltx@space - \expandafter\ltx@secondoftwo +\def\ltx@ifl@ter#1#2{% + \expandafter\ltx@ifl@t@r + \csname ver@#2.#1\endcsname} +\def\ltx@ifl@t@r#1#2{% + \ifnum\expandafter\ltx@parse@version@#1//00\@nil<% + \expandafter\ltx@parse@version@#2//00\@nil + \expandafter\@secondoftwo \else - \expandafter\ltx@firstoftwo - \fi -} -\def\ltx@ifclasslater#1{% - \ltx@iffilelater{#1.\ltx@clsextension}% -} -\def\ltx@ifpackagelater#1{% - \ltx@iffilelater{#1.\ltx@pkgextension}% -} -\ltx@IfUndefined{pdfmatch}{% - \def\LTXcmds@ParseVersion#1{% - \LTXcmds@@ParseVersion#10000/00/00\@nil - }% - \def\LTXcmds@@ParseVersion#1#2#3#4/#5#6/#7#8#9\@nil{% - #1#2#3#4#5#6#7#8% - }% -}{% - \def\LTXcmds@ParseVersion#1{% - \ifnum\pdfmatch{% - ^% - (199[4-9]|[2-9][0-9][0-9][0-9])/% - (0[1-9]|1[0-2])/% - (0[1-9]|[1-2][0-9]|3[0-1])% - }{#1}=1 % - \ltx@StripPrefix\pdflastmatch1 % - \ltx@StripPrefix\pdflastmatch2 % - \ltx@StripPrefix\pdflastmatch3 % - \else - 0% - \fi - }% -} + \expandafter\@firstoftwo + \fi} +\def\ltx@parse@version@#1{\ltx@parse@version0#1} +\def\ltx@parse@version#1/#2/#3#4#5\@nil{% +\ltx@parse@version@dash#1-#2-#3#4\@nil +} +\def\ltx@parse@version@dash#1-#2-#3#4#5\@nil{% + \if\relax#2\relax\else#1\fi#2#3#4 } +\def\ltx@iffilelater#1{\expandafter\ltx@ifl@t@r\csname ver@#1\endcsname} +\def\ltx@ifclasslater{\ltx@ifl@ter\ltx@clsextension} +\def\ltx@ifpackagelater{\ltx@ifl@ter\ltx@pkgextension} \long\def\ltx@GlobalAppendToMacro#1#2{% \ifx\ltx@undefined#1% \let#1\ltx@empty diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 5b9dd875fd4..0ab113d5567 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1683,6 +1683,7 @@ $standarddest = "texmf-dist"; 'letterspacing','generic', 'levy', 'generic', # one .sty, one .tex 'lollipop', 'lollipop', + 'ltxcmds', 'generic', 'luatexja', 'luatex', 'luaxml', 'luatex', 'lyluatex', 'luatex', @@ -2367,6 +2368,7 @@ $standardtex 'lh', 'fonts', 'latex-notes-zh-cn', 'generic', 'lollipop', 'otherformats', + 'ltxcmds', 'generic', 'lua-alt-getopt', 'support', 'lua2dox', 'support', 'luaintro', 'luatex', @@ -2866,6 +2868,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'listings' => 'latex', # requires interaction 'lmake' => 'latex', # requires interaction 'lni' => 'tex --8bit', + 'ltxcmds' => 'etex', 'lua-ul' => 'etex', 'luaindex' => 'lualatex --shell-escape', 'luatexja' => 'lualatex', |