graphics (25jun17)

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

18 files changed, 34 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/graphics/changes.txt b/Master/texmf-dist/doc/latex/graphics/changes.txt
index a60bdb94e35..5388de337c4 100644
--- a/Master/texmf-dist/doc/latex/graphics/changes.txt
+++ b/Master/texmf-dist/doc/latex/graphics/changes.txt
@@ -3,6 +3,10 @@ It is provided for convenience only.  It therefore makes no claims to
 completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
+2017-06-25 Joseph Wright <latex-bugs@latex-project.org>
+
+        * New decodearray key, adopted from older pdftex.def
+
 2017-05-31  David Carlisle, Joseph Wright <latex-bugs@latex-project.org>
 
 	* graphics.dtx: Generalize bounding box reader for use in other formats than EPS
diff --git a/Master/texmf-dist/doc/latex/graphics/color.pdf b/Master/texmf-dist/doc/latex/graphics/color.pdf
index 2c974c7cfb0..ed426331b61 100644
--- a/Master/texmf-dist/doc/latex/graphics/color.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/color.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/drivers.pdf b/Master/texmf-dist/doc/latex/graphics/drivers.pdf
index 19d295fba3e..2bdad782e58 100644
--- a/Master/texmf-dist/doc/latex/graphics/drivers.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/drivers.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/epsfig.pdf b/Master/texmf-dist/doc/latex/graphics/epsfig.pdf
index ce2ca735c88..38bed5a6e33 100644
--- a/Master/texmf-dist/doc/latex/graphics/epsfig.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/epsfig.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/graphics.pdf b/Master/texmf-dist/doc/latex/graphics/graphics.pdf
index 9ebf1bfec15..67170b0e692 100644
--- a/Master/texmf-dist/doc/latex/graphics/graphics.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/graphics.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/graphicx.pdf b/Master/texmf-dist/doc/latex/graphics/graphicx.pdf
index 21bffc0ce52..e775adfe42c 100644
--- a/Master/texmf-dist/doc/latex/graphics/graphicx.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/graphicx.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/grfguide.pdf b/Master/texmf-dist/doc/latex/graphics/grfguide.pdf
index db9783317b4..25b19e7f284 100644
--- a/Master/texmf-dist/doc/latex/graphics/grfguide.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/grfguide.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/keyval.pdf b/Master/texmf-dist/doc/latex/graphics/keyval.pdf
index 0418a0f859b..15b4ac6318f 100644
--- a/Master/texmf-dist/doc/latex/graphics/keyval.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/keyval.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/lscape.pdf b/Master/texmf-dist/doc/latex/graphics/lscape.pdf
index 8b503e8e9bf..24b1435b068 100644
--- a/Master/texmf-dist/doc/latex/graphics/lscape.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/lscape.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/rotating.pdf b/Master/texmf-dist/doc/latex/graphics/rotating.pdf
index 6670f5cac62..0ea6a91ffed 100644
--- a/Master/texmf-dist/doc/latex/graphics/rotating.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/rotating.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/rotex.pdf b/Master/texmf-dist/doc/latex/graphics/rotex.pdf
index 4f05d471b68..f6e8b922e45 100644
--- a/Master/texmf-dist/doc/latex/graphics/rotex.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/rotex.pdf
diff --git a/Master/texmf-dist/doc/latex/graphics/trig.pdf b/Master/texmf-dist/doc/latex/graphics/trig.pdf
index 070b9e60d0c..dae2035018e 100644
--- a/Master/texmf-dist/doc/latex/graphics/trig.pdf
+++ b/Master/texmf-dist/doc/latex/graphics/trig.pdf
diff --git a/Master/texmf-dist/source/latex/graphics/epsfig.dtx b/Master/texmf-dist/source/latex/graphics/epsfig.dtx
index 15ab20c24d5..ba37d771cc2 100644
--- a/Master/texmf-dist/source/latex/graphics/epsfig.dtx
+++ b/Master/texmf-dist/source/latex/graphics/epsfig.dtx
@@ -2,7 +2,7 @@
 % \iffalse
 %
 %% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz
