From faac65e4c5efc26d958be7633783eecc9d0c0ddc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Nov 2019 21:34:34 +0000 Subject: iftex (5nov19) git-svn-id: svn://tug.org/texlive/trunk@52644 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/iftex/ann.txt | 52 -------------------------- Master/texmf-dist/doc/generic/iftex/iftex.pdf | Bin 201646 -> 201807 bytes Master/texmf-dist/tex/generic/iftex/iftex.sty | 15 +++++++- 3 files changed, 13 insertions(+), 54 deletions(-) delete mode 100644 Master/texmf-dist/doc/generic/iftex/ann.txt diff --git a/Master/texmf-dist/doc/generic/iftex/ann.txt b/Master/texmf-dist/doc/generic/iftex/ann.txt deleted file mode 100644 index 9e153b59ab2..00000000000 --- a/Master/texmf-dist/doc/generic/iftex/ann.txt +++ /dev/null @@ -1,52 +0,0 @@ -** UPLOAD: iftex -https://ctan.org/pkg/iftex - -New README will be uploaded, please change catalogue to say -maintained by LaTeX Team -Licence LPPL 1.3 -Bug Tracker: https://github.com/latex3/iftex/issues/ -Repository: https://github.com/latex3/iftex/ - -** UPLOAD: oberdiek -https://ctan.org/pkg/oberdiek -This release will not distribute ifpdf.sty ifluatex.sty ifvtex.sty - - -** DELETE ifxetex -https://ctan.org/pkg/ifxetex -Please change the catalogue to point to the iftex distribution (which will contain ifxetex.sty) -and change maintainer and github links as for iftex above. - -Will Robertson is on LaTeX Team so aware of this. - -** DELETE ifetex -https://ctan.org/pkg/ifetex -Please change the catalogue to point to the iftex distribution (which will contain ifetex.sty) -and change maintainer and github links as for iftex above. - -Martin Scharrer has agreed to his version of ifetex being deleted - -> Hi David, -> -> I always hated the fact that there where so many if..tex packages and I -> am glad that you people rationalise them now. -> -> Feel free to withdraw my package ifetex from CTAN. -> -> Best Regards, -> -> Martin - -** CATALOGUE Change ifpdf, ifluatex, ifvtex -https://ctan.org/pkg/ifpdf -https://ctan.org/pkg/ifluatex -https://ctan.org/pkg/ifvtex -Please change the catalog entries for these three so they point to iftex as above, -not to the oberdiek bundle. - - -** NO CHANGE -Just to confirm ifptex and ifxptex packages are _not_ affected by this re-arrangement. - - - diff --git a/Master/texmf-dist/doc/generic/iftex/iftex.pdf b/Master/texmf-dist/doc/generic/iftex/iftex.pdf index 426b5c4622d..c46ce713ae4 100644 Binary files a/Master/texmf-dist/doc/generic/iftex/iftex.pdf and b/Master/texmf-dist/doc/generic/iftex/iftex.pdf differ diff --git a/Master/texmf-dist/tex/generic/iftex/iftex.sty b/Master/texmf-dist/tex/generic/iftex/iftex.sty index feb5a75f8d7..4c1923c2c1d 100644 --- a/Master/texmf-dist/tex/generic/iftex/iftex.sty +++ b/Master/texmf-dist/tex/generic/iftex/iftex.sty @@ -16,7 +16,6 @@ %% ifptex Takayuki YATO %% ifpdf Heiko Oberdiek and LaTeX3 Project - % Only load once (not needed in LaTeX, but does no harm). \csname IFTEX\string @loaded\endcsname \expandafter\let\csname IFTEX\string @loaded\endcsname\endinput @@ -31,7 +30,7 @@ % ProvidesPackage declaration in LaTeX \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax\else - \ProvidesPackage{iftex}[2019/10/24 v1.0a TeX engine tests] + \ProvidesPackage{iftex}[2019/11/04 v1.0b TeX engine tests] \fi % Save @ catcode, to restore at end, not needed in LaTeX. @@ -108,6 +107,7 @@ \IFTEX@let{eTeX}{etex} % pdftex (including in dvi mode) +\IFTEX@let{IFTEX@savedpdftex}{pdftex} \ifx\pdftexversion\@undefined \IFTEX@let{pdftex}{false} \else @@ -173,6 +173,7 @@ \IFTEX@let{pTeXng}{ptexng} % vtex +\IFTEX@let{IFTEX@savedVTeX}{VTeX} \ifx\VTeXversion\@undefined \IFTEX@let{vtex}{false} \else @@ -227,5 +228,15 @@ end }} \fi + +% special compat for scrbase +\ifx\scr@ifpdftex\@undefined\else\ifx\ifIFTEX@savedpdftex\relax\else + \IFTEX@let{pdftex}{IFTEX@savedpdftex} + \IFTEX@protected\def\RequirePDFTeX{\IFTEX@Require\ifPDFTeX{pdfTeX}\fi} +\fi\fi +\ifx\scr@ifVTeX\@undefined\else\ifx\ifIFTEX@savedVTeX\relax\else + \IFTEX@let{VTeX}{IFTEX@savedVTeX} +\fi\fi + % restore things \catcode64 \IFTEX@atcatcode -- cgit v1.2.3