summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-01 21:50:35 +0000
committerKarl Berry <karl@freefriends.org>2019-11-01 21:50:35 +0000
commite924b812ecac387daf7a206858c7d9468306bb0b (patch)
treea31951bf6e4fcb2e2b01c5fadabc5d52b21f2e99
parentf7850ce9e05b768d01811e51dff94565f926d0c8 (diff)
rm ifetex, subsumed into iftex
git-svn-id: svn://tug.org/texlive/trunk@52606 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/ifetex/README17
-rw-r--r--Master/texmf-dist/doc/latex/ifetex/ifetex.pdfbin144943 -> 0 bytes
-rw-r--r--Master/texmf-dist/source/latex/ifetex/ifetex.dtx235
-rw-r--r--Master/texmf-dist/source/latex/ifetex/ifetex.ins11
-rw-r--r--Master/texmf-dist/tex/latex/ifetex/ifetex.sty46
-rw-r--r--Master/texmf-dist/tex/plain/ifetex/ifetex.tex33
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
-rw-r--r--Master/tlpkg/tlpsrc/collection-plaingeneric.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/ifetex.tlpsrc0
10 files changed, 2 insertions, 344 deletions
diff --git a/Master/texmf-dist/doc/latex/ifetex/README b/Master/texmf-dist/doc/latex/ifetex/README
deleted file mode 100644
index b11fd0baa96..00000000000
--- a/Master/texmf-dist/doc/latex/ifetex/README
+++ /dev/null
@@ -1,17 +0,0 @@
-LaTeX package 'ifetex'
-~~~~~~~~~~~~~~~~~~~~~~
-Copyright (c) 2011-2018 by Martin Scharrer <martin@scharrer-online.de>
-CTAN: http://www.ctan.org/pkg/ifetex
-Code repository: https://bitbucket.org/martin_scharrer/ifetex
-Issue tracker: https://bitbucket.org/martin_scharrer/ifetex/issues
-
-This small package provides the if-switch \ifetex which indicated whether
-e-TeX is available or not.
-
-The package can be loaded as LaTeX package using `\usepackage{ifetex}` or in
-plainTeX using `\input ifetex`. In both cases it aborts silently if the \ifetex macro
-is already defined.
-
-The package currently test if \eTeXversion is defined as a primitive and
-assumes e-TeX if so.
-
diff --git a/Master/texmf-dist/doc/latex/ifetex/ifetex.pdf b/Master/texmf-dist/doc/latex/ifetex/ifetex.pdf
deleted file mode 100644
index 84132f64122..00000000000
--- a/Master/texmf-dist/doc/latex/ifetex/ifetex.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/source/latex/ifetex/ifetex.dtx b/Master/texmf-dist/source/latex/ifetex/ifetex.dtx
deleted file mode 100644
index fdcd4d814ee..00000000000
--- a/Master/texmf-dist/source/latex/ifetex/ifetex.dtx
+++ /dev/null
@@ -1,235 +0,0 @@
-% \iffalse meta-comment
-%<=*COPYRIGHT>
-%% Copyright (C) 2011-2018 by Martin Scharrer <martin@scharrer-online.de>
-%% ---------------------------------------------------------------------------
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% 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'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files ifetex.dtx and ifetex.ins
-%% and the derived filebase ifetex.sty.
-%%
-%<=/COPYRIGHT>
-% \fi
-%
-% \iffalse
-%<*driver>
-\ProvidesFile{ifetex.dtx}[%
-%<=*DATE>
- 2018/03/31
-%<=/DATE>
-%<=*VERSION>
- v1.2a
-%<=/VERSION>
- Conditional to test for e-TeX]
-\documentclass{ydoc}
-\GetFileInfo{ifetex.dtx}
-\usepackage{ifetex}[\filedate]
-\EnableCrossrefs
-\CodelineIndex
-\RecordChanges
-\begin{document}
- \DocInput{\jobname.dtx}
- \PrintChanges
- \PrintIndex
-\end{document}
-%</driver>
-% \fi
-%
-% \CheckSum{73}
-%
-% \CharacterTable
-% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-% Digits \0\1\2\3\4\5\6\7\8\9
-% Exclamation \! Double quote \" Hash (number) \#
-% Dollar \$ Percent \% Ampersand \&
-% Acute accent \' Left paren \( Right paren \)
-% Asterisk \* Plus \+ Comma \,
-% Minus \- Point \. Solidus \/
-% Colon \: Semicolon \; Less than \<
-% Equals \= Greater than \> Question mark \?
-% Commercial at \@ Left bracket \[ Backslash \\
-% Right bracket \] Circumflex \^ Underscore \_
-% Grave accent \` Left brace \{ Vertical bar \|
-% Right brace \} Tilde \~}
-%
-%
-% \changes{v1.0}{2011/10/31}{First version.}
-% \changes{v1.1}{2011/11/06}{Changes to manual, local declaration of \cs{ifetex}.}
-% \changes{v1.2}{2011/12/15}{Added \cs{NeedsETeX} \protect\LaTeX\ macro.}
-% \changes{v1.2a}{2018/03/31}{Improvements to manual.}
-%
-%
-% \DoNotIndex{\newcommand,\newenvironment}
-%
-% \GetFileInfo{ifetex.dtx}
-% \author{Martin Scharrer}
-% \email{martin@scharrer-online.de}
-%
-% \maketitle
-%
-% \providecommand\eTeX{$\epsilon$-\TeX}
-% \begin{abstract}\noindent
-% This small package provides the if-switch \Macro\ifetex which
-% indicated whether \eTeX\ is available or not.
-% \end{abstract}
-%
-% \smallskip
-% \begin{multicols}{2}
-% \setcounter{tocdepth}{2}
-% \tableofcontents
-% \end{multicols}
-%
-% \section*{Links}
-% This package is developed using an
-% \href{https://bitbucket.org/martin_scharrer/ifetex/downloads/}{Mercurial}
-% (HG) revision control repository on \href{https://bitbucket.org/}{Bitbucket.org}.
-% It is published on the \href{http://www.ctan.org/}{Comprehensive \TeX\ Archive Network} (CTAN)
-% and available with the main \TeX\ distributions \TeX Live and Mik\TeX.
-%
-% Bug reports and feature requests should be submitted using the issue tracker linked below.
-%
-% The following table lists the location of the package, its downloadable files, both on CTAN and
-% on the package website.
-%
-% \begin{center}\small
-% \begin{tabular}{ll}
-% \toprule
-% CTAN & \small\url{https://www.ctan.org/pkg/ifetex}\\
-% PDF Manual & \small\url{http://mirrors.ctan.org/macros/latex/contrib/ifetex/ifetex.pdf}\\
-% TDS ZIP & \small\url{http://mirrors.ctan.org/install/macros/latex/contrib/ifetex.tds.zip}\\
-% \midrule
-% Website & \small\url{https://bitbucket.org/martin_scharrer/ifetex/}\\
-% HG Repository & \small\url{https://bitbucket.org/martin_scharrer/ifetex/}\\
-% Issue Tracker & \small\url{https://bitbucket.org/martin_scharrer/ifetex/issues}\\
-% Downloads & \small\url{https://bitbucket.org/martin_scharrer/ifetex/downloads/}\\
-% PDF Manual & \small\url{https://bitbucket.org/martin_scharrer/ifetex/downloads/ifetex.pdf}\\
-% TDS ZIP & \small\url{https://bitbucket.org/martin_scharrer/ifetex/downloads/ifetex.tds.zip}\\
-% Source ZIP & \small\url{https://bitbucket.org/martin_scharrer/ifetex/downloads/ifetex.zip}\\
-% \bottomrule
-% \end{tabular}
-% \end{center}
-%
-%
-%
-% \clearpage
-% \section{Usage}
-% The package can be loaded as \LaTeX\ package using \Macro\usepackage{ifetex} or in plain\TeX\ using \Macro\input' ifetex'.
-% In both cases it aborts silently if the \Macro\ifetex macro is already defined.
-%
-% The package currently test if \Macro\eTeXversion is defined as a primitive and assumes \eTeX\ if so.
-%
-% Note that almost all modern \LaTeX\ distributions use \eTeX.
-% The two major distributions \TeX\ Live and Mik\TeX\ support it and use it by default (except for the classic |tex|).
-% The \LaTeX\ which comes with \emph{Scientific Work Place} by MacKichan seems to not support \eTeX\ yet.
-% Package authors can use this package to test for missing \eTeX\ and provide fall-back code.
-%
-% \DescribeMacro\ifetex
-% Equal to \Macro\iftrue if \eTeX\ support is present and \Macro\iffalse otherwise.
-%
-% \DescribeMacro\NeedsETeX[<version>]
-% The \LaTeX\ package provides this macro which can be used in packages or classes to produce an error if \eTeX\ is not available,
-% similar to \Macro\NeedsTeXFormat. In addition an optional version number can be given in the format x.y, where x is the main version and y the revision.
-% This number is checked against \Macro\eTeXversion and \Macro\eTeXrevision and an appropriate error is raised if the available
-% \eTeX\ is too old.
-%
-% \StopEventually{}
-% \clearpage
-% \section{Implementation}
-%
-% \subsection{\texttt{ifetex.sty}}
-% \iffalse
-%<*ifetex.sty>
-% \fi
-% \begin{macrocode}
-%<!COPYRIGHT>
-\ProvidesPackage{ifetex}[%
-%<!DATE>
-%<!VERSION>
-%<*DRIVER>
- 2099/01/01 develop
-%</DRIVER>
- ifetex]
-% \end{macrocode}
-%
-% \begin{macrocode}
-\@@input ifetex
-% \end{macrocode}
-%
-%
-% \begin{macro}{\NeedsETeX}[1]{optional version number (x.y)}
-% Produces error if e-TeX is not available or if its version is too old.
-% \begin{macrocode}
-\newcommand*\NeedsETeX[1][]{%
- \ifetex
- \ifx\@nnil#1\@nnil\else
- \ifdim\the\eTeXversion\eTeXrevision\p@<#1\p@\relax
- \@latex@error{This file needs e-TeX with version #1%
- \MessageBreak but only version \the\eTeXversion\eTeXrevision is available}{%
- The current input file will not be processed
- further,\MessageBreak
- because it was written for a newer version of e-TeX.
- \MessageBreak\@ehd}%
- \endinput
- \fi\fi
- \else
- \@latex@error{This file needs e-TeX}{%
- The current input file will not be processed
- further,\MessageBreak
- because it was written for e-TeX which is not available.
- \MessageBreak\@ehd}%
- \endinput
- \fi
-}
-% \end{macrocode}
-% \end{macro}
-%
-% \iffalse
-%</ifetex.sty>
-% \fi
-%
-% \subsection{\texttt{ifetex.tex}}
-% \iffalse
-%<*ifetex.tex>
-% \fi
-% \begin{macrocode}
-%<!COPYRIGHT>
-% \end{macrocode}
-%
-% Abort if \Macro{ifetex} is already defined.
-% \begin{macrocode}
-\expandafter\ifx\csname ifetex\endcsname\relax\else
- \expandafter\endinput
-\fi
-% \end{macrocode}
-%
-% \begin{macro}{ifetex}
-% Checks if \Macro\eTeXversion is a primitive.
-% \begin{macrocode}
-\begingroup
-\edef\tempa{\meaning\eTeXversion}%
-\edef\tempb{\string\eTeXversion}%
-\ifx\tempa\tempb
- \endgroup
- \expandafter\let\csname ifetex\expandafter\endcsname\csname iftrue\endcsname
-\else
- \endgroup
- \expandafter\let\csname ifetex\expandafter\endcsname\csname iffalse\endcsname
-\fi
-% \end{macrocode}
-% \end{macro}
-% \iffalse
-%</ifetex.tex>
-% \fi
-%
-% \Finale
-\endinput
diff --git a/Master/texmf-dist/source/latex/ifetex/ifetex.ins b/Master/texmf-dist/source/latex/ifetex/ifetex.ins
deleted file mode 100644
index 8b3e6d5038d..00000000000
--- a/Master/texmf-dist/source/latex/ifetex/ifetex.ins
+++ /dev/null
@@ -1,11 +0,0 @@
-\input ydocstrip.tex
-\keepsilent
-\askforoverwritefalse
-
-\generate{%
- \file{ifetex.sty}{\nopreamble\from{ifetex.dtx}{ifetex.sty}}%
- \file{ifetex.tex}{\nopreamble\from{ifetex.dtx}{ifetex.tex}}%
-}
-\endbatchfile
-
-%% vim: ft=tex
diff --git a/Master/texmf-dist/tex/latex/ifetex/ifetex.sty b/Master/texmf-dist/tex/latex/ifetex/ifetex.sty
deleted file mode 100644
index 02d1807837c..00000000000
--- a/Master/texmf-dist/tex/latex/ifetex/ifetex.sty
+++ /dev/null
@@ -1,46 +0,0 @@
-%% Copyright (C) 2011-2018 by Martin Scharrer <martin@scharrer-online.de>
-%% ---------------------------------------------------------------------------
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% 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'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files ifetex.dtx and ifetex.ins
-%% and the derived filebase ifetex.sty.
-%%
-\ProvidesPackage{ifetex}[%
- 2018/03/31
- v1.2a
- ifetex]
-\@@input ifetex
-\newcommand*\NeedsETeX[1][]{%
- \ifetex
- \ifx\@nnil#1\@nnil\else
- \ifdim\the\eTeXversion\eTeXrevision\p@<#1\p@\relax
- \@latex@error{This file needs e-TeX with version #1%
- \MessageBreak but only version \the\eTeXversion\eTeXrevision is available}{%
- The current input file will not be processed
- further,\MessageBreak
- because it was written for a newer version of e-TeX.
- \MessageBreak\@ehd}%
- \endinput
- \fi\fi
- \else
- \@latex@error{This file needs e-TeX}{%
- The current input file will not be processed
- further,\MessageBreak
- because it was written for e-TeX which is not available.
- \MessageBreak\@ehd}%
- \endinput
- \fi
-}
-\endinput
-%%
-%% End of file `ifetex.sty'.
diff --git a/Master/texmf-dist/tex/plain/ifetex/ifetex.tex b/Master/texmf-dist/tex/plain/ifetex/ifetex.tex
deleted file mode 100644
index a4ab9cd48de..00000000000
--- a/Master/texmf-dist/tex/plain/ifetex/ifetex.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-%% Copyright (C) 2011-2018 by Martin Scharrer <martin@scharrer-online.de>
-%% ---------------------------------------------------------------------------
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% 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'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files ifetex.dtx and ifetex.ins
-%% and the derived filebase ifetex.sty.
-%%
-\expandafter\ifx\csname ifetex\endcsname\relax\else
- \expandafter\endinput
-\fi
-\begingroup
-\edef\tempa{\meaning\eTeXversion}%
-\edef\tempb{\string\eTeXversion}%
-\ifx\tempa\tempb
- \endgroup
- \expandafter\let\csname ifetex\expandafter\endcsname\csname iftrue\endcsname
-\else
- \endgroup
- \expandafter\let\csname ifetex\expandafter\endcsname\csname iffalse\endcsname
-\fi
-\endinput
-%%
-%% End of file `ifetex.tex'.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index aa49b840051..60b8d6cc4eb 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -355,7 +355,7 @@ my @TLP_working = qw(
hypdvips hyper hyperbar hypernat hyperref hyperxmp hyph-utf8 hyphen-base
hyphenat hyphenex hyplain
ibycus-babel ibygrk icite icsv identkey idxcmds idxlayout ieeepes ietfbibs
- ifetex iffont ifmslide ifmtarg ifnextok ifoddpage ifplatform ifptex ifsym
+ iffont ifmslide ifmtarg ifnextok ifoddpage ifplatform ifptex ifsym
iftex ifthenx ifxetex ifxptex
iitem ijmart ijqc ijsra
imac image-gallery imakeidx impatient impatient-cn impatient-fr
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index e4f90ccc033..b70712fa0fd 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -587,6 +587,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'ieeeconf', "die 'skipping, use IEEEconf'",
'ieeetran', "die 'skipping, use IEEEtran'",
'ifacmtg', "die 'skipping, nonfree license'",
+ 'ifetex', "die 'skipping, use iftex'",
'ifluatex', "die 'skipping, use iftex'",
'ifmslide', "&MAKEflatten",
'ifpdf', "die 'skipping, use ifpdf'",
diff --git a/Master/tlpkg/tlpsrc/collection-plaingeneric.tlpsrc b/Master/tlpkg/tlpsrc/collection-plaingeneric.tlpsrc
index cc43453b654..0a57c3cb75d 100644
--- a/Master/tlpkg/tlpsrc/collection-plaingeneric.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-plaingeneric.tlpsrc
@@ -43,7 +43,6 @@ depend graphics-pln
depend gtl
depend hlist
depend hyplain
-depend ifetex
depend iftex
depend insbox
depend js-misc
diff --git a/Master/tlpkg/tlpsrc/ifetex.tlpsrc b/Master/tlpkg/tlpsrc/ifetex.tlpsrc
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/tlpkg/tlpsrc/ifetex.tlpsrc
+++ /dev/null