diff options
author | Karl Berry <karl@freefriends.org> | 2017-06-12 21:43:33 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-06-12 21:43:33 +0000 |
commit | a2a43b4b75ea94be73cbe2626f10f10f775b0dfb (patch) | |
tree | 9085e50bf0dc08f9112a522261c8ab0feb23ff31 /Master/texmf-dist/tex/latex/graphics/graphics.sty | |
parent | 8bf0eb4f63fc047aad126bf8cc95960fcd752496 (diff) |
graphics (12jun17)
git-svn-id: svn://tug.org/texlive/trunk@44579 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/graphics/graphics.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/graphics/graphics.sty | 51 |
1 files changed, 39 insertions, 12 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 |