From 04d32329a7c6096200af479fad946b30df3d3e69 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 18 Aug 2015 23:07:06 +0000 Subject: dvipdfmx-def (18aug15) git-svn-id: svn://tug.org/texlive/trunk@38150 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def index 932eaa7bd1d..a50a4073beb 100644 --- a/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/dvipdfmx-def/dvipdfmx.def @@ -23,7 +23,7 @@ %% % emacs-page \ProvidesFile{dvipdfmx.def} - [2015/03/26 v4.04 LaTeX color/graphics driver for dvipdfmx (TeX Live/ChoF)] + [2015/08/16 v4.05 LaTeX color/graphics driver for dvipdfmx (TeX Live/ChoF)] % \def\c@lor@arg#1{% \dimen@#1\p@ @@ -98,7 +98,15 @@ \def\declareimagemask@i[#1]#2#3{% \special{pdf:image @#2\space hide (#3) #1}} +% +% improved by N. Abe to cache BoundingBox for pdfpages package +% \def\Gread@pdf#1{% +\edef\@tempa{pdf@bbox@cache\Gin@page @sep@#1}% +\expandafter\expandafter\expandafter\@ifundefined\expandafter{\@tempa}{\Gread@@pdf{#1}}{% +\edef\@gtempa{\csname\@tempa\endcsname}% +\expandafter\Gread@parse@bb\@gtempa\\}} +\def\Gread@@pdf#1{% \begingroup \@tempcnta\z@ \loop\ifnum\@tempcnta<\@xxxii @@ -174,8 +182,12 @@ \fi \fi % +% improved by N. Abe to cache BoundingBox for pdfpages package % - \ifGin@bbox\else + \ifGin@bbox + \edef\@tempa{pdf@bbox@cache\Gin@page @sep@#1}% + \expandafter\expandafter\expandafter\xdef\expandafter\csname\@tempa\endcsname{\@gtempa}% + \else \@latex@error {Cannot determine size of image (no BoundingBox)}% \@ehc -- cgit v1.2.3