From bdb82a6f104d448ea7d31a4f464b8f2af69577ca Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 22 Jun 2017 22:35:35 +0000 Subject: graphics-def (21jun17) git-svn-id: svn://tug.org/texlive/trunk@44668 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/graphics-def/README.md | 2 +- .../texmf-dist/tex/latex/graphics-def/dvipdfmx.def | 61 ++++++++++---------- Master/texmf-dist/tex/latex/graphics-def/dvips.def | 27 ++++----- .../texmf-dist/tex/latex/graphics-def/dvisvgm.def | 7 ++- .../texmf-dist/tex/latex/graphics-def/luatex.def | 23 ++++---- .../texmf-dist/tex/latex/graphics-def/pdftex.def | 23 ++++---- Master/texmf-dist/tex/latex/graphics-def/xetex.def | 65 +++++++++++----------- 7 files changed, 107 insertions(+), 101 deletions(-) diff --git a/Master/texmf-dist/doc/latex/graphics-def/README.md b/Master/texmf-dist/doc/latex/graphics-def/README.md index 5817a4457d7..915c03ddab9 100644 --- a/Master/texmf-dist/doc/latex/graphics-def/README.md +++ b/Master/texmf-dist/doc/latex/graphics-def/README.md @@ -1,7 +1,7 @@ LaTeX support for color and graphics ==================================== -Release 2017-06-17 +Release 2017-06-20 This bundle contains the 'engine-dependent' part of support for color and graphics in LaTeX2e (the code here will also function diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def index 81ecec4a549..ac79fd45281 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/graphics-def/dvipdfmx.def @@ -16,7 +16,8 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{dvipdfmx.def} - [2017/06/14 v5.0e Graphics/color driver for dvipdfmx] + [2017/06/20 v5.0f Graphics/color driver for dvipdfmx] +\def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -99,8 +100,8 @@ \ifeof\@inputcheck \immediate\openin\@inputcheck=% "|extractbb % - \ifx\Gin@page\@empty\else -p \Gin@page\space\fi - \ifx\Gin@pagebox\@empty\else -B \Gin@pagebox\space\fi + \ifx\Gin@page\@empty\else -p \Gin@page\GPT@space\fi + \ifx\Gin@pagebox\@empty\else -B \Gin@pagebox\GPT@space\fi -O \Gin@base\Gin@ext"% \fi \Gread@true @@ -137,15 +138,15 @@ \Gin@log{<#1>}% \bgroup \def\@tempa{!}% - \special{pdf:#2\space - \ifx\Gin@page\@empty\else page\space\Gin@page\space\fi - \ifx\Gin@pagebox\@empty\else pagebox\space\Gin@pagebox\space\fi - bbox\space\Gin@llx\space\Gin@lly\space\Gin@urx\space\Gin@ury\space - clip\space\ifGin@clip 1\else 0\fi\space - \ifx\Gin@scalex\@tempa\else width\space\the\Gin@req@width\space\fi - \ifx\Gin@scaley\@tempa\else height\space\the\Gin@req@height\space\fi - (#1)\space - \ifGin@interpolate<>\fi}% + \special{pdf:#2\GPT@space + \ifx\Gin@page\@empty\else page\GPT@space\Gin@page\GPT@space\fi + \ifx\Gin@pagebox\@empty\else pagebox\GPT@space\Gin@pagebox\GPT@space\fi + bbox\GPT@space\Gin@llx\GPT@space\Gin@lly\GPT@space\Gin@urx\GPT@space\Gin@ury\GPT@space + clip\GPT@space\ifGin@clip 1\else 0\fi\GPT@space + \ifx\Gin@scalex\@tempa\else width\GPT@space\the\Gin@req@width\GPT@space\fi + \ifx\Gin@scaley\@tempa\else height\GPT@space\the\Gin@req@height\GPT@space\fi + (#1)\GPT@space + \ifGin@interpolate<>\fi}% \egroup} \newif\if@trim@vport \def\Ginclude@eps#1{% @@ -170,15 +171,15 @@ \divide\dimen@\dimen@ii \@tempdima\Gin@req@height \divide\@tempdima\dimen@ii - \special{PSfile="#1"\space + \special{PSfile="#1"\GPT@space \if@trim@vport - llx=\Gin@vllx\space - lly=\Gin@vlly\space + llx=\Gin@vllx\GPT@space + lly=\Gin@vlly\GPT@space \fi - urx=\Gin@urx\space - ury=\Gin@ury\space - \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi - \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi + urx=\Gin@urx\GPT@space + ury=\Gin@ury\GPT@space + \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\GPT@space\fi + \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\GPT@space\fi \ifGin@clip clip\fi}% \egroup} % @@ -204,13 +205,13 @@ \divide\dimen@\dimen@ii \@tempdima\Gin@req@height \divide\@tempdima\dimen@ii - \special{PSfile="#1"\space - llx=\Gin@llx\space - lly=\Gin@lly\space - urx=\Gin@urx\space - ury=\Gin@ury\space - \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi - \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi + \special{PSfile="#1"\GPT@space + llx=\Gin@llx\GPT@space + lly=\Gin@lly\GPT@space + urx=\Gin@urx\GPT@space + ury=\Gin@ury\GPT@space + \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\GPT@space\fi + \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\GPT@space\fi \ifGin@clip clip\fi}% \egroup} % @@ -223,16 +224,16 @@ \ifx\kanjiskip\@undefined \def\Gscale@start{% \special{pdf:btrans}% - \special{x:scale \Gscale@x\space\Gscale@y}% + \special{x:scale \Gscale@x\GPT@space\Gscale@y}% } \else \edef\Gscale@start{% \special{pdf:btrans}% \special{x:scale \expandafter\noexpand\csname iftdir\endcsname - \noexpand\Gscale@y\noexpand\space\noexpand\Gscale@x + \noexpand\Gscale@y\noexpand\GPT@space\noexpand\Gscale@x \expandafter\noexpand\csname else\endcsname - \noexpand\Gscale@x\noexpand\space\noexpand\Gscale@y + \noexpand\Gscale@x\noexpand\GPT@space\noexpand\Gscale@y \expandafter\noexpand\csname fi\endcsname}} \fi % @@ -312,7 +313,7 @@ }% \ifdim\paperwidth>\z@ \ifdim\paperheight>\z@ -\special{pdf:pagesize width \the\paperwidth\space height \the\paperheight}% +\special{pdf:pagesize width \the\paperwidth\GPT@space height \the\paperheight}% \fi \fi \endgroup}% diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvips.def b/Master/texmf-dist/tex/latex/graphics-def/dvips.def index 3af9c8ea3b1..204ec642933 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/dvips.def +++ b/Master/texmf-dist/tex/latex/graphics-def/dvips.def @@ -17,7 +17,8 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{dvips.def} - [2017/06/14 v3.1c Graphics/color driver for dvips] + [2017/06/20 v3.1d Graphics/color driver for dvips] +\def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -93,13 +94,13 @@ \divide\dimen@\dimen@ii \@tempdima\Gin@req@height \divide\@tempdima\dimen@ii - \special{PSfile="#1"\space - llx=\Gin@llx\space - lly=\Gin@lly\space - urx=\Gin@urx\space - ury=\Gin@ury\space - \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi - \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi + \special{PSfile="#1"\GPT@space + llx=\Gin@llx\GPT@space + lly=\Gin@lly\GPT@space + urx=\Gin@urx\GPT@space + ury=\Gin@ury\GPT@space + \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\GPT@space\fi + \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\GPT@space\fi \ifGin@clip clip\fi}% \egroup} \def\Ginclude@bmp#1{% @@ -122,20 +123,20 @@ \dimen@1bp% \divide\Gin@req@width\dimen@ \divide\Gin@req@height\dimen@ - \special{#1=#2\space - \@width=\number\Gin@req@width \space + \special{#1=#2\GPT@space + \@width=\number\Gin@req@width \GPT@space \@height=\number\Gin@req@height}} \def\Ginclude@pntg{\oztex@include{pntg}} \def\Ginclude@pict{\oztex@include{pict}} \def\Grot@start{% \special{ps: gsave currentpoint - currentpoint translate \Grot@angle\space neg + currentpoint translate \Grot@angle\GPT@space neg rotate neg exch neg exch translate}} \def\Grot@end{\special{ps: currentpoint grestore moveto}} \def\Gscale@start{\special{ps: currentpoint currentpoint translate - \Gscale@x\space \Gscale@y\space scale neg exch neg exch translate}} + \Gscale@x\GPT@space \Gscale@y\GPT@space scale neg exch neg exch translate}} \def\Gscale@end{\special{ps: currentpoint currentpoint translate - 1 \Gscale@x\space div 1 \Gscale@y\space div scale + 1 \Gscale@x\GPT@space div 1 \Gscale@y\GPT@space div scale neg exch neg exch translate}} \def\Gin@PS@raw#1{\special{ps: #1}} \def\Gin@PS@restored#1{\special{" #1}} diff --git a/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def b/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def index 2df54162900..e94ec8dc09d 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def +++ b/Master/texmf-dist/tex/latex/graphics-def/dvisvgm.def @@ -15,7 +15,8 @@ %% %% https://github.com/latex3/graphics-def/issues % -\ProvidesFile{dvisvgm.def}[2017/06/01 v1.0a dvisvgm graphics driver for latex] +\ProvidesFile{dvisvgm.def}[2017/06/20 v1.0b dvisvgm graphics driver for latex] +\def\GPT@space{ } % The following is copied from dvips.def: \def\c@lor@arg#1{% \dimen@#1\p@ @@ -91,12 +92,12 @@ \special{dvisvgm: raw + viewBox="\Gin@llx\GPT@space\Gin@svg@view@base\GPT@space\Gin@svg@view@width\GPT@space\Gin@svg@view@height"> }% -% \special{dvisvgm: img \strip@pt\Gin@req@width\space \strip@pt\Gin@req@height\space #1} +% \special{dvisvgm: img \strip@pt\Gin@req@width\GPT@space \strip@pt\Gin@req@height\GPT@space #1} }% } diff --git a/Master/texmf-dist/tex/latex/graphics-def/luatex.def b/Master/texmf-dist/tex/latex/graphics-def/luatex.def index 7ef65018f67..fd6e382f33d 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/luatex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/luatex.def @@ -18,7 +18,8 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{luatex.def} - [2017/06/17 v1.0d Graphics/color driver for luatex] + [2017/06/20 v1.0e Graphics/color driver for luatex] +\def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -107,10 +108,10 @@ \ifGPT@pagecolor \pdfextension literal page{% q % gsave - \current@page@color\space + \current@page@color\GPT@space n % newpath - 0 0 \strip@pt\pagewidth\space - \strip@pt\pageheight\space re % rectangle + 0 0 \strip@pt\pagewidth\GPT@space + \strip@pt\pageheight\GPT@space re % rectangle % there is no need to convert to bp f % fill Q% grestore @@ -190,7 +191,7 @@ \ifx\Gin@page\@empty\else page=\Gin@page , \fi \ifx\Gin@pagebox\@empty\else pagebox=\Gin@pagebox , \fi \ifGin@interpolate interpolate=true, \fi - \the\wd\@tempboxa\space x \the\ht\@tempboxa + \the\wd\@tempboxa\GPT@space x \the\ht\@tempboxa >% }% }{% @@ -227,10 +228,10 @@ }% \PackageInfo{luatex.def}{% #1 \ifx\Gin@page\@empty\else, page\Gin@page\fi - \space used\ifx\on@line\@undefined\else\on@line\fi.}% + \GPT@space used\ifx\on@line\@undefined\else\on@line\fi.}% \PackageInfo{luatex.def}{% Requested size: % - \the\Gin@req@width\space x \the\Gin@req@height + \the\Gin@req@width\GPT@space x \the\Gin@req@height }% \Ginclude@@pdftex{\@nameuse{#1 image\Gin@attr@hash}}% } @@ -395,7 +396,7 @@ \GPT@NormalizeNumber\Grot@sin \GPT@NormalizeNumber\Grot@cos \edef\GPT@temp{% - \Grot@cos\space\Grot@sin\space + \Grot@cos\GPT@space\Grot@sin\GPT@space \if-\Grot@sin \else \ifx\Grot@sin\GPT@Zero @@ -404,7 +405,7 @@ -\Grot@sin \fi \fi - \space\Grot@cos + \GPT@space\Grot@cos }% \ifx\GPT@temp\GPT@MatrixIdentity \def\Grot@end{}% @@ -421,7 +422,7 @@ \GPT@NormalizeNumber\Gscale@x \GPT@NormalizeNumber\Gscale@y \edef\GPT@temp{% - \Gscale@x\space0 0 \Gscale@y + \Gscale@x\GPT@space0 0 \Gscale@y }% \ifx\GPT@temp\GPT@MatrixIdentity \def\Gscale@end{}% @@ -508,7 +509,7 @@ (or `supp-pdf.tex' and/or `supp-mis.tex') to convert MetaPost output files to PDF. These files are part of ConTeXt and can also be found here:% - \space\space CTAN:macros/pdftex/graphics/. + \GPT@space\GPT@space CTAN:macros/pdftex/graphics/. You'll get more errors if you'll continue now.% }% }% diff --git a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def index d8b78caad95..4bd1793ba10 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/pdftex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/pdftex.def @@ -18,7 +18,8 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{pdftex.def} - [2017/06/17 v1.0e Graphics/color driver for pdftex] + [2017/06/20 v1.0f Graphics/color driver for pdftex] +\def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -119,10 +120,10 @@ E \else \ifGPT@pagecolor \pdfliteral page{% q % gsave - \current@page@color\space + \current@page@color\GPT@space n % newpath - 0 0 \strip@pt\pdfpagewidth\space - \strip@pt\pdfpageheight\space re % rectangle + 0 0 \strip@pt\pdfpagewidth\GPT@space + \strip@pt\pdfpageheight\GPT@space re % rectangle % there is no need to convert to bp f % fill Q% grestore @@ -209,7 +210,7 @@ E \else \ifx\Gin@page\@empty\else page=\Gin@page , \fi \ifx\Gin@pagebox\@empty\else pagebox=\Gin@pagebox , \fi \ifGin@interpolate interpolate=true, \fi - \the\wd\@tempboxa\space x \the\ht\@tempboxa + \the\wd\@tempboxa\GPT@space x \the\ht\@tempboxa >% }% }{% @@ -247,10 +248,10 @@ E \else }% \PackageInfo{pdftex.def}{% #1 \ifx\Gin@page\@empty\else, page\Gin@page\fi - \space used\ifx\on@line\@undefined\else\on@line\fi.}% + \GPT@space used\ifx\on@line\@undefined\else\on@line\fi.}% \PackageInfo{pdftex.def}{% Requested size: % - \the\Gin@req@width\space x \the\Gin@req@height + \the\Gin@req@width\GPT@space x \the\Gin@req@height }% \Ginclude@@pdftex{\@nameuse{#1 image\Gin@attr@hash}}% } @@ -415,7 +416,7 @@ E \else \GPT@NormalizeNumber\Grot@sin \GPT@NormalizeNumber\Grot@cos \edef\GPT@temp{% - \Grot@cos\space\Grot@sin\space + \Grot@cos\GPT@space\Grot@sin\GPT@space \if-\Grot@sin \else \ifx\Grot@sin\GPT@Zero @@ -424,7 +425,7 @@ E \else -\Grot@sin \fi \fi - \space\Grot@cos + \GPT@space\Grot@cos }% \ifx\GPT@temp\GPT@MatrixIdentity \def\Grot@end{}% @@ -441,7 +442,7 @@ E \else \GPT@NormalizeNumber\Gscale@x \GPT@NormalizeNumber\Gscale@y \edef\GPT@temp{% - \Gscale@x\space0 0 \Gscale@y + \Gscale@x\GPT@space0 0 \Gscale@y }% \ifx\GPT@temp\GPT@MatrixIdentity \def\Gscale@end{}% @@ -528,7 +529,7 @@ E \else (or `supp-pdf.tex' and/or `supp-mis.tex') to convert MetaPost output files to PDF. These files are part of ConTeXt and can also be found here:% - \space\space CTAN:macros/pdftex/graphics/. + \GPT@space\GPT@space CTAN:macros/pdftex/graphics/. You'll get more errors if you'll continue now.% }% }% diff --git a/Master/texmf-dist/tex/latex/graphics-def/xetex.def b/Master/texmf-dist/tex/latex/graphics-def/xetex.def index aa5f7a48f56..6440f6d1944 100644 --- a/Master/texmf-dist/tex/latex/graphics-def/xetex.def +++ b/Master/texmf-dist/tex/latex/graphics-def/xetex.def @@ -16,7 +16,8 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{xetex.def} - [2017/06/16 v5.0e Graphics/color driver for xetex] + [2017/06/20 v5.0g Graphics/color driver for xetex] +\def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -118,26 +119,26 @@ \fi }% \edef\Gin@@name{\Gin@base\Gin@ext}% - \@ifundefined{\Gin@@name\space height\Gin@attr@hash}% + \@ifundefined{\Gin@@name\GPT@space height\Gin@attr@hash}% {% \setbox\@tempboxa=\hbox{% - #1"\Gin@@name"\space + #1"\Gin@@name"\GPT@space \ifx\Gin@page\@empty\else page \Gin@page\fi \ifx\Gin@pagebox\@empty\else\expandafter\Gread@@xetex@box\Gin@pagebox\fi }% \def\Gin@llx{0}\let\Gin@lly\Gin@llx \Gin@defaultbp\Gin@urx{\wd\@tempboxa}% \Gin@defaultbp\Gin@ury{\ht\@tempboxa}% - \expandafter\xdef\csname \Gin@@name\space height\Gin@attr@hash\endcsname + \expandafter\xdef\csname \Gin@@name\GPT@space height\Gin@attr@hash\endcsname {\the\ht\@tempboxa}% - \expandafter\xdef\csname \Gin@@name\space width\Gin@attr@hash\endcsname + \expandafter\xdef\csname \Gin@@name\GPT@space width\Gin@attr@hash\endcsname {\the\wd\@tempboxa}% }{% \def\Gin@llx{0}\let\Gin@lly\Gin@llx \Gin@defaultbp\Gin@urx - {\csname \Gin@@name\space width\Gin@attr@hash\endcsname}% + {\csname \Gin@@name\GPT@space width\Gin@attr@hash\endcsname}% \Gin@defaultbp\Gin@ury - {\csname \Gin@@name\space height\Gin@attr@hash\endcsname}% + {\csname \Gin@@name\GPT@space height\Gin@attr@hash\endcsname}% }% } \def\Gread@@xetex@box#1box{#1} @@ -221,7 +222,7 @@ \special{x:gsave}% \special{% pdf:literal - 0 -\DEPTH\space \WIDTH\space \TOTALHEIGHT\space re W n + 0 -\DEPTH\GPT@space \WIDTH\GPT@space \TOTALHEIGHT\GPT@space re W n }% \rlap{\box#1}% \special{x:grestore}% @@ -232,13 +233,13 @@ \Gin@log{<#1>}% \bgroup \def\@tempa{!}% - \special{pdf:image\space - bbox\space\Gin@llx\space\Gin@lly\space\Gin@urx\space\Gin@ury\space - clip\space\ifGin@clip 1\else 0\fi\space - \ifx\Gin@scalex\@tempa\else width\space\the\Gin@req@width\space\fi - \ifx\Gin@scaley\@tempa\else height\space\the\Gin@req@height\space\fi - (#1)\space - \ifGin@interpolate<>\fi}% + \special{pdf:image\GPT@space + bbox\GPT@space\Gin@llx\GPT@space\Gin@lly\GPT@space\Gin@urx\GPT@space\Gin@ury\GPT@space + clip\GPT@space\ifGin@clip 1\else 0\fi\GPT@space + \ifx\Gin@scalex\@tempa\else width\GPT@space\the\Gin@req@width\GPT@space\fi + \ifx\Gin@scaley\@tempa\else height\GPT@space\the\Gin@req@height\GPT@space\fi + (#1)\GPT@space + \ifGin@interpolate<>\fi}% \egroup} \newif\if@trim@vport \def\Ginclude@eps#1{% @@ -263,15 +264,15 @@ \divide\dimen@\dimen@ii \@tempdima\Gin@req@height \divide\@tempdima\dimen@ii - \special{PSfile="#1"\space + \special{PSfile="#1"\GPT@space \if@trim@vport - llx=\Gin@vllx\space - lly=\Gin@vlly\space + llx=\Gin@vllx\GPT@space + lly=\Gin@vlly\GPT@space \fi - urx=\Gin@urx\space - ury=\Gin@ury\space - \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi - \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi + urx=\Gin@urx\GPT@space + ury=\Gin@ury\GPT@space + \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\GPT@space\fi + \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\GPT@space\fi \ifGin@clip clip\fi}% \egroup} % @@ -297,13 +298,13 @@ \divide\dimen@\dimen@ii \@tempdima\Gin@req@height \divide\@tempdima\dimen@ii - \special{PSfile="#1"\space - llx=\Gin@llx\space - lly=\Gin@lly\space - urx=\Gin@urx\space - ury=\Gin@ury\space - \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi - \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\space\fi + \special{PSfile="#1"\GPT@space + llx=\Gin@llx\GPT@space + lly=\Gin@lly\GPT@space + urx=\Gin@urx\GPT@space + ury=\Gin@ury\GPT@space + \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\GPT@space\fi + \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\GPT@space\fi \ifGin@clip clip\fi}% \egroup} % @@ -316,16 +317,16 @@ \ifx\kanjiskip\@undefined \def\Gscale@start{% \special{pdf:btrans}% - \special{x:scale \Gscale@x\space\Gscale@y}% + \special{x:scale \Gscale@x\GPT@space\Gscale@y}% } \else \edef\Gscale@start{% \special{pdf:btrans}% \special{x:scale \expandafter\noexpand\csname iftdir\endcsname - \noexpand\Gscale@y\noexpand\space\noexpand\Gscale@x + \noexpand\Gscale@y\noexpand\GPT@space\noexpand\Gscale@x \expandafter\noexpand\csname else\endcsname - \noexpand\Gscale@x\noexpand\space\noexpand\Gscale@y + \noexpand\Gscale@x\noexpand\GPT@space\noexpand\Gscale@y \expandafter\noexpand\csname fi\endcsname}} \fi % -- cgit v1.2.3