summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-19 20:48:34 +0000
committerKarl Berry <karl@freefriends.org>2016-04-19 20:48:34 +0000
commit48561236fc022edcf3f809721714c89abda515aa (patch)
tree42a9cf12ec0816f7dc4375668b46f749b6c218ef /Master/texmf-dist/source
parent31d261406712b866232bafd834b52eedfa10c9a1 (diff)
update of ifpdf and hyperref from dcarlisle+latex3 to work with new luatex
git-svn-id: svn://tug.org/texlive/trunk@40618 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-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/source/latex/hyperref/hyperref.ins10
-rw-r--r--Master/texmf-dist/source/latex/hyperref/useluatex85.dtx13
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.ins3
5 files changed, 138 insertions, 4 deletions
diff --git a/Master/texmf-dist/source/generic/ifpdf/ifpdf.dtx b/Master/texmf-dist/source/generic/ifpdf/ifpdf.dtx
new file mode 100644
index 00000000000..9ab7d2ea5ee
--- /dev/null
+++ b/Master/texmf-dist/source/generic/ifpdf/ifpdf.dtx
@@ -0,0 +1,106 @@
+% \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
new file mode 100644
index 00000000000..409c06da3e2
--- /dev/null
+++ b/Master/texmf-dist/source/generic/ifpdf/ifpdf.ins
@@ -0,0 +1,10 @@
+\input docstrip
+\keepsilent
+\preamble
+\endpreamble
+
+\askforoverwritefalse
+
+\generate{\file{ifpdf.sty}{\from{ifpdf.dtx}{package}}}
+
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.ins b/Master/texmf-dist/source/latex/hyperref/hyperref.ins
index 3add5dd1488..6617b9362c1 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.ins
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.ins
@@ -6,6 +6,7 @@
%% Copyright 1995-1999 Sebastian Rahtz
%% 1999-2000 Sebastian Rahtz, Heiko Oberdiek
%% 2001-2012 Heiko Oberdiek
+%% 2016 David Carlisle (include useluatex85)
%%
%% This file is part of the `Hyperref Bundle'.
%% -------------------------------------------
@@ -28,7 +29,7 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{2010/01/25}
+\def\filedate{2016/04/19}
\def\batchfile{hyperref.ins}
\input docstrip
@@ -55,14 +56,17 @@
\endpreamble
\generate{%
- \file{hyperref.drv}{\from{hyperref.dtx}{driver}}
+ \file{hyperref.drv}{\needed{useluatex85.dtx}\from{hyperref.dtx}{driver}}
\file{hycheck.tex}{\from{hyperref.dtx}{check}}
\file{backref.drv}{\from{backref.dtx}{driver}}
\file{nameref.drv}{\from{nameref.dtx}{driver}}
\usedir{tex/latex/hyperref}
\file{backref.sty}{\from{backref.dtx}{package}}
\file{nameref.sty}{\from{nameref.dtx}{package}}
- \file{hyperref.sty}{\from{hyperref.dtx}{package}}
+ \file{hyperref.sty}{
+ \from{useluatex85.dtx}{package}
+ \from{hyperref.dtx}{package}
+ }
\file{hypertex.def}{\from{hyperref.dtx}{hypertex}}
\file{pdfmark.def}{\from{hyperref.dtx}{pdfmark,pdfmarkbase,pdfform,outlines}}
\file{hvtexmrk.def}{\from{hyperref.dtx}{vtexpdfmark}}
diff --git a/Master/texmf-dist/source/latex/hyperref/useluatex85.dtx b/Master/texmf-dist/source/latex/hyperref/useluatex85.dtx
new file mode 100644
index 00000000000..12757674738
--- /dev/null
+++ b/Master/texmf-dist/source/latex/hyperref/useluatex85.dtx
@@ -0,0 +1,13 @@
+% \begin{macrocode}
+%<*package>
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% LaTeX3 Team update:
+%% Add compatibility for luatex 0.85+.
+\ifx\directlua\@undefined\else
+\typeout{luatex85 package added for Luatex 0.85+ compatibility}
+\RequirePackage{luatex85}
+\fi
+% end of luatex compatibility insertion
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%</package>
+% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index de8a679be49..02880550112 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
@@ -65,7 +65,8 @@
\batchinput{ifdraft.dtx}
\batchinput{iflang.dtx}
\batchinput{ifluatex.dtx}
-\batchinput{ifpdf.dtx}
+% incompatible with current luatex
+%\batchinput{ifpdf.dtx}
\batchinput{ifvtex.dtx}
\batchinput{infwarerr.dtx}
\batchinput{inputenx.dtx}