rm ifluatex, subsumed into iftex

git-svn-id: svn://tug.org/texlive/trunk@52605 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 4 insertions, 502 deletions

diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf
deleted file mode 100644
index fbf1f7d0c58..00000000000
--- a/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/ifluatex-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/ifluatex-test1.tex
deleted file mode 100644
index 7e2647b2b10..00000000000
--- a/Master/texmf-dist/doc/latex/oberdiek/test/ifluatex-test1.tex
+++ /dev/null
@@ -1,138 +0,0 @@
-%%
-%% This is file `ifluatex-test1.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ifluatex.dtx  (with options: `test1')
-%% 
-%% This is a generated file.
-%% 
-%% Project: ifluatex
-%% Version: 2016/05/16 v1.4
-%% 
-%% Copyright (C) 2007, 2009, 2010 by
-%%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-%% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%%    http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%% 
-%% This work has the LPPL maintenance status "maintained".
-%% 
-%% This Current Maintainer of this work is Heiko Oberdiek.
-%% 
-%% The Base Interpreter refers to any `TeX-Format',
-%% because some files are installed in TDS:tex/generic//.
-%% 
-%% This work consists of the main source file ifluatex.dtx
-%% and the derived files
-%%    ifluatex.sty, ifluatex.pdf, ifluatex.ins, ifluatex.drv,
-%%    ifluatex-test1.tex, ifluatex-test2.tex, ifluatex-test3.tex.
-%% 
-\catcode`\{=1 %
-\catcode`\}=2 %
-\catcode`\#=6 %
-\catcode`\@=11 %
-\expandafter\ifx\csname count@\endcsname\relax
-  \countdef\count@=255 %
-\fi
-\expandafter\ifx\csname @gobble\endcsname\relax
-  \long\def\@gobble#1{}%
-\fi
-\expandafter\ifx\csname @firstofone\endcsname\relax
-  \long\def\@firstofone#1{#1}%
-\fi
-\expandafter\ifx\csname loop\endcsname\relax
-  \expandafter\@firstofone
-\else
-  \expandafter\@gobble
-\fi
-{%
-  \def\loop#1\repeat{%
-    \def\body{#1}%
-    \iterate
-  }%
-  \def\iterate{%
-    \body
-      \let\next\iterate
-    \else
-      \let\next\relax
-    \fi
-    \next
-  }%
-  \let\repeat=\fi
-}%
-\def\RestoreCatcodes{}
-\count@=0 %
-\loop
-  \edef\RestoreCatcodes{%
-    \RestoreCatcodes
-    \catcode\the\count@=\the\catcode\count@\relax
-  }%
-\ifnum\count@<255 %
-  \advance\count@ 1 %
-\repeat
-
-\def\RangeCatcodeInvalid#1#2{%
-  \count@=#1\relax
-  \loop
-    \catcode\count@=15 %
-  \ifnum\count@<#2\relax
-    \advance\count@ 1 %
-  \repeat
-}
-\def\RangeCatcodeCheck#1#2#3{%
-  \count@=#1\relax
-  \loop
-    \ifnum#3=\catcode\count@
-    \else
-      \errmessage{%
-        Character \the\count@\space
-        with wrong catcode \the\catcode\count@\space
-        instead of \number#3%
-      }%
-    \fi
-  \ifnum\count@<#2\relax
-    \advance\count@ 1 %
-  \repeat
-}
-\def\space{ }
-\expandafter\ifx\csname LoadCommand\endcsname\relax
-  \def\LoadCommand{\input ifluatex.sty\relax}%
-\fi
-\def\Test{%
-  \RangeCatcodeInvalid{0}{47}%
-  \RangeCatcodeInvalid{58}{64}%
-  \RangeCatcodeInvalid{91}{96}%
-  \RangeCatcodeInvalid{123}{255}%
-  \catcode`\@=12 %
-  \catcode`\\=0 %
-  \catcode`\%=14 %
-  \LoadCommand
-  \RangeCatcodeCheck{0}{36}{15}%
-  \RangeCatcodeCheck{37}{37}{14}%
-  \RangeCatcodeCheck{38}{47}{15}%
-  \RangeCatcodeCheck{48}{57}{12}%
-  \RangeCatcodeCheck{58}{63}{15}%
-  \RangeCatcodeCheck{64}{64}{12}%
-  \RangeCatcodeCheck{65}{90}{11}%
-  \RangeCatcodeCheck{91}{91}{15}%
-  \RangeCatcodeCheck{92}{92}{0}%
-  \RangeCatcodeCheck{93}{96}{15}%
-  \RangeCatcodeCheck{97}{122}{11}%
-  \RangeCatcodeCheck{123}{255}{15}%
-  \RestoreCatcodes
-}
-\Test
-\csname @@end\endcsname
-\end
-\endinput
-%%
-%% End of file `ifluatex-test1.tex'.
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/ifluatex-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/test/ifluatex-test2.tex
deleted file mode 100644
index 5c7b7f3aabf..00000000000
--- a/Master/texmf-dist/doc/latex/oberdiek/test/ifluatex-test2.tex
+++ /dev/null
@@ -1,44 +0,0 @@
-%%
-%% This is file `ifluatex-test2.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ifluatex.dtx  (with options: `test-reload1')
-%% 
-%% This is a generated file.
-%% 
-%% Project: ifluatex
-%% Version: 2016/05/16 v1.4
-%% 
-%% Copyright (C) 2007, 2009, 2010 by
-%%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-%% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%%    http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%% 
-%% This work has the LPPL maintenance status "maintained".
-%% 
-%% This Current Maintainer of this work is Heiko Oberdiek.
-%% 
-%% The Base Interpreter refers to any `TeX-Format',
-%% because some files are installed in TDS:tex/generic//.
-%% 
-%% This work consists of the main source file ifluatex.dtx
-%% and the derived files
-%%    ifluatex.sty, ifluatex.pdf, ifluatex.ins, ifluatex.drv,
-%%    ifluatex-test1.tex, ifluatex-test2.tex, ifluatex-test3.tex.
-%% 
-\input ifluatex.sty\relax
-\input ifluatex.sty\relax
-\csname @@end\endcsname\end
-\endinput
-%%
-%% End of file `ifluatex-test2.tex'.
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/ifluatex-test3.tex b/Master/texmf-dist/doc/latex/oberdiek/test/ifluatex-test3.tex
deleted file mode 100644
index 84568630cbf..00000000000
--- a/Master/texmf-dist/doc/latex/oberdiek/test/ifluatex-test3.tex
+++ /dev/null
@@ -1,45 +0,0 @@
-%%
-%% This is file `ifluatex-test3.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ifluatex.dtx  (with options: `test-reload2')
-%% 
-%% This is a generated file.
-%% 
-%% Project: ifluatex
-%% Version: 2016/05/16 v1.4
-%% 
-%% Copyright (C) 2007, 2009, 2010 by
-%%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-%% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%%    http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%% 
-%% This work has the LPPL maintenance status "maintained".
-%% 
-%% This Current Maintainer of this work is Heiko Oberdiek.
-%% 
-%% The Base Interpreter refers to any `TeX-Format',
-%% because some files are installed in TDS:tex/generic//.
-%% 
-%% This work consists of the main source file ifluatex.dtx
-%% and the derived files
-%%    ifluatex.sty, ifluatex.pdf, ifluatex.ins, ifluatex.drv,
-%%    ifluatex-test1.tex, ifluatex-test2.tex, ifluatex-test3.tex.
-%% 
-\input miniltx.tex\relax
-\input ifluatex.sty\relax
-\input ifluatex.sty\relax
-\csname @@end\endcsname\end
-\endinput
-%%
-%% End of file `ifluatex-test3.tex'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty
deleted file mode 100644
index c8b2e90b057..00000000000
--- a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty
+++ /dev/null
@@ -1,265 +0,0 @@
-%%
-%% This is file `ifluatex.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ifluatex.dtx  (with options: `package')
-%% 
-%% This is a generated file.
-%% 
-%% Project: ifluatex
-%% Version: 2016/05/16 v1.4
-%% 
-%% Copyright (C) 2007, 2009, 2010 by
-%%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-%% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%%    http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%% 
-%% This work has the LPPL maintenance status "maintained".
-%% 
-%% This Current Maintainer of this work is Heiko Oberdiek.
-%% 
-%% The Base Interpreter refers to any `TeX-Format',
-%% because some files are installed in TDS:tex/generic//.
-%% 
-%% This work consists of the main source file ifluatex.dtx
-%% and the derived files
-%%    ifluatex.sty, ifluatex.pdf, ifluatex.ins, ifluatex.drv,
-%%    ifluatex-test1.tex, ifluatex-test2.tex, ifluatex-test3.tex.
-%% 
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\let\expandafter\x\csname ver@ifluatex.sty\endcsname
-  \ifx\x\relax % plain-TeX, first loading
-  \else
-    \def\empty{}%
-    \ifx\x\empty % LaTeX, first loading,
-      % variable is initialized, but \ProvidesPackage not yet seen
-    \else
-      \expandafter\ifx\csname PackageInfo\endcsname\relax
-        \def\x#1#2{%
-          \immediate\write-1{Package #1 Info: #2.}%
-        }%
-      \else
-        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
-      \fi
-      \x{ifluatex}{The package is already loaded}%
-      \aftergroup\endinput
-    \fi
-  \fi
-\endgroup%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode40=12 % (
-  \catcode41=12 % )
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode47=12 % /
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode91=12 % [
-  \catcode93=12 % ]
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-    \def\x#1#2#3[#4]{\endgroup
-      \immediate\write-1{Package: #3 #4}%
-      \xdef#1{#4}%
-    }%
-  \else
-    \def\x#1#2[#3]{\endgroup
-      #2[{#3}]%
-      \ifx#1\@undefined
-        \xdef#1{#3}%
-      \fi
-      \ifx#1\relax
-        \xdef#1{#3}%
-      \fi
-    }%
-  \fi
-\expandafter\x\csname ver@ifluatex.sty\endcsname
-\ProvidesPackage{ifluatex}%
-  [2016/05/16 v1.4 Provides the ifluatex switch (HO)]%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \catcode64=11 % @
-  \def\x{\endgroup
-    \expandafter\edef\csname ifluatex@AtEnd\endcsname{%
-      \endlinechar=\the\endlinechar\relax
-      \catcode13=\the\catcode13\relax
-      \catcode32=\the\catcode32\relax
-      \catcode35=\the\catcode35\relax
-      \catcode61=\the\catcode61\relax
-      \catcode64=\the\catcode64\relax
-      \catcode123=\the\catcode123\relax
-      \catcode125=\the\catcode125\relax
-    }%
-  }%
-\x\catcode61\catcode48\catcode32=10\relax%
-\catcode13=5 % ^^M
-\endlinechar=13 %
-\catcode35=6 % #
-\catcode64=11 % @
-\catcode123=1 % {
-\catcode125=2 % }
-\def\TMP@EnsureCode#1#2{%
-  \edef\ifluatex@AtEnd{%
-    \ifluatex@AtEnd
-    \catcode#1=\the\catcode#1\relax
-  }%
-  \catcode#1=#2\relax
-}
-\TMP@EnsureCode{10}{12}% ^^J
-\TMP@EnsureCode{39}{12}% '
-\TMP@EnsureCode{40}{12}% (
-\TMP@EnsureCode{41}{12}% )
-\TMP@EnsureCode{44}{12}% ,
-\TMP@EnsureCode{45}{12}% -
-\TMP@EnsureCode{46}{12}% .
-\TMP@EnsureCode{47}{12}% /
-\TMP@EnsureCode{58}{12}% :
-\TMP@EnsureCode{60}{12}% <
-\TMP@EnsureCode{94}{7}% ^
-\TMP@EnsureCode{96}{12}% `
-\edef\ifluatex@AtEnd{\ifluatex@AtEnd\noexpand\endinput}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname PackageError\endcsname\relax
-  \def\ifluatex@Error#1#2{%
-    \begingroup
-      \newlinechar=10 %
-      \def\MessageBreak{^^J}%
-      \edef\x{\errhelp{#2}}%
-      \x
-      \errmessage{Package ifluatex Error: #1}%
-    \endgroup
-  }%
-\else
-  \def\ifluatex@Error{%
-    \PackageError{ifluatex}%
-  }%
-\fi
-\begingroup
-  \expandafter\ifx\csname ifluatex\endcsname\relax
-  \else
-    \edef\i/{\expandafter\string\csname ifluatex\endcsname}%
-    \ifluatex@Error{Name clash, \i/ is already defined}{%
-      Incompatible versions of \i/ can cause problems,\MessageBreak
-      therefore package loading is aborted.%
-    }%
-    \endgroup
-    \expandafter\ifluatex@AtEnd
-  \fi%
-\endgroup
-\let\ifluatex\iffalse
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname luatexversion\endcsname\relax
-\else
-  \expandafter\let\csname ifluatex\expandafter\endcsname
-                  \csname iftrue\endcsname
-\fi
-\ifluatex
-\else
-  \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname directlua\endcsname\relax
-  \else
-    \expandafter\let\csname ifluatex\expandafter\endcsname
-                    \csname iftrue\endcsname
-    \begingroup
-      \newlinechar=10 %
-      \endlinechar=\newlinechar%
-      \ifnum0%
-          \directlua{%
-            if tex.enableprimitives then
-              tex.enableprimitives('ifluatex', {'luatexversion'})
-              tex.print('1')
-            end
-          }%
-          \ifx\ifluatexluatexversion\@undefined\else 1\fi %
-          =11 %
-        \global\let\luatexversion\ifluatexluatexversion%
-      \else%
-        \ifluatex@Error{%
-          Missing \string\luatexversion%
-        }{%
-          Update LuaTeX.%
-        }%
-      \fi%
-    \endgroup%
-  \fi
-\fi
-\ifluatex
-  \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname luatexrevision\endcsname\relax
-    \ifnum\luatexversion<36 %
-    \else
-      \begingroup
-        \ifx\luatexrevision\relax
-          \let\luatexrevision\@undefined
-        \fi
-        \newlinechar=10 %
-        \endlinechar=\newlinechar%
-        \ifcase0%
-            \directlua{%
-              if tex.enableprimitives then
-                tex.enableprimitives('ifluatex', {'luatexrevision'})
-              else
-                tex.print('1')
-              end
-            }%
-            \ifx\ifluatexluatexrevision\@undefined 1\fi%
-            \relax%
-          \global\let\luatexrevision\ifluatexluatexrevision%
-        \fi%
-      \endgroup%
-    \fi
-    \begingroup\expandafter\expandafter\expandafter\endgroup
-    \expandafter\ifx\csname luatexrevision\endcsname\relax
-      \ifluatex@Error{%
-        Missing \string\luatexrevision%
-      }{%
-        Update LuaTeX.%
-      }%
-    \fi
-  \fi
-\fi
-\begingroup
-  \expandafter\ifx\csname PackageInfo\endcsname\relax
-    \def\x#1#2{%
-      \immediate\write-1{Package #1 Info: #2.}%
-    }%
-  \else
-    \let\x\PackageInfo
-    \expandafter\let\csname on@line\endcsname\empty
-  \fi
-  \x{ifluatex}{LuaTeX \ifluatex\else not \fi detected}%
-\endgroup
-\ifluatex@AtEnd%
-\endinput
-%%
-%% End of file `ifluatex.sty'.
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 32142f20a0b..e4f90ccc033 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -587,9 +587,9 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
  'ieeeconf',    "die 'skipping, use IEEEconf'",
  'ieeetran',    "die 'skipping, use IEEEtran'",
  'ifacmtg',     "die 'skipping, nonfree license'",
- 'ifluatex',    "die 'skipping, use oberdiek'",
+ 'ifluatex',    "die 'skipping, use iftex'",
  'ifmslide',    "&MAKEflatten",
- 'ifpdf',       "die 'skipping, use oberdiek'",
+ 'ifpdf',       "die 'skipping, use ifpdf'",
  'imfellflowers',	"die 'skipping, nonfree'",
  'imprintmtshadow',	"die 'skipping, nonfree font support'",
  'induni-om',   "die 'skipping, for omega, use of pua?'",
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index a92e0902201..589173ac5c6 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -23,9 +23,8 @@ depend gsftopk
 depend hyph-utf8
 depend hyphen-base
 depend hyphenex
-depend ifluatex
 depend ifplatform
-depend ifxetex
+depend iftex
 depend knuth-lib
 depend knuth-local
 depend kpathsea
diff --git a/Master/tlpkg/tlpsrc/ifluatex.tlpsrc b/Master/tlpkg/tlpsrc/ifluatex.tlpsrc
deleted file mode 100644
index 4f66ce17ff4..00000000000
--- a/Master/tlpkg/tlpsrc/ifluatex.tlpsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# separated from oberdiek since it is so basic, and not just latex.
-docpattern f texmf-dist/doc/latex/oberdiek/ifluatex.pdf
-docpattern f texmf-dist/doc/latex/oberdiek/test/ifluatex*
-srcpattern f texmf-dist/source/latex/oberdiek/ifluatex.dtx
-runpattern f texmf-dist/tex/generic/oberdiek/ifluatex.sty
diff --git a/Master/tlpkg/tlpsrc/polyglossia.tlpsrc b/Master/tlpkg/tlpsrc/polyglossia.tlpsrc
index 8aa17046e65..cef5cdcf9e4 100644
--- a/Master/tlpkg/tlpsrc/polyglossia.tlpsrc
+++ b/Master/tlpkg/tlpsrc/polyglossia.tlpsrc
@@ -1,5 +1,5 @@
 depend etoolbox
 depend fontspec
-depend ifluatex
+depend iftex
 depend makecmds
 depend xkeyval