summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-11 21:37:17 +0000
committerKarl Berry <karl@freefriends.org>2016-05-11 21:37:17 +0000
commit01058baf49ee1750accac90a502d1df4f4c7c2c8 (patch)
tree2b36be747dd4653654666a2bc0816dae3074133b /Master
parenta262ae002eacb541230398abf0b4f35459640b71 (diff)
rm ifpdf, merged back into oberdiek
git-svn-id: svn://tug.org/texlive/trunk@41046 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/ifpdf/ifpdf.pdfbin146855 -> 0 bytes
-rw-r--r--Master/texmf-dist/source/generic/ifpdf/ifpdf.dtx106
-rw-r--r--Master/texmf-dist/source/generic/ifpdf/ifpdf.ins10
-rw-r--r--Master/texmf-dist/tex/generic/ifpdf/ifpdf.sty48
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
-rw-r--r--Master/tlpkg/tlpsrc/collection-basic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/ifpdf.tlpsrc0
7 files changed, 1 insertions, 165 deletions
diff --git a/Master/texmf-dist/doc/generic/ifpdf/ifpdf.pdf b/Master/texmf-dist/doc/generic/ifpdf/ifpdf.pdf
deleted file mode 100644
index a238fc01d26..00000000000
--- a/Master/texmf-dist/doc/generic/ifpdf/ifpdf.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/source/generic/ifpdf/ifpdf.dtx b/Master/texmf-dist/source/generic/ifpdf/ifpdf.dtx
deleted file mode 100644
index 9ab7d2ea5ee..00000000000
--- a/Master/texmf-dist/source/generic/ifpdf/ifpdf.dtx
+++ /dev/null
@@ -1,106 +0,0 @@
-% \iffalse
-%% Source File: ifpdf.dtx
-%% Copyright 2016 LaTeX3 project
-%%
-%% This file may be distributed under the terms of the LPPL.
-%% See README for details.
-%
-%<*dtx>
- \ProvidesFile{ifpdf.dtx}
-%</dtx>
-%<package>\ifx\ProvidesPackage\undefined
-%<package>\def\next#1#2[#3]{\wlog{#2 #3}}
-%<package>\expandafter\next\fi
-%<package>\ProvidesPackage{ifpdf}
-%<driver> \ProvidesFile{ifpdf.drv}
-% \fi
-% \ProvidesFile{ifpdf.dtx}
-[2016/04/04 v3.0 Provides the ifpdf switch]
-%
-% \iffalse
-%<*driver>
-\documentclass{ltxdoc}
-\begin{document}
-\DocInput{ifpdf.dtx}
-\end{document}
-%</driver>
-% \fi
-%
-% \GetFileInfo{ifpdf.dtx}
-%
-% \title{The \textsf{ifpdf} Package\thanks{This file
-% has version number \fileversion, last
-% revised \filedate.
-% Please report any issues at https://github.com/davidcarlisle/ifpdf/issues}}
-% \author{LaTeX3 project}
-% \date{\filedate}
-% \maketitle
-%
-% \section{Introduction}
-%
-% A re-implementation of Heiko Oberdiek's \textsf{ifpdf} package
-% with simplified structure and updated to work with current Lua\TeX.
-%
-% The package defines a new boolean, \verb|\ifpdf| which is true
-% for pdf\TeX\ and Lua\TeX\ in PDF mode, and false otherwise.
-%
-% \section{Implementation}
-%
-% \begin{macrocode}
-%<*package>
-% \end{macrocode}
-%
-% If \verb|\ifpdf| is not defined define it, taking care that it is
-% outer in plain \TeX.
-% \begin{macrocode}
-\expandafter\ifx\csname ifpdf\endcsname\relax
- \csname newif\expandafter\endcsname\csname ifpdf\endcsname
-\else
-% \end{macrocode}
-% If \verb|\ifpdf| is already defined but \verb|\pdftrue| is not defined
-% give up.
-% \begin{macrocode}
- \ifx\pdftrue\undefined
- \ifx\PackageError\undefined
- \begingroup\def\PackageError#1#2#3{\endgroup\errmessage{#2}}
- \fi
- \PackageError{ifpdf}{incompatible ifpdf definition}{}
- \expandafter\expandafter\expandafter
- \fi
-\fi
-% \end{macrocode}
-% Otherwise set the boolean to false unless pdfoutput (outputmode) is greater than zero.
-% For Lua\TeX, do the test in Lua as the tex primitivies may not be enabled, and
-% the primitive name may be \verb|\pdfoutput| or \verb|\outputmode| depending
-% on the Lua\TeX\ version number.
-% \begin{macrocode}
-\let\ifpdf\iffalse
-% \end{macrocode}
-%
-% \begin{macrocode}
-\ifx\directlua\undefined
-% \end{macrocode}
-% Not Lua\TeX.
-% \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdfoutput\endcsname\relax
-\else
- \ifnum\pdfoutput>0 %
- \pdftrue
- \fi
-\fi
-\else
-% \end{macrocode}
-% Lua\TeX.
-% \begin{macrocode}
-\directlua{%
-if (tex.outputmode or tex.pdfoutput or 0) > 0 then
- tex.print('\string\\pdftrue')
-end
-}
-\fi
-% \end{macrocode}
-%
-% \begin{macrocode}
-%</package>
-% \end{macrocode}
diff --git a/Master/texmf-dist/source/generic/ifpdf/ifpdf.ins b/Master/texmf-dist/source/generic/ifpdf/ifpdf.ins
deleted file mode 100644
index 409c06da3e2..00000000000
--- a/Master/texmf-dist/source/generic/ifpdf/ifpdf.ins
+++ /dev/null
@@ -1,10 +0,0 @@
-\input docstrip
-\keepsilent
-\preamble
-\endpreamble
-
-\askforoverwritefalse
-
-\generate{\file{ifpdf.sty}{\from{ifpdf.dtx}{package}}}
-
-\endbatchfile
diff --git a/Master/texmf-dist/tex/generic/ifpdf/ifpdf.sty b/Master/texmf-dist/tex/generic/ifpdf/ifpdf.sty
deleted file mode 100644
index 388ef565987..00000000000
--- a/Master/texmf-dist/tex/generic/ifpdf/ifpdf.sty
+++ /dev/null
@@ -1,48 +0,0 @@
-%%
-%% This is file `ifpdf.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ifpdf.dtx (with options: `package')
-%%
-%% Source File: ifpdf.dtx
-%% Copyright 2016 LaTeX3 project
-%%
-%% This file may be distributed under the terms of the LPPL.
-%% See README for details.
-\ifx\ProvidesPackage\undefined
-\def\next#1#2[#3]{\wlog{#2 #3}}
-\expandafter\next\fi
-\ProvidesPackage{ifpdf}
-[2016/04/04 v3.0 Provides the ifpdf switch]
-\expandafter\ifx\csname ifpdf\endcsname\relax
- \csname newif\expandafter\endcsname\csname ifpdf\endcsname
-\else
- \ifx\pdftrue\undefined
- \ifx\PackageError\undefined
- \begingroup\def\PackageError#1#2#3{\endgroup\errmessage{#2}}
- \fi
- \PackageError{ifpdf}{incompatible ifpdf definition}{}
- \expandafter\expandafter\expandafter
- \fi
-\fi
-\let\ifpdf\iffalse
-\ifx\directlua\undefined
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdfoutput\endcsname\relax
-\else
- \ifnum\pdfoutput>0 %
- \pdftrue
- \fi
-\fi
-\else
-\directlua{%
-if (tex.outputmode or tex.pdfoutput or 0) > 0 then
- tex.print('\string\\pdftrue')
-end
-}
-\fi
-\endinput
-%%
-%% End of file `ifpdf.sty'.
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index a9d75063d35..92356e1dc28 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -517,6 +517,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'ifacmtg', "die 'skipping, nonfree license'",
'ifluatex', "die 'skipping, use oberdiek'",
'ifmslide', "&MAKEflatten",
+ 'ifpdf', "die 'skipping, use oberdiek'",
'imprintmtshadow', "die 'skipping, nonfree font support'",
'indxcite', "die 'skipping, too old, license suboptimal'",
'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 f34f8234ed3..e2f44641086 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -22,7 +22,6 @@ depend gsftopk
depend hyph-utf8
depend hyphen-base
depend ifluatex
-depend ifpdf
depend ifxetex
depend knuth-lib
depend knuth-local
diff --git a/Master/tlpkg/tlpsrc/ifpdf.tlpsrc b/Master/tlpkg/tlpsrc/ifpdf.tlpsrc
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/tlpkg/tlpsrc/ifpdf.tlpsrc
+++ /dev/null