pdftex-def (22apr11)

git-svn-id: svn://tug.org/texlive/trunk@22167 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 179 insertions, 226 deletions

diff --git a/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def b/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def
index be19240f954..5d30313d985 100644
--- a/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def
+++ b/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def
@@ -1,4 +1,4 @@
-\ProvidesFile{pdftex.def}[2011/01/28 v0.05d Graphics/color for pdfTeX]
+\ProvidesFile{pdftex.def}[2011/01/28 v0.06a Graphics/color for pdfTeX]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% LaTeX Colour and Graphics support for PDFTeX
@@ -241,11 +241,16 @@
 %  * Patching trig.sty is improved by doing it earlier in some
 %    cases, e.g. if one of class `memoir', package `scrlfile' or
 %    package `filehook' is loaded.
+% 2011/04/21 v0.06a (HO)
+%  * The use info on the screen goes with an information
+%    entry in the .log file that also tells the requested
+%    width (feature request of Axel Berger).
+%  * Use of packages `infwarerr' and `ltxcmds'.
 %
 % Prefix of internal commands for this file `pdftex.def':
 %   \GPT@ (Graphics bundle PdfTex driver)
 
-\expandafter\edef\csname GPT@endinput\endcsname{%
+\expandafter\edef\csname GPT@AtEnd\endcsname{%
   \expandafter\noexpand\csname GPT@restore@\endcsname
   \catcode35 \the\catcode35\relax % #
   \catcode64 \the\catcode64\relax % @
@@ -382,72 +387,29 @@
   \fi
 \fi
 
-% miniltx.tex does not define \PackageWarning, \PackageWarningNoLine, ...
-\@ifundefined{PackageWarning}{%
-  \def\PackageWarning#1#2{%
-    \begingroup
-      \newlinechar=10 %
-      \def\MessageBreak{%
-        ^^J(#1)\@spaces\@spaces\@spaces\@spaces
-      }%
-      \immediate\write16{^^JPackage #1 Warning: #2\on@line.^^J}%
-    \endgroup
-  }%
-}{}
-\@ifundefined{PackageWarningNoLine}{%
-  \def\PackageWarningNoLine#1#2{%
-    \PackageWarning{#1}{#2\@gobble}%
-  }%
-}{}
-\@ifundefined{on@line}{%
-  \def\on@line{ on input line \the\inputlineno}%
-}{}
-\@ifundefined{@spaces}{%
-  \def\@spaces{\space\space\space\space}%
-}{}
-\@ifundefined{@ehc}{%
-  \def\@ehc{%
-    Try typing \space <return> %
-    \space to proceed.\MessageBreak
-    If that doesn't work, type \space X <return> \space to quit.%
-  }%
-}{}
-% LaTeX defines \MessageBreak=\relax outside messages
-\ifx\MessageBreak\@undefined
-  \def\GPT@error#1#2{%
-    \begingroup
-      \newlinechar=10\relax
-      \def\MessageBreak{^^J}%
-      \edef\x{%
-        \PackageError{pdftex.def}{#1}{#2}%
-      }%
-      \x
-    \endgroup
-  }%
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+  \input infwarerr.sty\relax
 \else
-  \def\GPT@error{\PackageError{pdftex.def}}%
+  \RequirePackage{infwarerr}[2007/09/09]%
+  \RequirePackage{ltxcmds}[2010/12/07]%
 \fi
-\def\GPT@warn{\PackageWarning{pdftex.def}}%
+
+\def\GPT@error{\@PackageError{pdftex.def}}%
+\def\GPT@warn{\@PackageWarning{pdftex.def}}%
 \ifx\Gin@log\@undefined
   \def\Gin@log{\message}%
 \fi
-\def\GPT@ifundefined#1{%
-  \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname#1\endcsname\relax
-    \expandafter\@firstoftwo
-  \else
-    \expandafter\@secondoftwo
-  \fi
-}
+\def\GPT@info{\@PackageInfoNoLine{pdftex.def}}%
 
 % Are we running under PDFTeX?
-\GPT@ifundefined{pdftexversion}{%
+\ltx@IfUndefined{pdftexversion}{%
   \GPT@error{%
     Option `pdftex' requires pdfTeX,\MessageBreak
     but pdfTeX features are missing.\MessageBreak
     Loading of this driver file is aborted%
   }\@ehc
-  \expandafter\GPT@endinput
+  \expandafter\GPT@AtEnd
 }{}
 
 % Ensure PDF mode
@@ -461,8 +423,8 @@
   \pdfoutput=1 %
 \fi
 
