summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/plain
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-03 22:03:11 +0000
committerKarl Berry <karl@freefriends.org>2020-03-03 22:03:11 +0000
commit5d743e0a015ef1e44cb5ec2f0851c34e3ae6721c (patch)
tree45a364bb8dd6ad0c5bbb54a66e98f72b2e403bc0 /Master/texmf-dist/tex/plain
parent8b6d64fa9d06d6ff5428f42c773c7e5d6a42a10f (diff)
graphics-pln (3mar20)
git-svn-id: svn://tug.org/texlive/trunk@54029 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/plain')
-rw-r--r--Master/texmf-dist/tex/plain/graphics-pln/color.tex25
-rw-r--r--Master/texmf-dist/tex/plain/graphics-pln/graphicx.tex23
-rw-r--r--Master/texmf-dist/tex/plain/graphics-pln/miniltx.tex29
3 files changed, 72 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/plain/graphics-pln/color.tex b/Master/texmf-dist/tex/plain/graphics-pln/color.tex
index fb8c1284ff2..9c27d4300e5 100644
--- a/Master/texmf-dist/tex/plain/graphics-pln/color.tex
+++ b/Master/texmf-dist/tex/plain/graphics-pln/color.tex
@@ -3,7 +3,30 @@
\input miniltx
-\def\Gin@driver{dvips.def}
+
+
+\ifx\Gin@driver\@undefined
+ \ifx\directlua\@undefined
+ \ifx\pdfoutput\@undefined
+ \def\Gin@driver{dvips.def}
+ \else
+ \ifnum\pdfoutput=1
+ \def\Gin@driver{pdftex.def}
+ \else
+ \def\Gin@driver{dvips.def}
+ \fi
+ \fi
+ \else
+ \def\Gin@driver{luatex.def}
+ \fi
+\fi
+
+
+
+\let\@color@protected\protected
+\expandafter\@gobble\csname protected\endcsname
+
\input color.sty
+\let\protected\@color@protected
\resetatcatcode
diff --git a/Master/texmf-dist/tex/plain/graphics-pln/graphicx.tex b/Master/texmf-dist/tex/plain/graphics-pln/graphicx.tex
index cbe65357696..d29c7389564 100644
--- a/Master/texmf-dist/tex/plain/graphics-pln/graphicx.tex
+++ b/Master/texmf-dist/tex/plain/graphics-pln/graphicx.tex
@@ -9,9 +9,28 @@
\let\ttfamily\tt
\fi
-\def\Gin@driver{dvips.def}
-\input graphicx.sty
+\ifx\Gin@driver\@undefined
+ \ifx\directlua\@undefined
+ \ifx\pdfoutput\@undefined
+ \def\Gin@driver{dvips.def}
+ \else
+ \ifnum\pdfoutput=1
+ \def\Gin@driver{pdftex.def}
+ \else
+ \def\Gin@driver{dvips.def}
+ \fi
+ \fi
+ \else
+ \def\Gin@driver{luatex.def}
+ \fi
+\fi
+\let\GRAPHICS@detokenize\detokenize
+\ifx\detokenize\@undefined
+ \def\detokenize#1{#1}
+\fi
+\input graphicx.sty
+\let\detokenize\GRAPHICS@detokenize
\resetatcatcode
diff --git a/Master/texmf-dist/tex/plain/graphics-pln/miniltx.tex b/Master/texmf-dist/tex/plain/graphics-pln/miniltx.tex
index 7290959d040..814b7d7bf9c 100644
--- a/Master/texmf-dist/tex/plain/graphics-pln/miniltx.tex
+++ b/Master/texmf-dist/tex/plain/graphics-pln/miniltx.tex
@@ -2,7 +2,7 @@
%%%
%%% Parts of LaTeX: Slightly changed/simplified in places.
%%% Changes
-%%% Copyright 1996-2017 David Carlisle LaTeX3 Project
+%%% Copyright 1996-2020 David Carlisle LaTeX3 Project
%%% Original Code
%%% Copyright 1993-1996 LaTeX3 Project and original authors
%%%
@@ -10,7 +10,7 @@
%%% or any other LaTeX related support address.
%%%
%%% Problems should be reported as issues at
-%%% https://github.com/davidcarlisle/dpctex/tree/master/graphics-pln
+%%% https://github.com/davidcarlisle/graphics-pln/issues
%%%
%%%
%%% This file may be distributed under the terms of the LPPL, see
@@ -25,6 +25,8 @@
% 2010/02/03 accept *-form of \ProcessOptions [KB/DL]
% 2016/08/17 fix catcode @ handling (again), document github address [DC]
% 2017/06/01 assorted updates to cover updated latex drivers
+% 2019/07/20 more updates for latex drivers
+% 2020/03/02 move to own git repository and add newcommand fix from issue #2
\edef\resetatcatcode{\catcode`\noexpand\@\the\catcode`\@\relax}
@@ -115,6 +117,8 @@
\ifx#2\@empty\else\expandafter\zap@space\fi
#2}
+\def\strip@prefix#1>{}
+
\let\@empty\empty
\def\@pkgextension{sty}
@@ -243,6 +247,17 @@
{\def\reserved@a{\renew@command\reserved@a}}%
\reserved@a}%
+% Missing \x@protect definition added 2020/03/02
+\def\x@protect#1{%
+ \ifx\protect\@typeset@protect\else
+ \@x@protect#1%
+ \fi
+}
+\def\@x@protect#1\fi#2#3{%
+ \fi\protect#1%
+}
+\let\@typeset@protect\relax
+
\def\@ifundefined#1{%
\expandafter\ifx\csname#1\endcsname\relax
\expandafter\@firstoftwo
@@ -509,3 +524,13 @@
% 1996/11/21
\def\@warning{\immediate\write16}
+
+% 2019/07/20
+\def\quote@name#1{"\quote@@name#1\@gobble""}
+\def\quote@@name#1"{#1\quote@@name}
+\def\unquote@name#1{\quote@@name#1\@gobble"}
+
+\ifx\set@curr@file\@undefined
+ \def\set@curr@file#1{\xdef\@curr@file{#1}}
+\fi
+