use color.cfg and graphics.cfg from latex group; needs recent dvips.def and trig.sty

git-svn-id: svn://tug.org/texlive/trunk@40269 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 81 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/latex/graphics-cfg/README.md b/Master/texmf-dist/doc/latex/graphics-cfg/README.md
new file mode 100644
index 00000000000..a50e3af01dc
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/graphics-cfg/README.md
@@ -0,0 +1,33 @@
+# graphics-cfg
+Sample configuration files for LaTeX2e color and graphics
+
+Note that these files are, as far as possible, in the public domain
+and may be edited to suit the distribution being used.
+
+Specifically they are released under the CC0 1.0 Universal licence
+ https://creativecommons.org/publicdomain/zero/1.0/
+
+
+They may be edited by end users, but more commonly should be edited
+by maintainers of TeX distributions to detect a suitable range of
+package options for the tex systems and dvi drivers available.
+
+
+These color and graphics configurations will make the color and
+graphics packages default option be
+luatex, pdftex, vtex, xetex or dvips.
+Note that pdftex option is used for luatex versions older than
+luatex 0.87.
+
+graphics.cfg also has code to enable EPS to PDF conversion if used
+with pdftex, this code may be moved to pdftex.def later.
+
+
+
+These files are currently maintained by the LaTeX3 project but
+incorporating work by Thomas Esser, Heiko Oberdiek, Sebastian Rahtz,
+Karl Berry and others.
+
+Issues and change suggestions may be raised at github:
+
+https://github.com/latex3/graphics-cfg/issues
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
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index b56db9aedfa..9e4d6248bd0 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -280,7 +280,8 @@ my @TLP_working = qw(
     glossaries-serbian glossaries-spanish
     gmdoc gmdoc-enhance
     gmiflink gmp gmutils gmverb gmverse gnuplottex go gobble gost gothic
-    gradientframe gradstudentresume grafcet graphbox graphics graphics-pln
+    gradientframe gradstudentresume grafcet graphbox graphics
+    graphics-cfg graphics-pln
     graphicx-psmin graphicxbox graphviz greek-fontenc greek-inputenc
     greekdates greektex greektonoi greenpoint grfpaste
     grid grid-system gridset grotesq grundgesetze
diff --git a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
index 84498defdee..745249cbf94 100644
--- a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
@@ -17,6 +17,7 @@ depend fancyhdr
 depend fix2col
 depend geometry
 depend graphics
+depend graphics-cfg
 depend hyperref
 depend latex
 depend latex-bin
diff --git a/Master/tlpkg/tlpsrc/graphics-cfg.tlpsrc b/Master/tlpkg/tlpsrc/graphics-cfg.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/graphics-cfg.tlpsrc