pdftex-def update (26aug09)

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

1 files changed, 115 insertions, 74 deletions

diff --git a/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def b/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def
index 3f79fa8eaea..71c9c77f1aa 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}[2008/09/08 v0.04l Graphics/color for pdfTeX]
+\ProvidesFile{pdftex.def}[2009/08/25 v0.04m Graphics/color for pdfTeX]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% LaTeX Colour and Graphics support for PDFTeX
@@ -6,7 +6,7 @@
 %% License
 %% =======
 %%
-%% Copyright (C) 2000-2008 David Carlisle, Sebastian Rahtz, Hans Hagen,
+%% Copyright (C) 2000-2009 David Carlisle, Sebastian Rahtz, Hans Hagen,
 %% Heiko Oberdiek and Martin Schr\"oder
 %%
 %% This work may be distributed and/or modified under the
@@ -182,48 +182,88 @@
 %  * Adds an error message, if pdfTeX is called in DVI mode.
 %  * Aborts loading of the package with an error message,
 %    if pdfTeX is missing.
+% 2009/08/25 v0.04m (HO)
+%  * Catcodes are preserved and initialized for loading of
+%    pdftex.def and ConTeXt's support files.
+%  * ConTeXt's support files have now the extension `.mkii' instead
+%    of `.tex'.
 %
 % Prefix of internal commands for this file `pdftex.def':
 %   \GPT@ (Graphics bundle PdfTex driver)
 
 \expandafter\edef\csname GPT@endinput\endcsname{%
-  \catcode33 \the\catcode33 % !
-  \catcode34 \the\catcode34 % "
-  \catcode39 \the\catcode39 % '
-  \catcode42 \the\catcode42 % *
-  \catcode44 \the\catcode44 % ,
-  \catcode45 \the\catcode45 % -
-  \catcode46 \the\catcode46 % .
-  \catcode47 \the\catcode47 % /
-  \catcode58 \the\catcode58 % :
-  \catcode59 \the\catcode59 % ;
-  \catcode60 \the\catcode60 % <
-  \catcode61 \the\catcode61 % =
-  \catcode62 \the\catcode62 % >
-  \catcode63 \the\catcode63 % ?
-  \catcode64 \the\catcode64 % @
-  \catcode94 \the\catcode94 % ^
-  \catcode96 \the\catcode96 % `
-  \relax
+  \expandafter\noexpand\csname GPT@restore@\endcsname
+  \catcode35 \the\catcode35\relax % #
+  \catcode64 \the\catcode64\relax % @
   \noexpand\endinput
 }
-\catcode64 11 %
-\@makeother\!
-\@makeother\"
-\@makeother\'
-\@makeother\*
-\@makeother\,
-\@makeother\-
-\@makeother\.
-\@makeother\/
-\@makeother\:
-\@makeother\;
-\@makeother\<
-\@makeother\=
-\@makeother\>
-\@makeother\?
-\@makeother\`
-\catcode`\^=7 %
+\catcode35 6 % #
+\catcode64 11 % @
+\def\GPT@catcodes#1{%
+  \expandafter\edef\csname GPT@restore@#1\endcsname{%
+    \catcode33 \the\catcode33 % !
+    \catcode34 \the\catcode34 % "
+    \catcode35 \the\catcode35 % #
+    \catcode36 \the\catcode36 % $
+    \catcode37 \the\catcode37 % %
+    \catcode38 \the\catcode38 % &
+    \catcode39 \the\catcode39 % '
+    \catcode40 \the\catcode40 % (
+    \catcode41 \the\catcode41 % )
+    \catcode42 \the\catcode42 % *
+    \catcode43 \the\catcode43 % +
+    \catcode44 \the\catcode44 % ,
+    \catcode45 \the\catcode45 % -
+    \catcode46 \the\catcode46 % .
+    \catcode47 \the\catcode47 % /
+    \catcode58 \the\catcode58 % :
+    \catcode59 \the\catcode59 % ;
+    \catcode60 \the\catcode60 % <
+    \catcode61 \the\catcode61 % =
+    \catcode62 \the\catcode62 % >
+    \catcode63 \the\catcode63 % ?
+    \catcode64 \the\catcode64 % @
+    \catcode91 \the\catcode91 % [
+    \catcode93 \the\catcode93 % ]
+    \catcode94 \the\catcode94 % ^
+    \catcode95 \the\catcode95 % _
+    \catcode96 \the\catcode96 % `
+    \catcode124 \the\catcode124 % |
+    \catcode126 \the\catcode126 % ~
+  }%
+  \catcode64 11 %
+  \catcode61 12 % =
+  \catcode33 12 % !
+  \catcode34 12 % "
+  \catcode35 6 % #
+  \catcode36 3 % $
+  \catcode37 14 % %
+  \catcode38 4 % &
+  \catcode39 12 % '
+  \catcode40 12 % (
+  \catcode41 12 % )
+  \catcode42 12 % *
+  \catcode43 12 % +
+  \catcode44 12 % ,
+  \catcode45 12 % -
+  \catcode46 12 % .
+  \catcode47 12 % /
+  \catcode58 12 % :
+  \catcode59 12 % ;
+  \catcode60 12 % <
+  \catcode61 12 % =
+  \catcode62 12 % >
+  \catcode63 12 % ?
+  \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
+  \catcode94 7 % ^
+  \catcode95 8 % _
+  \catcode96 12 % `
+  \catcode124 12 % |
+  \catcode126 13 % ~
+}
+\GPT@catcodes{}
 
 \ifx\pdftexversion\@undefined
   \def\driver@release{1}%
