From e238d08a39314aa5aaa9470df093db7c82ab5b9f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 25 Apr 2016 22:36:45 +0000 Subject: per heiko, update hobsub-generic.sty with new ifpdf git-svn-id: svn://tug.org/texlive/trunk@40751 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/oberdiek/hobsub-generic.sty | 240 +++------------------ 1 file changed, 24 insertions(+), 216 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty index 3acdef3346a..2964ba0b6be 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty @@ -3401,235 +3401,43 @@ $ \next \hobsub@StopPackage \hobsub@StartPackage{ifpdf} -\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@ifpdf.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{ifpdf}{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@ifpdf.sty\endcsname -\ProvidesPackage{ifpdf}% - [2011/01/30 v2.3 Provides the ifpdf 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 ifpdf@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\ifpdf@AtEnd{% -\ifpdf@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{91}{12}% [ -\TMP@EnsureCode{93}{12}% ] -\TMP@EnsureCode{94}{7}% ^ -\TMP@EnsureCode{96}{12}% ` -\edef\ifpdf@AtEnd{\ifpdf@AtEnd\noexpand\endinput} -\begingroup +%% 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 -\edef\i/{\expandafter\string\csname ifpdf\endcsname}% -\expandafter\ifx\csname PackageError\endcsname\relax -\def\x#1#2{% -\edef\z{#2}% -\expandafter\errhelp\expandafter{\z}% -\errmessage{Package ifpdf Error: #1}% -}% -\def\y{^^J}% -\newlinechar=10 % -\else -\def\x#1#2{% -\PackageError{ifpdf}{#1}{#2}% -}% -\def\y{\MessageBreak}% -\fi -\x{Name clash, \i/ is already defined}{% - Incompatible versions of \i/ can cause problems,\y - therefore package loading is aborted.% -}% -\endgroup -\expandafter\ifpdf@AtEnd -\fi% -\endgroup -\begingroup -\def\skip#1\relax\begingroup{}% -\expandafter\ifx\csname pdfoutput\endcsname\relax -\else -\expandafter\skip -\fi -\expandafter\ifx\csname directlua\endcsname\relax -\expandafter\skip -\fi -\endgroup -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname RequirePackage\endcsname\relax -\def\TMP@RequirePackage#1[#2]{% -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname ver@#1.sty\endcsname\relax -\input #1.sty\relax -\fi -}% -\TMP@RequirePackage{ifluatex}[2009/04/10]% -\else -\RequirePackage{ifluatex}[2009/04/10]% +\ifx\pdftrue\undefined +\ifx\PackageError\undefined +\begingroup\def\PackageError#1#2#3{\endgroup\errmessage{#2}} \fi -\ifluatex -\ifnum\luatexversion<36 % -\else -\begingroup -\directlua{tex.enableprimitives('ifpdf', {'pdfoutput'})}% -\global\let\pdfoutput\ifpdfpdfoutput -\endgroup +\PackageError{ifpdf}{incompatible ifpdf definition}{} +\expandafter\expandafter\expandafter \fi \fi -\relax\begingroup\endgroup -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname newif\endcsname\relax -\edef\pdffalse{% -\let -\expandafter\noexpand\csname ifpdf\endcsname -\expandafter\noexpand\csname iffalse\endcsname -}% -\edef\pdftrue{% -\let -\expandafter\noexpand\csname ifpdf\endcsname -\expandafter\noexpand\csname iftrue\endcsname -}% -\pdffalse -\else -\csname newif\expandafter\endcsname\csname ifpdf\endcsname -\fi +\let\ifpdf\iffalse +\ifx\directlua\undefined \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfoutput\endcsname\relax \else -\ifnum\pdfoutput<1 % -\else +\ifnum\pdfoutput>0 % \pdftrue \fi \fi -\begingroup -\expandafter\ifx\csname pdfoutput\endcsname\relax -\else -\escapechar=92 % -\edef\m{\meaning\pdfoutput}% -\edef\p{\string\pdfoutput}% -\ifx\m\p -\else -\expandafter\ifx\csname PackageWarningNoLine\endcsname\relax -\def\PackageWarningNoLine#1#2{% -\immediate\write16{% - Package `#1' Warning: #2.% -}% -}% -\fi -\PackageWarningNoLine{ifpdf}{% - Someone has redefined \string\pdfoutput% -}% -\fi -\fi -\endgroup -\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 +\directlua{% +if (tex.outputmode or tex.pdfoutput or 0) > 0 then + tex.print('\string\\pdftrue') +end +} \fi -\x{ifpdf}{pdfTeX in PDF mode is \ifpdf\else not \fi detected}% -\endgroup -\ifpdf@AtEnd% \endinput \hobsub@StopPackage -- cgit v1.2.3