pdftex-def (19may11)

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

3 files changed, 48 insertions, 34 deletions

diff --git a/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def b/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def
index 71760cd6deb..366ba3a9db6 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/04/25 v0.06b Graphics/color for pdfTeX]
+\ProvidesFile{pdftex.def}[2011/05/18 v0.06c Graphics/color for pdfTeX]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% LaTeX Colour and Graphics support for PDFTeX
@@ -249,6 +249,11 @@
 % 2011/04/25 v0.06b (HO)
 %  * Fix in \GPT@NormalizeNumber.
 %  * Date fixed in \ProvidesFile.
+% 2011/05/18 v0.06c (HO)
+%  * The ConTeXt support files `supp-pdf.*' and `supp-mpe.*' do
+%    not prevent reloading. Therefore `pdftex.def' only tries to load
+%    them if \convertMPtoPDF and \assignMPStransparency are not
+%    available. This fixes a compatibilty issue with class `combine'.
 %
 % Prefix of internal commands for this file `pdftex.def':
 %   \GPT@ (Graphics bundle PdfTex driver)
@@ -1787,10 +1792,15 @@ E     \else
 % Not needed with current version of supp-pdf
 % but protects against older versions.
 % v0.03o: Catcode protection of '=' because of turkish.ldf.
-\AtBeginDocument{%
-  \GPT@catcodes{supp}%
-  \InputIfFileExists{supp-pdf.mkii}{}{%
-    \InputIfFileExists{supp-pdf}{}{}%
+\def\GPT@LoadSuppPdf{%
+  \ltx@IfUndefined{convertMPtoPDF}{%
+    \GPT@catcodes{supp}%
+    \InputIfFileExists{supp-pdf.mkii}{}{%
+      \InputIfFileExists{supp-pdf}{}{}%
+    }%
+    \GPT@restore@supp
+  }{%
+    % supp-pdf is probably already loaded.
   }%
   % If supp-pdf is not available, \convertMPtoPDF generates
   % an error message. \providecommand inside the third argument
@@ -1800,7 +1810,7 @@ E     \else
   \ltx@ifundefined{convertMPtoPDF}{%
     \newcommand*{\convertMPtoPDF}[3]{%
       \GPT@error{%
-        Cannot convert #1 from MPS to PDF.\MessageBreak
+        Cannot convert ##1 from MPS to PDF.\MessageBreak
         The support file `supp-pdf.mkii' (supp-pdf.tex) is missing%
       }{%
         The graphics driver for pdfTeX needs `supp-pdf.mkii'\MessageBreak
@@ -1813,51 +1823,56 @@ E     \else
       }%
     }%
   }{}%
-  \GPT@restore@supp
+  \let\GPT@LoadSuppPdf\relax
+}
+\AtBeginDocument{%
+  \GPT@LoadSuppPdf
 }
 
 % Adds support for extended MetaPost features (transparency)
 \def\LoadMetaPostSpecialExtensions{%
   \AtBeginDocument{%
-    \GPT@catcodes{mpe}%
-    \let\GPT@found=N%
-    \IfFileExists{supp-pdf.mkii}{\let\GPT@found=Y}{%
-      \IfFileExists{supp-pdf}{\let\GPT@found=Y}{}%
-    }%
-    \ifx Y\GPT@found
-      \InputIfFileExists{supp-mis.mkii}{}{%
-        \InputIfFileExists{supp-mis}{}{\let\GPT@found=N}%
+    \ltx@IfUndefined{assignMPStransparency}{%
+      \GPT@catcodes{mpe}%
+      \let\GPT@found=N%
+      \IfFileExists{supp-pdf.mkii}{\let\GPT@found=Y}{%
+        \IfFileExists{supp-pdf}{\let\GPT@found=Y}{}%
       }%
       \ifx Y\GPT@found
-        \InputIfFileExists{supp-mpe.mkii}{}{%
-          \InputIfFileExists{supp-mpe}{}{\let\GPT@found=N}%
+        \InputIfFileExists{supp-mis.mkii}{}{%
+          \InputIfFileExists{supp-mis}{}{\let\GPT@found=N}%
         }%
         \ifx Y\GPT@found
-          \MPcmykcolorstrue
-          \MPspotcolorstrue
-          \chardef\makeMPintoPDFobject=1 %
+          \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.mkii' (or `supp-mpe.tex')\MessageBreak
+              is missing%
+            }%
+          \fi
         \else
           \GPT@warn{%
             Cannot enable MetaPost Special Extensions,\MessageBreak
-            because `supp-mpe.mkii' (or `supp-mpe.tex')\MessageBreak
+            because `supp-mis.mkii' (or `supp-mis.tex')\MessageBreak
             is missing%
           }%
         \fi
       \else
         \GPT@warn{%
-          Cannot enable MetaPost Special Extensions,\MessageBreak
-          because `supp-mis.mkii' (or `supp-mis.tex')\MessageBreak
+          Cannot enable support for MetaPost images,\MessageBreak
+          because `supp-pdf.mkii' (or `supp-pdf.tex')\MessageBreak
           is missing%
         }%
       \fi
-    \else
-      \GPT@warn{%
-        Cannot enable support for MetaPost images,\MessageBreak
-        because `supp-pdf.mkii' (or `supp-pdf.tex')\MessageBreak
-        is missing%
-      }%
-    \fi
-    \GPT@restore@mpe
+      \GPT@restore@mpe
+    }{}%
   }%
   \let\LoadMetaPostSpecialExtensions\relax
 }
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 103fceca0f6..d4319e0c223 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -18,8 +18,6 @@ my $tlpdb;
 my $Master;
 our %OPT;
 
-# toptesi - reinstate after next upload, generated files out of sync
-# these packages should be up to date:
 my @TLP_working = qw(
   12many 2up
   ANUfinalexam AkkTeX Asana-Math ESIEEcv HA-prosper IEEEconf IEEEtran
@@ -357,7 +355,7 @@ my @TLP_working = qw(
     titlefoot titlepages titlepic titleref titlesec titling
     tkz-base tkz-doc tkz-linknodes tkz-orm tkz-tab
     tocbibind tocloft tocvsec2 todo todonotes
-    tokenizer toolbox tools topfloat totcount totpages
+    tokenizer toolbox tools topfloat totcount totpages toptesi
     trajan tree-dvips trfsigns trimspaces trivfloat trsym truncate
     tucv tufte-latex tugboat tugboat-plain turkmen turnstile turnthepage
     twoinone twoup
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 3f9fde52013..068c218a7a8 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2044,6 +2044,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'stix'		 => 'STIX_Font_Release_Documentation_2010.pdf', # no source
  'stubs'	 => 'stubs.pdf',			# no source
  'susy'		 => 'susy.pdf',				# no source
+ 'toptesi'	 => 'logo.*',				# legalities unknown
  'tree-dvips'	 => 'avm.*',				# author no response
  'xskak'	 => 'xskak.pdf',			# no source
 );