graphics-def (25jun17)

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

5 files changed, 69 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/graphics-def/README.md b/Master/texmf-dist/doc/latex/graphics-def/README.md
index 915c03ddab9..00e9568065b 100644
--- a/Master/texmf-dist/doc/latex/graphics-def/README.md
+++ b/Master/texmf-dist/doc/latex/graphics-def/README.md
@@ -1,7 +1,7 @@
 LaTeX support for color and graphics
 ====================================
 
-Release 2017-06-20
+Release 2017-06-25
 
 This bundle contains the 'engine-dependent' part of support for
 color and graphics in LaTeX2e (the code here will also function
diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
index ac79fd45281..361d89aca75 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def
@@ -16,7 +16,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{dvipdfmx.def}
-  [2017/06/20 v5.0f Graphics/color driver for dvipdfmx]
+  [2017/06/24 v5.0g Graphics/color driver for dvipdfmx]
 \def\GPT@space{ }
 \def\c@lor@arg#1{%
   \dimen@#1\p@
@@ -84,6 +84,9 @@
 \def\define@color@named#1#2{%
   \expandafter\let\csname col@#1\endcsname\@nnil}
       \def\no@page@color{\special{background \string"newpath clip}}
+\@ifundefined{Gin@decode}
+  {\let\Gin@decode\@empty}
+  {}
 \@ifundefined{Gin@page}
   {\let\Gin@page\@empty}
   {}
@@ -126,6 +129,7 @@
 }
 \let\Gread@bmp\Gread@pdf
 \def\Ginclude@pdf#1{%
+  \let\Gin@decode\@empty
   \Gin@interpolatefalse
   \Ginclude@dvipdfmx{#1}{epdf}%
 }
@@ -146,7 +150,16 @@
       \ifx\Gin@scalex\@tempa\else width\GPT@space\the\Gin@req@width\GPT@space\fi
       \ifx\Gin@scaley\@tempa\else height\GPT@space\the\Gin@req@height\GPT@space\fi
       (#1)\GPT@space
-      \ifGin@interpolate<</Interpolate\GPT@space true>>\fi}%
+      \ifnum0%
+        \ifx\Gin@decode\@empty\else 1\fi
+        \ifGin@interpolate 1\fi
+        >0 %
+        <<%
+          \ifx\Gin@decode\@empty\else /Decode[\Gin@decode]\fi
+          \ifGin@interpolate /Interpolate true\fi
+        >>%
+      \fi
+    }%
   \egroup}
 \newif\if@trim@vport
 \def\Ginclude@eps#1{%
diff --git a/Master/texmf-dist/tex/latex/graphics-def/luatex.def b/Master/texmf-dist/tex/latex/graphics-def/luatex.def
index fd6e382f33d..e063fefd082 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/luatex.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/luatex.def
@@ -18,7 +18,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{luatex.def}
-  [2017/06/20 v1.0e Graphics/color driver for luatex]
+  [2017/06/24 v1.0f Graphics/color driver for luatex]
 \def\GPT@space{ }
 \def\c@lor@arg#1{%
   \dimen@#1\p@
@@ -142,6 +142,9 @@
     }%
 }
 \let\Gin@attr@hash\@empty
+\@ifundefined{Gin@decode}
+  {\let\Gin@decode\@empty}
+  {}
 \@ifundefined{Gin@log}
   {\let\Gin@log\wlog}
   {}
@@ -164,6 +167,9 @@
     \else
       :P\Gin@page
     \fi
+    \ifx\Gin@decode\@empty\else
+      :D[\Gin@decode]%
+    \fi
     \ifGin@interpolate
       :I%
     \fi
