summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/graphics-cfg/color.cfg (renamed from Master/texmf-dist/tex/latex/latexconfig/color.cfg)25
-rw-r--r--Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg (renamed from Master/texmf-dist/tex/latex/latexconfig/graphics.cfg)50
2 files changed, 45 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/latexconfig/color.cfg b/Master/texmf-dist/tex/latex/graphics-cfg/color.cfg
index 0a621ce5220..fd0687958d0 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/color.cfg
+++ b/Master/texmf-dist/tex/latex/graphics-cfg/color.cfg
@@ -1,9 +1,13 @@
+% https://creativecommons.org/publicdomain/zero/1.0/
+
\ProvidesFile{color.cfg}%
- [2007/01/18 v1.5 color configuration of teTeX/TeXLive]
+ [2016/01/02 v1.6 sample color configuration]
% Select an appropriate default driver
\begingroup
\chardef\x=0\relax
+ % check luatex
+ \ifx\luatexversion\@undefined
% check pdfTeX
\@ifundefined{pdfoutput}{}{%
\ifnum\pdfoutput<1 %
@@ -19,6 +23,17 @@
\@ifundefined{XeTeXversion}{}{%
\chardef\x=3\relax
}%
+ \else
+ \ifnum\luatexversion>85
+ \ifnum\outputmode>0
+ \chardef\x=4\relax
+ \fi
+ \else
+ \ifnum\pdfoutput>0
+ \chardef\x=1\relax
+ \fi
+ \fi
+ \fi
\expandafter\endgroup
\ifcase\x
% default case
@@ -32,9 +47,15 @@
% VTeX is running
\def\Gin@driver{vtex.def}%
\ExecuteOptions{vtex}%
-\else
+\or
% XeTeX is running
\def\Gin@driver{xetex.def}%
\ExecuteOptions{xetex}%
+\or
+ % luatex (> 0.85)
+ \def\Gin@driver{luatex.def}%
+ \ExecuteOptions{luatex}%
+\else
+ \PackageError{color}{Unexpected configuration}{}
\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg b/Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg
index c63f3211d2e..85f95c463ff 100644
--- a/Master/texmf-dist/tex/latex/latexconfig/graphics.cfg
+++ b/Master/texmf-dist/tex/latex/graphics-cfg/graphics.cfg
@@ -1,11 +1,13 @@
-% Public domain.
-% Written by Thomas Esser, Heiko Oberdiek, Sebastian Rahtz, and others.
+% https://creativecommons.org/publicdomain/zero/1.0/
+
\ProvidesFile{graphics.cfg}%
- [2010/04/23 v1.9 graphics configuration of TeX Live]%
+ [2016/01/02 v1.10 sample graphics configuration]%
% Select an appropriate default driver
\begingroup
\chardef\x=0\relax
+ % check luatex
+ \ifx\luatexversion\@undefined
% check pdfTeX
\@ifundefined{pdfoutput}{}{%
\ifnum\pdfoutput<1 %
@@ -21,6 +23,17 @@
\@ifundefined{XeTeXversion}{}{%
\chardef\x=3\relax
}%
+ \else
+ \ifnum\luatexversion>85
+ \ifnum\outputmode>0
+ \chardef\x=4\relax
+ \fi
+ \else
+ \ifnum\pdfoutput>0
+ \chardef\x=1\relax
+ \fi
+ \fi
+ \fi
\expandafter\endgroup
\ifcase\x
% default case
@@ -76,34 +89,15 @@
% VTeX is running
\def\Gin@driver{vtex.def}%
\ExecuteOptions{vtex}%
-\else
+\or
% XeTeX is running
\def\Gin@driver{xetex.def}%
\ExecuteOptions{xetex}%
-\fi
-
-% Fix for dvips and xdvi versions that can uncompress
-% graphic files without an explicite call of gunzip.
-% (The fix is not applied for miniltx.tex, because
-% \AtEndOfPackage is not available in plainTeX.)
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname AtEndOfPackage\endcsname\relax
+\or
+ % luatex (> 0.85)
+ \def\Gin@driver{luatex.def}%
+ \ExecuteOptions{luatex}%
\else
- \AtEndOfPackage{%
- \begingroup
- \@ifundefined{DeclareGraphicsRule}{%
- \endgroup
- }{%
- \def\x{dvips.def}%
- \expandafter\endgroup
- \ifx\x\Gin@driver
- \DeclareGraphicsRule{.pz}{eps}{.bb}{}%
- \DeclareGraphicsRule{.eps.Z}{eps}{.eps.bb}{}%
- \DeclareGraphicsRule{.ps.Z}{eps}{.ps.bb}{}%
- \DeclareGraphicsRule{.ps.gz}{eps}{.ps.bb}{}%
- \DeclareGraphicsRule{.eps.gz}{eps}{.eps.bb}{}%
- \fi
- }%
- }%
+ \PackageError{graphics}{Unexpected configuration}{}
\fi
\endinput