-%%            Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project
+%%            Copyright (C) 2000--2015,2017 David Carlisle, LaTeX3 Project
 %%
 %% This file is part of the Standard LaTeX `Graphics Bundle'.
 %% It may be distributed under the terms of the LaTeX Project Public
@@ -17,7 +17,7 @@
 %<driver> \ProvidesFile{epsfig.drv}
 % \fi
 %         \ProvidesFile{epsfig.dtx}
-                  [1999/02/16 v1.7a (e)psfig emulation (SPQR)]
+                  [2017/06/25 v1.7b (e)psfig emulation (SPQR)]
 %
 % \iffalse
 %<*driver>
@@ -33,7 +33,7 @@
 % \title{The \textsf{epsfig} package\thanks{This file
 %        has version number \fileversion, last
 %        revised \filedate.}}
-% \author{Sebastian Rahtz\\spqr@ftp.tex.ac.uk}
+% \author{Sebastian Rahtz\\latex-team@latex-project.org}
 % \date{\filedate}
 % \MaintainedByLaTeXTeam{graphics}
 % \maketitle
diff --git a/Master/texmf-dist/source/latex/graphics/graphics.dtx b/Master/texmf-dist/source/latex/graphics/graphics.dtx
index bba7bc3c291..028f0658527 100644
--- a/Master/texmf-dist/source/latex/graphics/graphics.dtx
+++ b/Master/texmf-dist/source/latex/graphics/graphics.dtx
@@ -19,7 +19,7 @@
 %<driver> \ProvidesFile{graphics.drv}
 % \fi
 %         \ProvidesFile{graphics.dtx}
-          [2017/06/13 v1.2b  Standard LaTeX Graphics (DPC,SPQR)]
+          [2017/06/25 v1.2c  Standard LaTeX Graphics (DPC,SPQR)]
 %
 % \iffalse
 %<*driver>
@@ -1197,6 +1197,15 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\Gin@decode}
+% \changes{v1.2c}{2017/06/25}
+%     {New macro}
+% In the standard interface this is a no-op, but needs to be defined
+% to allow the caching code to be set up.
+%    \begin{macrocode}
+\let\Gin@decode\@empty
+%    \end{macrocode}
+% \end{macro}
 %
 %  \begin{macro}{\Gin@exclamation}
 % \changes{v0.7g}{1995/12/06}{Macro added}
diff --git a/Master/texmf-dist/source/latex/graphics/graphicx.dtx b/Master/texmf-dist/source/latex/graphics/graphicx.dtx
index 5c5bb2b7fe5..aad8460ac5a 100644
--- a/Master/texmf-dist/source/latex/graphics/graphicx.dtx
+++ b/Master/texmf-dist/source/latex/graphics/graphicx.dtx
@@ -555,6 +555,16 @@
 %    \end{macrocode}
 % \end{key}
 %
+% \begin{key}{Gin}{decodearray}
+% \changes{v1.1b}{2017/06/25}{New decodearray key}
+%   For manipulating bitmap images.
+%    \begin{macrocode}
+\define@key{Gin}{decodearray}{%
+  \def\Gin@decode{#1}%
+}
+%    \end{macrocode}
+% \end{key}
+%
 % \begin{key}{Gin}{quiet}
 % \changes{v1.1a}{2017/06/01}{New quiet key}
 %   Skip writing to the log.
diff --git a/Master/texmf-dist/tex/latex/graphics/epsfig.sty b/Master/texmf-dist/tex/latex/graphics/epsfig.sty
index 65daf737484..209ac9ccc67 100644
--- a/Master/texmf-dist/tex/latex/graphics/epsfig.sty
+++ b/Master/texmf-dist/tex/latex/graphics/epsfig.sty
@@ -12,7 +12,7 @@
 %% 
 %% 
 %% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz
-%%            Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project
+%%            Copyright (C) 2000--2015,2017 David Carlisle, LaTeX3 Project
 %%
 %% This file is part of the Standard LaTeX `Graphics Bundle'.
 %% It may be distributed under the terms of the LaTeX Project Public
@@ -21,7 +21,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
 \ProvidesPackage{epsfig}
-                  [1999/02/16 v1.7a (e)psfig emulation (SPQR)]
+                  [2017/06/25 v1.7b (e)psfig emulation (SPQR)]
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}}
 \ProcessOptions
 \RequirePackage{graphicx}
diff --git a/Master/texmf-dist/tex/latex/graphics/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty
index c80ca293f5b..b1ea79790bf 100644
--- a/Master/texmf-dist/tex/latex/graphics/graphics.sty
+++ b/Master/texmf-dist/tex/latex/graphics/graphics.sty
@@ -23,7 +23,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{graphics}
-          [2017/06/13 v1.2b  Standard LaTeX Graphics (DPC,SPQR)]
+          [2017/06/25 v1.2c  Standard LaTeX Graphics (DPC,SPQR)]
 \edef\Gin@codes{%
  \catcode`\noexpand\^^A\the\catcode`\^^A\relax
  \catcode`\noexpand\"\the\catcode`\"\relax
@@ -242,6 +242,7 @@
     \wd\z@\Gin@req@width
   \box\z@
   \fi}
+\let\Gin@decode\@empty
 \def\Gin@exclamation{!}
 \let\Gin@page\@empty
 \def\Gin@pagebox{cropbox}
diff --git a/Master/texmf-dist/tex/latex/graphics/graphicx.sty b/Master/texmf-dist/tex/latex/graphics/graphicx.sty
index bcbc16da318..605a16ae2b9 100644
--- a/Master/texmf-dist/tex/latex/graphics/graphicx.sty
+++ b/Master/texmf-dist/tex/latex/graphics/graphicx.sty
@@ -124,6 +124,9 @@
 \let\Gin@eread\@empty
 \define@key{Gin}{command}{\def\Gin@ecom##1{#1}}
 \let\Gin@ecom\@firstofone
+\define@key{Gin}{decodearray}{%
+  \def\Gin@decode{#1}%
+}
 \define@key{Gin}{quiet}{%
   \let\Gin@log\@gobble
 }