@@ -171,7 +177,15 @@
   \@ifundefined{#1 image\Gin@attr@hash}%
     {%
       \saveimageresource
-        \ifGin@interpolate attr{/Interpolate true}\fi
+        \ifnum0%
+          \ifx\Gin@decode\@empty\else 1\fi
+          \ifGin@interpolate 1\fi
+          >0 %
+          attr{%
+            \ifx\Gin@decode\@empty\else/Decode[\Gin@decode]\fi
+            \ifGin@interpolate/Interpolate true\fi
+          }%
+        \fi
         \ifx\Gin@page\@empty\else page \Gin@page\fi
         \Gin@pagebox
         {#1}%
@@ -190,6 +204,7 @@
         id=\the\lastsavedimageresourceindex, %
         \ifx\Gin@page\@empty\else page=\Gin@page , \fi
         \ifx\Gin@pagebox\@empty\else pagebox=\Gin@pagebox , \fi
+        \ifx\Gin@decode\@empty\else decode=[\Gin@decode], \fi
         \ifGin@interpolate interpolate=true, \fi
         \the\wd\@tempboxa\GPT@space x \the\ht\@tempboxa
         >%
@@ -207,6 +222,7 @@
 \let\Gread@jpg\Gread@png
 \expandafter\let\csname Gread@jbig2\endcsname\Gread@png
 \def\Gread@pdf#1{%
+  \let\Gin@decode\@empty
   \Gin@interpolatefalse
   \Gread@pdftex{#1}%
 }
diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
index 4bd1793ba10..8e4430b261e 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def
@@ -18,7 +18,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{pdftex.def}
-  [2017/06/20 v1.0f Graphics/color driver for pdftex]
+  [2017/06/24 v1.0g Graphics/color driver for pdftex]
 \def\GPT@space{ }
 \def\c@lor@arg#1{%
   \dimen@#1\p@
@@ -160,6 +160,9 @@ E     \else
     }%
 }
 \let\Gin@attr@hash\@empty
+\@ifundefined{Gin@decode}
+  {\let\Gin@decode\@empty}
+  {}
 \@ifundefined{Gin@log}
   {\let\Gin@log\wlog}
   {}
@@ -183,6 +186,9 @@ E     \else
     \else
       :P\Gin@page
     \fi
+    \ifx\Gin@decode\@empty\else
+      :D[\Gin@decode]%
+    \fi
     \ifGin@interpolate
       :I%
     \fi
@@ -190,7 +196,15 @@ E     \else
   \@ifundefined{#1 image\Gin@attr@hash}%
     {%
       \pdfximage
-        \ifGin@interpolate attr{/Interpolate true}\fi
+        \ifnum0%
+          \ifx\Gin@decode\@empty\else 1\fi
+          \ifGin@interpolate 1\fi
+          >0 %
+          attr{%
+            \ifx\Gin@decode\@empty\else/Decode[\Gin@decode]\fi
+            \ifGin@interpolate/Interpolate true\fi
+          }%
+        \fi
         \ifx\Gin@page\@empty\else page \Gin@page\fi
         \Gin@pagebox
         {#1}%
@@ -209,6 +223,7 @@ E     \else
         id=\the\pdflastximage, %
         \ifx\Gin@page\@empty\else page=\Gin@page , \fi
         \ifx\Gin@pagebox\@empty\else pagebox=\Gin@pagebox , \fi
+        \ifx\Gin@decode\@empty\else decode=[\Gin@decode], \fi
         \ifGin@interpolate interpolate=true, \fi
         \the\wd\@tempboxa\GPT@space x \the\ht\@tempboxa
         >%
@@ -227,6 +242,7 @@ E     \else
 \let\Gread@jpg\Gread@png
 \expandafter\let\csname Gread@jbig2\endcsname\Gread@png
 \def\Gread@pdf#1{%
+  \let\Gin@decode\@empty
   \Gin@interpolatefalse
   \Gread@pdftex{#1}%
 }
diff --git a/Master/texmf-dist/tex/latex/graphics-def/xetex.def b/Master/texmf-dist/tex/latex/graphics-def/xetex.def
index 6440f6d1944..bb2cba80d49 100644
--- a/Master/texmf-dist/tex/latex/graphics-def/xetex.def
+++ b/Master/texmf-dist/tex/latex/graphics-def/xetex.def
@@ -16,7 +16,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{xetex.def}
-  [2017/06/20 v5.0g Graphics/color driver for xetex]
+  [2017/06/24 v5.0h Graphics/color driver for xetex]
 \def\GPT@space{ }
 \def\c@lor@arg#1{%
   \dimen@#1\p@
@@ -84,6 +84,9 @@
 \def\define@color@named#1#2{%
   \expandafter\let\csname col@#1\endcsname\@nnil}
       \def\no@page@color{\special{background \string"newpath clip}}
+\@ifundefined{Gin@decode}
+  {\let\Gin@decode\@empty}
+  {}
 \@ifundefined{Gin@page}
   {\let\Gin@page\@empty}
   {}
@@ -94,6 +97,7 @@
   {\csname newif\endcsname\ifGin@interpolate}
   {}
 \def\Gread@pdf#1{%
+  \let\Gin@decode\@empty
   \Gin@interpolatefalse
   \Gread@@xetex\XeTeXpdffile
 }
@@ -239,8 +243,18 @@
       \ifx\Gin@scalex\@tempa\else width\GPT@space\the\Gin@req@width\GPT@space\fi
       \ifx\Gin@scaley\@tempa\else height\GPT@space\the\Gin@req@height\GPT@space\fi
       (#1)\GPT@space
-      \ifGin@interpolate<</Interpolate\GPT@space true>>\fi}%
-  \egroup}
+      \ifnum0%
+        \ifx\Gin@decode\@empty\else 1\fi
+        \ifGin@interpolate 1\fi
+        >0 %
+        <<%
+          \ifx\Gin@decode\@empty\else /Decode[\Gin@decode]\fi
+          \ifGin@interpolate /Interpolate true\fi
+        >>%
+      \fi
+    }%
+  \egroup
+}
 \newif\if@trim@vport
 \def\Ginclude@eps#1{%
   \Gin@log{<#1>}%