From 1e849611504af9b2921ef39cb7e591af882c7310 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 17 Jan 2018 23:46:06 +0000 Subject: graphbox (17jan18) git-svn-id: svn://tug.org/texlive/trunk@46360 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/graphbox/graphbox.sty | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/latex/graphbox/graphbox.sty') diff --git a/Master/texmf-dist/tex/latex/graphbox/graphbox.sty b/Master/texmf-dist/tex/latex/graphbox/graphbox.sty index 2b5d25a577f..3c37efac602 100644 --- a/Master/texmf-dist/tex/latex/graphbox/graphbox.sty +++ b/Master/texmf-dist/tex/latex/graphbox/graphbox.sty @@ -6,7 +6,7 @@ %% %% graphbox.dtx (with options: `package') %% -%% Copyright (C) 2013-2014 Niklas Beisert +%% Copyright (C) 2013-2018 Niklas Beisert %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -17,7 +17,8 @@ %% version 2005/12/01 or later. %% \NeedsTeXFormat{LaTeX2e}[1996/12/01] -\ProvidesPackage{graphbox}[2014/08/31 v1.0 extension for graphicx to adjust containing box] +\ProvidesPackage{graphbox}[2018/01/17 v1.1 extension for graphicx to adjust containing box] + \newif\ifGin@box@beamer\Gin@box@beamertrue \DeclareOption{nobeamer}{\Gin@box@beamerfalse} \ProcessOptions @@ -63,9 +64,9 @@ \define@key{Gin}{margin}{\def\Gin@box@lmargin{#1}\def\Gin@box@rmargin{#1}% \def\Gin@box@tmargin{#1}\def\Gin@box@bmargin{#1}} -\let\old@box@Ginclude@graphics\Ginclude@graphics -\def\Ginclude@graphics#1{% - \sbox{\Gin@box@box}{\old@box@Ginclude@graphics{#1}}% +\let\old@box@Gin@setfile\Gin@setfile +\def\Gin@setfile#1#2#3{% + \sbox{\Gin@box@box}{\old@box@Gin@setfile{#1}{#2}{#3}}% \settowidth{\Gin@box@width}{\usebox{\Gin@box@box}}% \settoheight{\Gin@box@height}{\usebox{\Gin@box@box}}% \def\gwidth{\Gin@box@width}% @@ -124,6 +125,7 @@ \old@box@includegraphics[#1]{#2}} \AtBeginDocument{\let\includegraphics=\fibox@includegraphics} \fi}{} + \endinput %% %% End of file `graphbox.sty'. -- cgit v1.2.3