graphics (12jun17)

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

2 files changed, 70 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/graphics/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty
index ae2ca9ee453..d09fcd64cbf 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/04/14 v1.1b  Standard LaTeX Graphics (DPC,SPQR)]
+          [2017/06/01 v1.2a  Standard LaTeX Graphics (DPC,SPQR)]
 \edef\Gin@codes{%
  \catcode`\noexpand\^^A\the\catcode`\^^A\relax
  \catcode`\noexpand\"\the\catcode`\"\relax
@@ -60,7 +60,7 @@
 \DeclareOption{dvips}{\def\Gin@driver{dvips.def}}
 \DeclareOption{xdvi}{\ExecuteOptions{dvips}}
 \DeclareOption{dvipdf}{\def\Gin@driver{dvipdf.def}}
-\DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfm.def}}
+\DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfmx.def}}
 \DeclareOption{dvipdfmx}{\def\Gin@driver{dvipdfmx.def}}
 \DeclareOption{xetex}{\def\Gin@driver{xetex.def}}
 \DeclareOption{pdftex}{\def\Gin@driver{pdftex.def}}
@@ -243,6 +243,10 @@
   \box\z@
   \fi}
 \def\Gin@exclamation{!}
+\let\Gin@page\@empty
+\def\Gin@pagebox{cropbox}
+\newif\ifGin@interpolate
+\let\Gin@log\wlog
 \let\Gin@req@sizes\relax
 \def\Gin@scalex{1}%
 \let\Gin@scaley\Gin@exclamation
@@ -254,7 +258,24 @@
       {Cannot determine size of graphic in #1 (no size specified)}%
       \@ehc}
 \newif\ifGin@bbox
-\def\Gread@eps#1{%
+\def\Gread@generic#1#2{%
+  \edef\Gread@attr@hash{%
+    \ifx\Gin@pagebox\@empty\else
+      :\Gin@pagebox
+    \fi
+    \ifx\Gin@page\@empty\else
+      :P\Gin@page
+    \fi
+  }%
+  \@ifundefined{#1 bbox\Gread@attr@hash}%
+    {\Gread@generic@aux{#1}{#2}}
+    {%
+      \expandafter\global\expandafter\let\expandafter\@gtempa
+        \csname #1 bbox\Gread@attr@hash\endcsname
+    }%
+  \expandafter\Gread@parse@bb\@gtempa\\%
+}
+\def\Gread@generic@aux#1#2{%
   \begingroup
   \@tempcnta\z@
   \loop\ifnum\@tempcnta<\@xxxii
@@ -269,7 +290,20 @@
   \catcode\endlinechar5 %
   \@makeother\:%
   \@makeother\-%
-  \immediate\openin\@inputcheck#1 %
+  \immediate\openin\@inputcheck"#1" %
+  #2{#1}%
+  \ifGin@bbox\else
+    \@latex@error
+      {Cannot determine size of graphic in #1 (no BoundingBox)}%
+      \@ehc
+    \gdef\@gtempa{0 0 72 72 }%
+  \fi
+  \endgroup
+}
+\def\Gread@eps#1{%
+  \Gread@generic{#1}\Gread@eps@aux
+}
+\def\Gread@eps@aux#1{%
   \ifeof\@inputcheck
     \@latex@error{File `#1' not found}\@ehc
   \else
@@ -286,14 +320,7 @@
      \repeat
     \immediate\closein\@inputcheck
   \fi
-  \ifGin@bbox\else
-    \@latex@error
-      {Cannot determine size of graphic in #1 (no BoundingBox)}%
-      \@ehc
-    \gdef\@gtempa{0 0 72 72 }%
-  \fi
-  \endgroup
-  \expandafter\Gread@parse@bb\@gtempa\\}
+}
 \long\def\Gread@find@bb#1:#2#3\\{%
   \def\@tempa{#1}%
   \ifx\@tempa\Gread@BBox
diff --git a/Master/texmf-dist/tex/latex/graphics/graphicx.sty b/Master/texmf-dist/tex/latex/graphics/graphicx.sty
index 9bf0caeec83..bcbc16da318 100644
--- a/Master/texmf-dist/tex/latex/graphics/graphicx.sty
+++ b/Master/texmf-dist/tex/latex/graphics/graphicx.sty
@@ -12,7 +12,7 @@
 %% 
 %% 
 %% graphicx.dtx Copyright (C) 1994      David Carlisle Sebastian Rahtz
-%%              Copyright (C) 1995--2015 David Carlisle, LaTeX3 Project
+%%              Copyright (C) 1995--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}[1995/12/01]
 \ProvidesPackage{graphicx}
-          [2014/10/28 v1.0g  Enhanced LaTeX Graphics (DPC,SPQR)]
+          [2017/06/01 v1.1a  Enhanced LaTeX Graphics (DPC,SPQR)]
 \DeclareOption{unknownkeysallowed}
   {\PassOptionsToPackage\CurrentOption{keyval}}
 \DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}}
@@ -124,6 +124,35 @@
 \let\Gin@eread\@empty
 \define@key{Gin}{command}{\def\Gin@ecom##1{#1}}
 \let\Gin@ecom\@firstofone
+\define@key{Gin}{quiet}{%
+  \let\Gin@log\@gobble
+}
+\define@key{Gin}{page}{%
+  \def\Gin@page{#1}%
+  \ifx\Gin@page\@empty
+  \else
+    \edef\Gin@page{\number\Gin@page}%
+  \fi
+}
+\define@key{Gin}{interpolate}[true]{%
+  \lowercase{\Gin@boolkey{#1}}{interpolate}}
+\define@key{Gin}{pagebox}{%
+        \expandafter\let\expandafter\Gin@pagebox
+            \csname Gin@pagebox@#1\endcsname
+        \ifx\Gin@pagebox\relax
+          \let\Gin@pagebox\Gin@pagebox@cropbox
+          \@warning{%
+            Unknown value `#1' for `pagebox'.\MessageBreak
+            Supported values:\MessageBreak
+            mediabox, cropbox, bleedbox, trimbox, artbox%
+          }%
+        \fi
+      }
+      \def\Gin@pagebox@mediabox{mediabox}%
+      \def\Gin@pagebox@cropbox{cropbox}%
+      \def\Gin@pagebox@bleedbox{bleedbox}%
+      \def\Gin@pagebox@trimbox{trimbox}%
+      \def\Gin@pagebox@artbox{artbox}%
 \def\Gin@boolkey#1#2{%
   \csname Gin@#2\ifx\relax#1\relax true\else#1\fi\endcsname}
 \def\Gin@eresize{\height}