-\GPT@ifundefined{stockwidth}{%
-  \GPT@ifundefined{paperwidth}{%
+\ltx@IfUndefined{stockwidth}{%
+  \ltx@IfUndefined{paperwidth}{%
   }{%
     \ifdim\paperwidth>0pt\relax
       \ifdim\paperheight>0pt\relax
@@ -480,10 +442,6 @@
   \fi
 }
 
-\def\GPT@ifpackageloaded#1{%
-  \GPT@ifundefined{ver@#1.sty}\@secondoftwo\@firstoftwo
-}
-
 % Colour Support. The following models may be used.
 %   * cmyk   supported directly.
 %   * rgb    supported directly.
@@ -532,14 +490,14 @@
 
 \def\color@named#1#2{\c@lor@@named#2,,\@@#1}
 \def\c@lor@@named#1,#2,#3\@@#4{%
-  \@ifundefined{col@#1}{%
+  \ltx@IfUndefined{col@#1}{%
     \PackageError{color}{Undefined color `#1'}\@ehd
   }{%
     \edef#4{\csname col@#1\endcsname}%
   }%
 }
 
-\GPT@ifundefined{pdfcolorstack}{%
+\ltx@IfUndefined{pdfcolorstack}{%
   \def\set@color{%
     \pdfliteral{\current@color}%
     \aftergroup\reset@color
@@ -549,7 +507,7 @@
   }%
 }{%
   \chardef\main@pdfcolorstack=0 %
-  \@ifundefined{@pdfcolorstack}{%
+  \ltx@ifundefined{@pdfcolorstack}{%
     \def\@pdfcolorstack{\main@pdfcolorstack}%
   }{}%
   \def\set@color{%
@@ -570,12 +528,12 @@
 % http://tug.org/pipermail/pdftex/2005-August/005916.html
 %
 % v0.03r: \nopagecolor/\no@page@color added.
-\newif\ifGPT@pagecolor
-\@ifundefined{nopagecolor}{%
+\ltx@newglobalif\ifGPT@pagecolor
+\ltx@ifundefined{nopagecolor}{%
   \def\nopagecolor{\no@page@color}%
 }{}
 \def\no@page@color{%
-  \global\GPT@pagecolorfalse
+  \GPT@pagecolorfalse
 }
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname currentgrouplevel\endcsname\relax
@@ -586,13 +544,13 @@
   \catcode`E=9  % ignore
 \fi
 \def\set@page@color{%
-  \global\GPT@pagecolortrue
+  \GPT@pagecolortrue
   \global\let\current@page@color\current@color
-  \@ifundefined{GPT@outputbox}{%
+  \ltx@ifundefined{GPT@outputbox}{%
     % \newbox is outer in plain
     \csname newbox\endcsname\GPT@outputbox
   }{}%
-  \@ifundefined{GPTorg@shipout}{%
+  \ltx@ifundefined{GPTorg@shipout}{%
     \global\let\GPTorg@shipout\shipout
     \gdef\shipout{%
 X     % ensure \GPT@outputbox is really void
@@ -626,10 +584,10 @@ E     \else
       \ifGPT@pagecolor
         \pdfliteral\ifnum\driver@release>8 page\else direct\fi{%
           q % gsave
-          \current@page@color\space
+          \current@page@color\ltx@space
           n % newpath
-          0 0 \strip@pt\pdfpagewidth\space
-          \strip@pt\pdfpageheight\space re % rectangle
+          0 0 \strip@pt\pdfpagewidth\ltx@space
+          \strip@pt\pdfpageheight\ltx@space re % rectangle
           % there is no need to convert to bp
           f % fill
           Q% grestore
@@ -651,23 +609,21 @@ E     \else
     \expandafter\ifx\csname color\endcsname\relax
       % Without color we don't need any fixes.
     \else
-      \@ifundefined{@ldc@l@r}{%
+      \ltx@ifundefined{@ldc@l@r}{%
         \let\@ldc@l@r\color
         \def\color{%
-          \@ifundefined{if@inlabel}{}{%
+          \ltx@IfUndefined{if@inlabel}{}{%
             \csname if@inlabel\expandafter\endcsname
             \expandafter\leavevmode\csname fi\endcsname
           }%
           \@ldc@l@r
         }%
       }{}%
-      \@ifundefined{@lduseb@x}{%
-        \begingroup\expandafter\expandafter\expandafter\endgroup
-        \expandafter\ifx\csname usebox\endcsname\relax
-        \else
+      \ltx@ifundefined{@lduseb@x}{%
+        \ltx@IfUndefined{usebox}{}{%
           \let\@lduseb@x\usebox
           \def\usebox#1{\@lduseb@x{#1}\reset@color}%
-        \fi
+        }%
       }{}%
     \fi
   }%
@@ -691,7 +647,7 @@ E     \else
 }
 \def\Gread@@png#1{%
   \setbox\@tempboxa\hbox{%
-    \pdfimage\noexpand\noexpand\noexpand\@empty#1\relax
+    \pdfimage\noexpand\noexpand\noexpand\ltx@empty#1\relax
   }%
   \def\Gin@llx{0}\let\Gin@lly\Gin@llx
   \Gin@defaultbp\Gin@urx{\wd\@tempboxa}%
@@ -710,19 +666,19 @@ E     \else
 % * option resetcolor
 % * option xmpfile
 %
-% \GPT@page: page number of pdf image or \@empty otherwise.
-\let\GPT@page\@empty
-% \GPT@print: file name for alternate image or \@empty otherwise.
-\let\GPT@print\@empty
-\let\GPT@xmpfile\@empty
-\let\GPT@pagebox\@empty
-\let\GPT@pagebox@\@empty
-\let\GPT@interpolate\@empty
-\let\GPT@decodearray\@empty
-\let\GPT@mask\@empty
-\let\GPT@intent\@empty
-\let\GPT@ocobjnum\@empty
-\newif\ifGPT@ResetColor
+% \GPT@page: page number of pdf image or \ltx@empty otherwise.
+\let\GPT@page\ltx@empty
+% \GPT@print: file name for alternate image or \ltx@empty otherwise.
+\let\GPT@print\ltx@empty
+\let\GPT@xmpfile\ltx@empty
+\let\GPT@pagebox\ltx@empty
+\let\GPT@pagebox@\ltx@empty
+\let\GPT@interpolate\ltx@empty
+\let\GPT@decodearray\ltx@empty
+\let\GPT@mask\ltx@empty
+\let\GPT@intent\ltx@empty
+\let\GPT@ocobjnum\ltx@empty
+\ltx@newif\ifGPT@ResetColor
 \let\GPT@ResetColorEnd\relax
 \def\GPT@ResetColorBegin{%
   \ifGPT@ResetColor
@@ -741,26 +697,20 @@ E     \else
 \else
   \def\GPT@match#1#2{%
     \ifnum\pdfmatch{#2}{#1}=1 %
-      \expandafter\@firstoftwo
+      \expandafter\ltx@firstoftwo
     \else
-      \expandafter\@secondoftwo
+      \expandafter\ltx@secondoftwo
     \fi
   }%
   \def\GPT@pat@real/{%
     (%
-      0(\GPT@backslash.[0-9]*)?|%
-      \GPT@backslash.[0-9]+|%
-      1(\GPT@backslash.0*)?%
+      0(\ltx@backslashchar.[0-9]*)?|%
+      \ltx@backslashchar.[0-9]+|%
+      1(\ltx@backslashchar.0*)?%
     )%
   }%
 \fi
 \begingroup
-  \escapechar=-1 %
-  \edef\x{\endgroup
-    \edef\noexpand\GPT@backslash{\string\\}%
-  }%
-\x
-\begingroup
   \toks@{%
     \define@key{Gin}{resetcolor}[true]{%
       \csname GPT@ResetColor%
@@ -775,7 +725,7 @@ E     \else
     \ifnum\driver@release>5 %
       \define@key{Gin}{page}{%
         \def\GPT@page{#1}%
-        \ifx\GPT@page\@empty
+        \ifx\GPT@page\ltx@empty
         \else
           \edef\GPT@page{\number\GPT@page}%
         \fi
@@ -801,7 +751,7 @@ E     \else
         \expandafter\let\expandafter\GPT@pagebox
             \csname GPT@pagebox@#1\endcsname
         \ifx\GPT@pagebox\relax
-          \let\GPT@pagebox\@empty
+          \let\GPT@pagebox\ltx@empty
           \GPT@warn{%
             Unknown value `#1' for `pagebox'.\MessageBreak
             Supported values:\MessageBreak
@@ -810,7 +760,7 @@ E     \else
         \fi
       }%
       \def\GPT@pagebox@mediabox{mediabox}%
-      \let\GPT@pagebox@cropbox\@empty
+      \let\GPT@pagebox@cropbox\ltx@empty
       \def\GPT@pagebox@bleedbox{bleedbox}%
       \def\GPT@pagebox@trimbox{trimbox}%
       \def\GPT@pagebox@artbox{artbox}%
@@ -819,19 +769,19 @@ E     \else
         \expandafter\let\expandafter\GPT@interpolate
             \csname GPT@interpolate@#1\endcsname
         \ifx\GPT@interpolate\relax
-          \let\GPT@interpolate\@empty
+          \let\GPT@interpolate\ltx@empty
           \GPT@warn{%
             Unknown value `#1' for `interpolate'.\MessageBreak
             Supported values: true, false%
           }%
         \fi
       }%
-      \let\GPT@interpolate@false\@empty
+      \let\GPT@interpolate@false\ltx@empty
       \def\GPT@interpolate@true{1}% non-empty, value does not matter
       % option decodearray
       \define@key{Gin}{decodearray}{%
         \def\GPT@decodearray{#1}%
-        \ifx\GPT@decodearray\@empty
+        \ifx\GPT@decodearray\ltx@empty
         \else
           \GPT@match\GPT@decodearray{%
             ((^| )\GPT@pat@real/ \GPT@pat@real/)+$%
@@ -840,14 +790,14 @@ E     \else
               Invalid value (\GPT@decodearray)\MessageBreak
               for `decodearray' is ignored%
             }%
-            \let\GPT@decodearray\@empty
+            \let\GPT@decodearray\ltx@empty
           }%
         \fi
       }%
       % option maskarray
       \define@key{Gin}{maskarray}{%
         \def\GPT@mask{#1}%
-        \ifx\GPT@mask\@empty
+        \ifx\GPT@mask\ltx@empty
         \else
           \GPT@match\GPT@mask{%
             ((^| )[0-9]+ [0-9]+)+$%
@@ -856,9 +806,9 @@ E     \else
               Invalid value (\GPT@mask)\MessageBreak
               for `maskarray' is ignored%
             }%
-            \let\GPT@mask\@empty
+            \let\GPT@mask\ltx@empty
           }%
-          \ifx\GPT@mask\@empty
+          \ifx\GPT@mask\ltx@empty
           \else
             \edef\GPT@mask{[\GPT@mask]}%
           \fi
@@ -867,7 +817,7 @@ E     \else
       % option intent
       \define@key{Gin}{intent}{%
         \def\GPT@intent{#1}%
-        \ifx\GPT@intent\@empty
+        \ifx\GPT@intent\ltx@empty
         \else
           \GPT@match\GPT@intent{%
             ^((Absolute|Relative)Colorimetric|Saturation|Perceptual)$%
@@ -884,7 +834,7 @@ E     \else
                 Ignoring intent `\GPT@intent'\MessageBreak
                 with unusual characters%
               }%
-              \let\GPT@intent\@empty
+              \let\GPT@intent\ltx@empty
             }%
           }%
         \fi
@@ -892,7 +842,7 @@ E     \else
       % option ocobjnum
       \define@key{Gin}{ocobjnum}{%
         \edef\GPT@ocobjnum{#1}%
-        \ifx\GPT@ocobjnum\@empty
+        \ifx\GPT@ocobjnum\ltx@empty
         \else
           \edef\GPT@ocobjnum{\number\GPT@ocobjnum}%
           \GPT@match\GPT@ocobjnum{^[1-9]+[0-9]*$}{%
@@ -901,9 +851,9 @@ E     \else
               Invalid value (\GPT@ocobjnum)\MessageBreak
               for `ocobjnum' is ignored%
             }%
-            \let\GPT@ocobjnum\@empty
+            \let\GPT@ocobjnum\ltx@empty
           }%
-          \ifx\GPT@ocobjnum\@empty
+          \ifx\GPT@ocobjnum\ltx@empty
           \else
             \edef\GPT@ocobjnum{\number\GPT@ocobjnum}%
           \fi
@@ -912,7 +862,7 @@ E     \else
       % option ocobjref
       \define@key{Gin}{ocobjref}{%
         \edef\GPT@ocobjnum{#1}%
-        \ifx\GPT@ocobjnum\@empty
+        \ifx\GPT@ocobjnum\ltx@empty
         \else
           \edef\GPT@ocobjnum{%
             \expandafter\strip@prefix\meaning\GPT@ocobjnum
@@ -923,9 +873,9 @@ E     \else
               Invalid value (\GPT@ocobjnum)\MessageBreak
               for `ocobjref' is ignored%
             }%
-            \let\GPT@ocobjnum\@empty
+            \let\GPT@ocobjnum\ltx@empty
           }%
-          \ifx\GPT@ocobjnum\@empty
+          \ifx\GPT@ocobjnum\ltx@empty
           \else
             \begingroup
               \def\GPT@temp##1 ##2\@nil{\endgroup
@@ -953,7 +903,7 @@ E     \else
       \GPT@temp{ocobjref}%
     \fi
     \define@key{Gin}{quiet}[]{%
-      \let\Gin@log\@gobble
+      \let\Gin@log\ltx@gobble
     }%
     \define@key{Gin}{resolution}{%
       \pdfimageresolution#1\relax
@@ -962,10 +912,10 @@ E     \else
       \def\GPT@xmpfile{#1}%
     }%
   }%
-  \@ifundefined{define@key}{%
+  \ltx@IfUndefined{define@key}{%
     \edef\x{\endgroup
       \noexpand\AtBeginDocument{%
-        \noexpand\@ifundefined{define@key}{}{\the\toks@}%
+        \noexpand\ltx@IfUndefined{define@key}{}{\the\toks@}%
       }%
     }\x
   }{%
@@ -1015,18 +965,18 @@ E     \else
     \def\GPT@IfFileExists#1{%
       \expandafter\expandafter\expandafter\ifx
       \expandafter\expandafter\expandafter\relax\pdf@filesize{#1}\relax
-        \expandafter\@secondoftwo
+        \expandafter\ltx@secondoftwo
       \else
-        \expandafter\@firstoftwo
+        \expandafter\ltx@firstoftwo
       \fi
     }%
   \fi
 \else
   \def\GPT@IfFileExists#1{%
     \expandafter\ifx\expandafter\relax\pdffilesize{#1}\relax
-      \expandafter\@secondoftwo
+      \expandafter\ltx@secondoftwo
     \else
-      \expandafter\@firstoftwo
+      \expandafter\ltx@firstoftwo
     \fi
   }%
 \fi
@@ -1059,11 +1009,11 @@ E     \else
 % allows us to get the size by deriving it from the initial storage;
 % this works for all graphics types.
 %
-\@ifundefined{Gread@gobject}{%
+\ltx@ifundefined{Gread@gobject}{%
   \csname newcount\endcsname\Gread@gobject
 }{}
 \def\GPT@ReusedName#1{%
-  \ifx\GPT@print\@empty
+  \ifx\GPT@print\ltx@empty
     #1%
   \else
     \GPT@print
@@ -1075,10 +1025,10 @@ E     \else
 }
 \def\Gread@@pdftex#1{%
   % Ensure that option `print' works only on bitmap images.
-  \let\GPT@Attr\@empty
-  \let\GPT@AttrShort\@empty
+  \let\GPT@Attr\ltx@empty
+  \let\GPT@AttrShort\ltx@empty
   \ifnum\driver@release>7 %
-    \ifx\GPT@ocobjnum\@empty
+    \ifx\GPT@ocobjnum\ltx@empty
     \else
       \edef\GPT@AttrShort{\GPT@AttrShort
         :OC\GPT@ocobjnum
@@ -1089,12 +1039,12 @@ E     \else
     \fi
   \fi
   \ifGPT@IsBitmap
-    \let\GPT@page\@empty
-    \let\GPT@pagebox\@empty
+    \let\GPT@page\ltx@empty
+    \let\GPT@pagebox\ltx@empty
     \ifnum\driver@release>7 %
-      \ifx\GPT@xmpfile\@empty
+      \ifx\GPT@xmpfile\ltx@empty
       \else
-        \@ifundefined{GPT@XMP@\GPT@xmpfile}{%
+        \ltx@IfUndefined{GPT@XMP@\GPT@xmpfile}{%
           \GPT@IfFileExists{\GPT@xmpfile}{%
             \begingroup
               \pdfcompresslevel=0 %
@@ -1110,7 +1060,7 @@ E     \else
             \GPT@warn{Missing XMP file (\GPT@xmpfile)}%
           }%
         }{}%
-        \@ifundefined{GPT@XMP@\GPT@xmpfile}{}{%
+        \ltx@IfUndefined{GPT@XMP@\GPT@xmpfile}{}{%
           \edef\GPT@Attr{\GPT@Attr
             /Metadata \@nameuse{GPT@XMP@\GPT@xmpfile}\GPT@objref
           }%
@@ -1119,7 +1069,7 @@ E     \else
           }%
         }%
       \fi
-      \ifx\GPT@interpolate\@empty
+      \ifx\GPT@interpolate\ltx@empty
       \else
         \edef\GPT@Attr{\GPT@Attr
           /Interpolate true%
@@ -1128,7 +1078,7 @@ E     \else
           :I%
         }%
       \fi
-      \ifx\GPT@decodearray\@empty
+      \ifx\GPT@decodearray\ltx@empty
       \else
         \edef\GPT@Attr{\GPT@Attr
           /Decode[\GPT@decodearray]%
@@ -1137,7 +1087,7 @@ E     \else
           :D[\GPT@decodearray]%
         }%
       \fi
-      \ifx\GPT@mask\@empty
+      \ifx\GPT@mask\ltx@empty
       \else
         \edef\GPT@Attr{\GPT@Attr
           /Mask\GPT@mask
@@ -1146,7 +1096,7 @@ E     \else
           :M\GPT@mask
         }%
       \fi
-      \ifx\GPT@intent\@empty
+      \ifx\GPT@intent\ltx@empty
       \else
         \edef\GPT@AttrShort{\GPT@AttrShort
           :RI\GPT@intent
@@ -1165,34 +1115,34 @@ E     \else
       \fi
     \fi
   \else
-    \let\GPT@interpolate\@empty
-    \let\GPT@decodearray\@empty
-    \let\GPT@mask\@empty
-    \let\GPT@intent\@empty
-    \ifx\GPT@page\@empty
+    \let\GPT@interpolate\ltx@empty
+    \let\GPT@decodearray\ltx@empty
+    \let\GPT@mask\ltx@empty
+    \let\GPT@intent\ltx@empty
+    \ifx\GPT@page\ltx@empty
     \else
       \edef\GPT@AttrShort{\GPT@AttrShort
         :P\GPT@page
       }%
     \fi
-    \ifx\GPT@pagebox\@empty
+    \ifx\GPT@pagebox\ltx@empty
     \else
       \edef\GPT@AttrShort{%
         \GPT@AttrShort
-        :\expandafter\@car\GPT@pagebox{}\@nil b%
+        :\expandafter\ltx@car\GPT@pagebox{}\@nil b%
       }%
     \fi
-    \ifx\GPT@print\@empty
+    \ifx\GPT@print\ltx@empty
     \else
       \GPT@warn{%
         Option `print' can only be used\MessageBreak
         for bitmap images%
       }%
-      \let\GPT@print\@empty
+      \let\GPT@print\ltx@empty
     \fi
   \fi
   % Check if print image exists.
-  \ifx\GPT@print\@empty
+  \ifx\GPT@print\ltx@empty
   \else
     \GPT@IfFileExists{\GPT@print}{%
     }{%
@@ -1200,31 +1150,31 @@ E     \else
         The print version of the image is ignored.\MessageBreak
         \@ehc
       }%
-      \let\GPT@print\@empty
+      \let\GPT@print\ltx@empty
     }%
   \fi
   % If option `print' is set, the screen image object
   % will contain an additional /Alternate entry
   % and will not be reused.
-  \ifx\GPT@print\@empty
+  \ifx\GPT@print\ltx@empty
   \else
-    \expandafter\expandafter\expandafter\@firstoftwo\expandafter\@gobbletwo
+    \expandafter\expandafter\expandafter\ltx@firstoftwo\expandafter\ltx@gobbletwo
   \fi
-  \@ifundefined{#1 image\GPT@AttrShort}{%
+  \ltx@ifundefined{#1 image\GPT@AttrShort}{%
     \ifnum\driver@release>4 %
       \ifnum\driver@release>5 %
-        \ifx\GPT@print\@empty
-          \ifx\GPT@Attr\@empty
-            \let\GPT@RuleAttr\@empty
+        \ifx\GPT@print\ltx@empty
+          \ifx\GPT@Attr\ltx@empty
+            \let\GPT@RuleAttr\ltx@empty
           \else
             \edef\GPT@RuleAttr{attr{\GPT@Attr}}%
           \fi
         \else
-          \@ifundefined{\GPT@print\space image\GPT@AttrShort}{%
+          \ltx@ifundefined{\GPT@print\ltx@space image\GPT@AttrShort}{%
             \immediate\pdfximage{\GPT@print}%
             \setbox\@tempboxa=\hbox{\pdfrefximage\pdflastximage}%
             \edef\GPT@PrintObj{\the\pdflastximage}%
-            \expandafter\xdef\csname\GPT@print\space
+            \expandafter\xdef\csname\GPT@print\ltx@space
                 image\GPT@AttrShort\endcsname{%
               \pdfrefximage\GPT@PrintObj\relax
             }%
@@ -1243,8 +1193,8 @@ E     \else
             }%
           }{%
             \edef\GPT@PrintObj{%
-              \expandafter\expandafter\expandafter\@gobble
-              \csname\GPT@print\space image\GPT@AttrShort\endcsname
+              \expandafter\expandafter\expandafter\ltx@gobble
+              \csname\GPT@print\ltx@space image\GPT@AttrShort\endcsname
             }%
             \immediate\pdfobj{%
               [<<%
@@ -1253,8 +1203,8 @@ E     \else
               >>]%
             }%
             \def\GPT@RuleAttr{%
-              width \csname\GPT@print\space width\GPT@AttrShort\endcsname
-              height \csname\GPT@print\space height\GPT@AttrShort\endcsname
+              width \csname\GPT@print\ltx@space width\GPT@AttrShort\endcsname
+              height \csname\GPT@print\ltx@space height\GPT@AttrShort\endcsname
               attr{%
                 \GPT@Attr
                 /Alternates \the\pdflastobj\GPT@objref
@@ -1263,7 +1213,7 @@ E     \else
           }%
         \fi
         \pdfximage\GPT@RuleAttr
-        \ifx\GPT@page\@empty
+        \ifx\GPT@page\ltx@empty
         \else
           page \GPT@page
         \fi
@@ -1275,7 +1225,7 @@ E     \else
       \fi
     \else
       \setbox\@tempboxa=\hbox{%
-        \pdfimage\noexpand\noexpand\noexpand\@empty#1\relax
+        \pdfimage\noexpand\noexpand\noexpand\ltx@empty#1\relax
       }%
     \fi
     \def\Gin@llx{0}\let\Gin@lly\Gin@llx
@@ -1289,7 +1239,7 @@ E     \else
     }%
     \ifnum\driver@release>5 %
       \expandafter\xdef\csname #1 image\GPT@AttrShort
-        \ifx\GPT@print\@empty\else!\fi\endcsname{%
+        \ifx\GPT@print\ltx@empty\else!\fi\endcsname{%
         \pdfrefximage\the\pdflastximage
       }%
     \else
@@ -1303,17 +1253,17 @@ E     \else
        <#1, id=%
        \ifnum\driver@release>5 %
          \the\pdflastximage
-         \ifx\GPT@page\@empty\else , page=\GPT@page\fi
-         \ifx\GPT@pagebox\@empty\else, pagebox=\GPT@pagebox\fi
-         \ifx\GPT@interpolate\@empty\else, interpolate=true\fi
-         \ifx\GPT@print\@empty
+         \ifx\GPT@page\ltx@empty\else , page=\GPT@page\fi
+         \ifx\GPT@pagebox\ltx@empty\else, pagebox=\GPT@pagebox\fi
+         \ifx\GPT@interpolate\ltx@empty\else, interpolate=true\fi
+         \ifx\GPT@print\ltx@empty
          \else
             , print=\GPT@print, id=\GPT@PrintObj
          \fi
        \else
          \the\Gread@gobject
        \fi
-       , \the\wd\@tempboxa\space x \the\ht\@tempboxa
+       , \the\wd\@tempboxa\ltx@space x \the\ht\@tempboxa
        >%
      }%
   }{%
@@ -1331,13 +1281,19 @@ E     \else
   \fi
   \Gin@log{%
     <use #1%
-    \ifx\GPT@page\@empty\else, page \GPT@page\fi
+    \ifx\GPT@page\ltx@empty\else, page \GPT@page\fi
     >%
   }%
+  \GPT@info{%
+    #1\ifx\GPT@page\ltx@empty\else, page\GPT@page\fi
+    \ltx@space used\on@line.\MessageBreak
+    Requested size: %
+    \the\Gin@req@width\ltx@space x \the\Gin@req@height
+  }%
   \hbox{%
     \GPT@ResetColorBegin
     \Gscale@box{\Gin@scalex}[\Gin@scaley]{%
-      \@ifundefined{Gin@vllx}{%
+      \ltx@IfUndefined{Gin@vllx}{%
         \GPT@viewportfalse
         % without viewport/trim clipping does not make sense
         % for pdfTeX
@@ -1365,7 +1321,7 @@ E     \else
         \fi
       \fi
       \csname#1 image\GPT@AttrShort
-        \ifx\GPT@print\@empty\else!\fi
+        \ifx\GPT@print\ltx@empty\else!\fi
       \endcsname
       \ifGPT@viewport
         \ifdim\Gin@vlly\p@=\z@
@@ -1378,7 +1334,7 @@ E     \else
     \GPT@ResetColorEnd
   }%
 }
-\newif\ifGPT@viewport
+\ltx@newif\ifGPT@viewport
 \GPT@viewporttrue
 \let\GPT@clipend\relax
 \def\GPT@DoClipEnd{%
@@ -1394,9 +1350,9 @@ E     \else
   % v0.03k \Gin@vlly replaced by \Gin@lly
   \advance\dimen@ -\Gin@lly\p@
   \ht\@tempboxa\strip@pt\dimen@ bp\relax
-  \let\GPT@temp\@empty
+  \let\GPT@temp\ltx@empty
   \ifnum\driver@release>7 %
-    \ifx\GPT@ocobjnum\@empty
+    \ifx\GPT@ocobjnum\ltx@empty
     \else
       \edef\GPT@temp{attr{/OC \GPT@ocobjnum\GPT@objref}}%
     \fi
@@ -1404,7 +1360,7 @@ E     \else
   \expandafter\pdfxform\GPT@temp\@tempboxa
   \pdfrefxform\pdflastxform
 }
-\newif\ifGPT@IsBitmap
+\ltx@newif\ifGPT@IsBitmap
 \def\Gread@pdfbitmap#1{%
   \GPT@IsBitmaptrue
   \Gread@pdftex{#1}%
@@ -1467,7 +1423,7 @@ E     \else
 % v0.02f add \@depth\z@ (from Sebastian)
     \pdfimage
       \@height\Gin@req@height \@width\Gin@req@width \@depth\z@
-      \noexpand\noexpand\noexpand\@empty#1\relax
+      \noexpand\noexpand\noexpand\ltx@empty#1\relax
   }%
 }
 
@@ -1481,7 +1437,7 @@ E     \else
   \hbox{%
     \GPT@ResetColorBegin
     \Gscale@box{\Gin@scalex}[\Gin@scaley]{%
-      \@ifundefined{Gin@vllx}{%
+      \ltx@IfUndefined{Gin@vllx}{%
         \GPT@viewportfalse
         % without viewport/trim clipping does not make sense
         % for pdfTeX
@@ -1607,55 +1563,52 @@ E     \else
 \def\GPT@Minus{-}
 \def\GPT@NormalizeNumber#1{%
   \edef#1{#1}%
-  \edef#1{\GPT@ZapSpace#1}%
+  \edef#1{\ltx@zapspace{#1}}%
   \edef#1{\expandafter\GPT@ZapPlus#1+\@nil}%
   \edef#1{\expandafter\GPT@ZapMinusMinus#1--\@nil}%
   \expandafter\GPT@Split#1..\@nil
-  \ifx\GPT@frac\@empty
+  \ifx\GPT@frac\ltx@empty
   \else
     \edef\GPT@frac{%
       \expandafter\GPT@Reverse\expandafter{\expandafter}\GPT@frac\@nil
     }%
     \edef\GPT@frac{%
-      \expandafter\GPT@ZapLeadingZeros\GPT@frac\@empty
+      \expandafter\GPT@ZapLeadingZeros\GPT@frac\ltx@empty
     }%
-    \ifx\GPT@frac\@empty
+    \ifx\GPT@frac\ltx@empty
     \else
       \edef\GPT@frac{%
         \expandafter\GPT@Reverse\expandafter{\expandafter}\GPT@frac\@nil
       }%
     \fi
   \fi
-  \edef\GPT@sign{\expandafter\@car\GPT@int\@empty\@nil}%
+  \edef\GPT@sign{\expandafter\ltx@car\GPT@int\ltx@empty\@nil}%
   \ifx\GPT@sign\GPT@Minus
-    \edef\GPT@int{\expandafter\@cdr\GPT@int\@nil}%
+    \edef\GPT@int{\expandafter\ltx@cdr\GPT@int\@nil}%
   \else
     \def\GPT@sign{}%
   \fi
   \edef\GPT@int{%
-    \expandafter\GPT@ZapLeadingZeros\GPT@int\@empty
+    \expandafter\GPT@ZapLeadingZeros\GPT@int\ltx@empty
   }%
   \edef\GPT@temp{\GPT@int\GPT@frac}%
-  \ifx\GPT@temp\@empty
+  \ifx\GPT@temp\ltx@empty
     \def#1{0}%
   \else
     \edef#1{%
       \GPT@sign
       \GPT@int
-      \ifx\GPT@frac\@empty
+      \ifx\GPT@frac\ltx@empty
       \else
         .\GPT@frac
       \fi
     }%
   \fi
 }
-\def\GPT@ZapSpace#1{%
-  \expandafter\zap@space#1 \@empty
-}
 \def\GPT@ZapPlus#1+#2\@nil{%
   #1%
-  \ifx\@empty#2\@empty
-    \expandafter\@gobble
+  \ifx\ltx@empty#2\ltx@empty
+    \expandafter\ltx@gobble
   \else
     \expandafter\@firstofone
   \fi
@@ -1665,8 +1618,8 @@ E     \else
 }
 \def\GPT@ZapMinusMinus#1--#2\@nil{%
   #1%
-  \ifx\@empty#2\@empty
-    \expandafter\@gobble
+  \ifx\ltx@empty#2\ltx@empty
+    \expandafter\ltx@gobble
   \else
     \expandafter\@firstofone
   \fi
@@ -1676,18 +1629,18 @@ E     \else
 }
 \def\GPT@Split#1.#2.#3\@nil{%
   \def\GPT@int{#1}%
-  \ifx\@empty#2\@empty
-    \let\GPT@frac\@empty
+  \ifx\ltx@empty#2\ltx@empty
+    \let\GPT@frac\ltx@empty
   \else
     \def\GPT@frac{#2}%
   \fi
 }
 \def\GPT@Reverse#1#2#3\@nil{%
-  \ifx\@empty#3\@empty
+  \ifx\ltx@empty#3\ltx@empty
     #2#1%
-    \expandafter\@gobble
+    \expandafter\ltx@gobble
   \else
-    \expandafter\@firstofone
+    \expandafter\ltx@firstofone
   \fi
   {%
     \GPT@Reverse{#2#1}#3\@nil
@@ -1708,7 +1661,7 @@ E     \else
     \GPT@NormalizeNumber\Grot@sin
     \GPT@NormalizeNumber\Grot@cos
     \edef\GPT@temp{%
-      \Grot@cos\space\Grot@sin\space
+      \Grot@cos\ltx@space\Grot@sin\ltx@space
       \if-\GPT@sin
       \else
         % avoid negative zero
@@ -1718,12 +1671,12 @@ E     \else
           -\Grot@sin
         \fi
       \fi
-      \space\Grot@cos
+      \ltx@space\Grot@cos
     }%
     \ifx\GPT@temp\GPT@MatrixIdentity
       \def\Grot@end{}%
     \else
-      \pdfliteral{ q \GPT@temp\space 0 0 cm}%
+      \pdfliteral{ q \GPT@temp\ltx@space 0 0 cm}%
       \wd\z@\z@
     \fi
     \wd\z@\z@
@@ -1736,12 +1689,12 @@ E     \else
     \GPT@NormalizeNumber\Gscale@x
     \GPT@NormalizeNumber\Gscale@y
     \edef\GPT@temp{%
-      \Gscale@x\space0 0 \Gscale@y
+      \Gscale@x\ltx@space0 0 \Gscale@y
     }%
     \ifx\GPT@temp\GPT@MatrixIdentity
       \def\Gscale@end{}%
     \else
-      \pdfliteral{ q \GPT@temp\space 0 0 cm}%
+      \pdfliteral{ q \GPT@temp\ltx@space 0 0 cm}%
     \fi
   }%
 \else
@@ -1749,7 +1702,7 @@ E     \else
     \GPT@NormalizeNumber\Grot@sin
     \GPT@NormalizeNumber\Grot@cos
     \edef\GPT@temp{%
-      \Grot@cos\space\Grot@sin\space
+      \Grot@cos\ltx@space\Grot@sin\ltx@space
       \if-\Grot@sin
       \else
         \ifx\Grot@sin\GPT@Zero
@@ -1758,7 +1711,7 @@ E     \else
           -\Grot@sin
         \fi
       \fi
-      \space\Grot@cos
+      \ltx@space\Grot@cos
     }%
     \ifx\GPT@temp\GPT@MatrixIdentity
       \def\Grot@end{}%
@@ -1773,7 +1726,7 @@ E     \else
     \GPT@NormalizeNumber\Gscale@x
     \GPT@NormalizeNumber\Gscale@y
     \edef\GPT@temp{%
-      \Gscale@x\space0 0 \Gscale@y
+      \Gscale@x\ltx@space0 0 \Gscale@y
     }%
     \ifx\GPT@temp\GPT@MatrixIdentity
       \def\Gscale@end{}%
@@ -1811,19 +1764,19 @@ E     \else
   \GPT@temp cos(-270)=0 %
   \GPT@temp sin(-360)=0 %
   \GPT@temp cos(-360)=1 %
-  \GPT@ifpackageloaded{trig}{%
+  \ltx@ifpackageloaded{trig}{%
     \let\GPT@PatchTrig\relax
   }{}%
 }
 \AtBeginDocument{\GPT@PatchTrig}
-\GPT@ifpackageloaded{trig}{\GPT@PatchTrig}{}
-\GPT@ifundefined{AfterPackage}{}{% scrlfile.sty
+\ltx@ifpackageloaded{trig}{\GPT@PatchTrig}{}
+\ltx@IfUndefined{AfterPackage}{}{% scrlfile.sty
   \AfterPackage{trig}{\GPT@PatchTrig}%
 }
-\GPT@ifundefined{AtEndOfPackageFile}{}{% filehook.sty
+\ltx@IfUndefined{AtEndOfPackageFile}{}{% filehook.sty
   \AtEndOfPackageFile{trig}{\GPT@PatchTrig}%
 }
-\GPT@ifundefined{AtEndPackage}{}{% memoir.cls
+\ltx@IfUndefined{AtEndPackage}{}{% memoir.cls
   \AtEndPackage{trig}{\GPT@PatchTrig}%
 }
 
@@ -1841,7 +1794,7 @@ E     \else
   % of \InputIfFileExists will not work:
   % * \InputIfFileExists has problems with parameters (#1).
   % * Implementation of \providecommand is insufficient in miniltx.tex
-  \@ifundefined{convertMPtoPDF}{%
+  \ltx@ifundefined{convertMPtoPDF}{%
     \newcommand*{\convertMPtoPDF}[3]{%
       \GPT@error{%
         Cannot convert #1 from MPS to PDF.\MessageBreak
@@ -1852,7 +1805,7 @@ E     \else
         to convert MetaPost output files to PDF.\MessageBreak
         These files are part of ConTeXt and can also be found here:%
         \MessageBreak
-        \space\space CTAN:macros/pdftex/graphics/\MessageBreak
+        \ltx@space\ltx@space CTAN:macros/pdftex/graphics/\MessageBreak
         You'll get more errors if you'll continue now.%
       }%
     }%
@@ -1905,19 +1858,19 @@ E     \else
   }%
   \let\LoadMetaPostSpecialExtensions\relax
 }
-\ifx\@onlypreamble\@undefined
-\else
+\ltx@IfUndefined{@onlypreamble}{%
+}{%
   \@onlypreamble\LoadMetaPostSpecialExtensions
-\fi
+}
 
 % these seem to upset pdftex. ignore them. SPQR 1999/08/02
 % allow for plain graphics, not graphicx.
 % pdftex.def is loaded before the definition in graphicx,
 % so do all the stuff \AtBeginDocument:
 \AtBeginDocument{%
-  \@ifundefined{define@key}{}{%
+  \ltx@IfUndefined{define@key}{}{%
     \define@key{Gin}{natwidth}{}%
     \define@key{Gin}{natheight}{}%
   }%
 }%
-\GPT@endinput
+\GPT@AtEnd