texlive[52644] Master/texmf-dist: iftex (5nov19)

[commits+karl at tug.org]

Revision: 52644
          http://tug.org/svn/texlive?view=revision&revision=52644
Author:   karl
Date:     2019-11-05 22:34:34 +0100 (Tue, 05 Nov 2019)
Log Message:
-----------
iftex (5nov19)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/generic/iftex/iftex.pdf
    trunk/Master/texmf-dist/tex/generic/iftex/iftex.sty

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/generic/iftex/ann.txt

Deleted: trunk/Master/texmf-dist/doc/generic/iftex/ann.txt
===================================================================
--- trunk/Master/texmf-dist/doc/generic/iftex/ann.txt	2019-11-05 00:54:02 UTC (rev 52643)
+++ trunk/Master/texmf-dist/doc/generic/iftex/ann.txt	2019-11-05 21:34:34 UTC (rev 52644)
@@ -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 <martin.scharrer at web.de> 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.
-
-
-

Modified: trunk/Master/texmf-dist/doc/generic/iftex/iftex.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/tex/generic/iftex/iftex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/generic/iftex/iftex.sty	2019-11-05 00:54:02 UTC (rev 52643)
+++ trunk/Master/texmf-dist/tex/generic/iftex/iftex.sty	2019-11-05 21:34:34 UTC (rev 52644)
@@ -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 at let{eTeX}{etex}
 
 % pdftex (including in dvi mode)
+\IFTEX at let{IFTEX at savedpdftex}{pdftex}
 \ifx\pdftexversion\@undefined
   \IFTEX at let{pdftex}{false}
 \else
@@ -173,6 +173,7 @@
 \IFTEX at let{pTeXng}{ptexng}
 
 % vtex
+\IFTEX at let{IFTEX at savedVTeX}{VTeX}
 \ifx\VTeXversion\@undefined
   \IFTEX at let{vtex}{false}
 \else
@@ -227,5 +228,15 @@
 }}
 \fi
 
+
+% special compat for scrbase
+\ifx\scr at ifpdftex\@undefined\else\ifx\ifIFTEX at savedpdftex\relax\else
+ \IFTEX at let{pdftex}{IFTEX at savedpdftex}
+ \IFTEX at protected\def\RequirePDFTeX{\IFTEX at Require\ifPDFTeX{pdfTeX}\fi}
+\fi\fi
+\ifx\scr at ifVTeX\@undefined\else\ifx\ifIFTEX at savedVTeX\relax\else
+ \IFTEX at let{VTeX}{IFTEX at savedVTeX}
+\fi\fi
+
 % restore things
 \catcode64 \IFTEX at atcatcode