diff --git a/dvipdfmx.def b/dvipdfmx.def index a1b1346..cd48050 100644 --- a/dvipdfmx.def +++ b/dvipdfmx.def @@ -93,8 +93,37 @@ pdf:bgcolor \current@color}} \def\define@color@named#1#2{% \expandafter\let\csname col@#1\endcsname\@nnil} -\let\Gread@pdf\Gread@extractbb -\let\Gread@bmp\Gread@extractbb +\def\Gread@pdf#1{% + \Gread@generic\Gread@extractbb@aux +} +\def\Gread@extractbb@aux#1{% + \ifeof\@inputcheck + \immediate\openin\@inputcheck=% + "|extractbb % + \ifx\Gin@page\@empty\else -p \Gin@page\fi + -O \Gin@base\Gin@ext"% + \fi + \Gread@true + \let\@tempb\Gread@false + \ifeof\@inputcheck + \@latex@error + {Cannot run pipe command. Try --shell-escape^^J% + (--enable-pipes in MikTeX) option}% + {}% + \else + \loop + \read\@inputcheck to\@tempa + \ifeof\@inputcheck + \Gread@false + \else + \expandafter\Gread@find@bb\@tempa:.\\% + \fi + \ifGread@ + \repeat + \immediate\closein\@inputcheck + \fi +} +\let\Gread@bmp\Gread@pdf \def\Ginclude@pdf#1{% \Ginclude@dvipdfmx{#1}{epdf}% } diff --git a/graphics-addn.def b/graphics-addn.def index 97c6111..ae41316 100644 --- a/graphics-addn.def +++ b/graphics-addn.def @@ -24,27 +24,6 @@ \let\Gin@log\@gobble } -\def\Gread@eps#1{% - \Gread@eps@or@extractbb{#1}\Gread@eps@aux -} -\def\Gread@eps@aux#1{% - \ifeof\@inputcheck - \@latex@error{File `#1' not found}\@ehc - \else - \Gread@true - \let\@tempb\Gread@false - \loop - \read\@inputcheck to\@tempa - \ifeof\@inputcheck - \Gread@false - \else - \expandafter\Gread@find@bb\@tempa:.\\% - \fi - \ifGread@ - \repeat - \immediate\closein\@inputcheck - \fi -} \def\Gread@extractbb@aux#1{% \ifeof\@inputcheck \immediate\openin\@inputcheck=% @@ -72,65 +51,3 @@ \immediate\closein\@inputcheck \fi } -\def\Gread@extractbb@aux#1{% - \ifeof\@inputcheck - \@latex@error{File `#1' not found}\@ehc - \else - \Gread@true - \let\@tempb\Gread@false - \loop - \read\@inputcheck to\@tempa - \ifeof\@inputcheck - \Gread@false - \else - \expandafter\Gread@find@bb\@tempa:.\\% - \fi - \ifGread@ - \repeat - \immediate\closein\@inputcheck - \fi -} -\let\GPT@AttrShort\@empty % Perhaps rename? -\def\Gread@eps@or@extractbb#1#2{% - \edef\GPT@AttrShort{% - \ifx\Gin@page\@empty - \else - :P\Gin@page - \fi - }% - \@ifundefined{#1 bbox\GPT@AttrShort} - {\Gread@eps@or@extractbb@aux{#1}{#2}} - {% - \expandafter\global\expandafter\let\expandafter\@gtempa - \csname #1 bbox\GPT@AttrShort\endcsname - }% - \expandafter\Gread@parse@bb\@gtempa\\% -} -\def\Gread@eps@or@extractbb@aux#1#2{% - \begingroup - \@tempcnta\z@ - \loop\ifnum\@tempcnta<\@xxxii - \catcode\@tempcnta14 % - \advance\@tempcnta\@ne - \repeat - \catcode`\^^?14 % - \let\do\@makeother - \dospecials - \catcode`\ 10 % - \catcode`\^^I10 % - \catcode\endlinechar5 % - \@makeother\:% - \@makeother\-% - \immediate\openin\@inputcheck"#1" allow spaces in a name of a file - #2{#1}% - \ifGin@bbox - \expandafter\global\expandafter\let\csname#1 bbox\GPT@AttrShort\endcsname - \@gtempa - \else - \@latex@error - {Cannot determine size of graphic in #1 (no BoundingBox)}% - \@ehc - \gdef\@gtempa{0 0 72 72 }% - \fi - \endgroup -}