@@ -323,7 +363,7 @@
     but pdfTeX features are missing.\MessageBreak
     Loading of this driver file is aborted%
   }\@ehc
-  \expandafter\endinput
+  \expandafter\GPT@endinput
 \else
   \ifx\paperwidth\@undefined
   \else
@@ -1235,15 +1275,11 @@ E     \else
 % but protects against older versions.
 % v0.03o: Catcode protection of '=' because of turkish.ldf.
 \AtBeginDocument{%
-  \edef\@tempa{%
-    \catcode`\noexpand\=\the\catcode`\= %
-    \catcode`\noexpand\!\the\catcode`\! %
-    \catcode`\noexpand\@\the\catcode`\@ %
-    \catcode`\noexpand\?\the\catcode`\? %
+  \GPT@catcodes{supp}%
+  \InputIfFileExists{supp-pdf.mkii}{}{%
+    \InputIfFileExists{supp-pdf}{}{}%
   }%
-  \@makeother\=%
-  \InputIfFileExists{supp-pdf}{}{}%
-  % If supp-pdf.tex is not available, \convertMPtoPDF generates
+  % If supp-pdf is not available, \convertMPtoPDF generates
   % an error message. \providecommand inside the third argument
   % of \InputIfFileExists will not work:
   % * \InputIfFileExists has problems with parameters (#1).
@@ -1252,60 +1288,65 @@ E     \else
     \newcommand*{\convertMPtoPDF}[3]{%
       \GPT@error{%
         Cannot convert #1 from MPS to PDF.\MessageBreak
-        The support file `supp-pdf.tex' is missing%
+        The support file `supp-pdf.mkii' (supp-pdf.tex) is missing%
       }{%
-        The graphics driver for pdfTeX needs `supp-pdf.tex' (and `supp-mis.tex')%
-        \MessageBreak
-        to convert MP to PDF.\MessageBreak
+        The graphics driver for pdfTeX needs `supp-pdf.mkii'\MessageBreak
+        (or `supp-pdf.tex' and/or `supp-mis.tex')\MessageBreak
+        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/supp-pdf.tex\MessageBreak
-        \space\space CTAN:macros/pdftex/graphics/supp-mis.tex\MessageBreak
+        \space\space CTAN:macros/pdftex/graphics/\MessageBreak
         You'll get more errors if you'll continue now.%
       }%
     }%
   }{}%
-  \@tempa
+  \GPT@restore@supp
 }
 
 % Adds support for extended MetaPost features (transparency)
 \def\LoadMetaPostSpecialExtensions{%
   \AtBeginDocument{%
-    \edef\@tempa{%
-      \catcode`\noexpand\=\the\catcode`\= %
-      \catcode`\noexpand\!\the\catcode`\! %
-      \catcode`\noexpand\@\the\catcode`\@ %
-      \catcode`\noexpand\?\the\catcode`\? %
+    \GPT@catcodes{mpe}%
+    \let\GPT@found=N%
+    \IfFileExists{supp-pdf.mkii}{\let\GPT@found=Y}{%
+      \IfFileExists{supp-pdf}{\let\GPT@found=Y}{}%
     }%
-    \@makeother\=%
-    \IfFileExists{supp-pdf}{%
-      \IfFileExists{supp-mis}{%
-        \IfFileExists{supp-mpe}{%
-          \input{supp-mis}%
-          \input{supp-mpe}%
+    \ifx Y\GPT@found
+      \InputIfFileExists{supp-mis.mkii}{}{%
+        \InputIfFileExists{supp-mis}{}{\let\GPT@found=N}%
+      }%
+      \ifx Y\GPT@found
+        \InputIfFileExists{supp-mpe.mkii}{}{%
+          \InputIfFileExists{supp-mpe}{}{\let\GPT@found=N}%
+        }%
+        \ifx Y\GPT@found
           \MPcmykcolorstrue
           \MPspotcolorstrue
           \chardef\makeMPintoPDFobject=1 %
-        }{%
+        \else
           \GPT@warn{%
             Cannot enable MetaPost Special Extensions,\MessageBreak
-            because supp-mpe.tex is missing%
+            because `supp-mpe.mkii' (or `supp-mpe.tex')\MessageBreak
+            is missing%
           }%
-        }%
-      }{%
+        \fi
+      \else
         \GPT@warn{%
           Cannot enable MetaPost Special Extensions,\MessageBreak
-          because supp-mis.tex is missing%
+          because `supp-mis.mkii' (or `supp-mis.tex')\MessageBreak
+          is missing%
         }%
-      }%
-    }{%
+      \fi
+    \else
       \GPT@warn{%
         Cannot enable support for MetaPost images,\MessageBreak
-        because supp-pdf.tex is missing%
+        because `supp-pdf.mkii' (or `supp-pdf.tex')\MessageBreak
+        is missing%
       }%
-    }%
-    \@tempa
+    \fi
+    \GPT@restore@mpe
   }%
+  \let\LoadMetaPostSpecialExtensions\relax
 }
 \ifx\@onlypreamble\@undefined
 \else