pdftex-def 0.04h

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

2 files changed, 47 insertions, 39 deletions

diff --git a/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def b/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def
index f9a29a7d7e5..6b878bb7cd2 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}[2007/04/17 v0.04g Graphics/color for pdfTeX]
+\ProvidesFile{pdftex.def}[2007/06/12 v0.04h Graphics/color for pdfTeX]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% LaTeX Colour and Graphics support for PDFTeX
@@ -163,6 +163,9 @@
 % 2007/04/17 v0.04g (HO)
 %  * Small improvement of robustness of \pagecolor
 %    and using e-TeX if available.
+% 2007/06/12 v0.04h (HO)
+%  * Fix for \pagecolor: v0.04f uses keyword `page' for \pdfliteral,
+%    but this keyword is not available before pdfTeX 1.30.0.
 %
 % prefix of internal commands for this file `pdftex.def':
 %   \GPT@ (Graphics bundle PdfTex driver)
@@ -209,31 +212,36 @@
 \ifx\pdftexversion\@undefined
   \def\driver@release{1}%
 \else
-  \ifnum\pdftexversion<12
+  \ifnum\pdftexversion<12 %
     \def\driver@release{2}%
   \else
-    \ifnum\pdftexversion<13
-      \ifnum \expandafter `\pdftexrevision < `n
+    \ifnum\pdftexversion<13 %
+      \ifnum\expandafter`\pdftexrevision<`n %
         \def\driver@release{3}%
       \else
         \def\driver@release{4}%
       \fi
     \else
-      \ifnum\pdftexversion=13
+      \ifnum\pdftexversion=13 %
         \def\driver@release{5}%
       \else
-        \ifnum\pdftexversion=14
+        \ifnum\pdftexversion=14 %
           \def\driver@release{6}%
         \else
-          \ifnum\pdftexversion<110
+          \ifnum\pdftexversion<110 %
             \def\driver@release{7}%
           \else
-            \ifnum\pdftexversion<140
-              % .tif support was dropped in pdfTeX 1.10a
+            \ifnum\pdftexversion<130 %
+              % 1.30.0 adds keyword `page' for \pdfliteral
               \def\driver@release{8}%
             \else
-              % JBIG2 support added in pdfTeX 1.40.0
-              \def\driver@release{9}%
+              \ifnum\pdftexversion<140 %
+                % .tif support was dropped in pdfTeX 1.10a
+                \def\driver@release{9}%
+              \else
+                % JBIG2 support added in pdfTeX 1.40.0
+                \def\driver@release{10}%
+              \fi
             \fi
           \fi
         \fi
@@ -282,7 +290,7 @@
 \fi
 \def\GPT@warn{\PackageWarning{pdftex.def}}%
 \ifx\Gin@log\@undefined
-  \def\Gin@log{\message}
+  \def\Gin@log{\message}%
 \fi
 
 % Colour Support. The following models may be used.
@@ -426,7 +434,7 @@ E     \else
     }%
     \gdef\GPT@pageliteral{%
       \ifGPT@pagecolor
-        \pdfliteral page{%
+        \pdfliteral\ifnum\driver@release>8 page\else direct\fi{%
           q % gsave
           \current@page@color\space
           n % newpath
@@ -534,7 +542,7 @@ E     \else
         \fi
       \endcsname
     }%
-    \ifnum\driver@release>5
+    \ifnum\driver@release>5 %
       \define@key{Gin}{page}{%
         \def\GPT@page{#1}%
         \ifx\GPT@page\@empty
@@ -572,7 +580,7 @@ E     \else
     }\x
   }{%
     \expandafter\endgroup\the\toks@
-  }
+  }%
 
 % redefinitions of some graphicx options:
 \def\GPT@disable#1{%
@@ -636,8 +644,8 @@ E     \else
     \expandafter\expandafter\expandafter\@firstoftwo\expandafter\@gobbletwo
   \fi
   \@ifundefined{#1 image\GPT@page}{%
-    \ifnum\driver@release>4
-      \ifnum\driver@release>5
+    \ifnum\driver@release>4 %
+      \ifnum\driver@release>5 %
         \ifx\GPT@print\@empty
           \let\GPT@RuleAttr\@empty
         \else
@@ -699,7 +707,7 @@ E     \else
     \expandafter\xdef\csname\GPT@ReusedName{#1} height\GPT@page\endcsname{%
       \the\ht\@tempboxa
     }%
-    \ifnum\driver@release>5
+    \ifnum\driver@release>5 %
       \expandafter\xdef\csname #1 image\GPT@page
         \ifx\GPT@print\@empty\else!\fi\endcsname{%
         \pdfrefximage\the\pdflastximage
@@ -713,7 +721,7 @@ E     \else
     \fi
     \Gin@log{%
        <#1, id=%
-       \ifnum\driver@release>5
+       \ifnum\driver@release>5 %
          \the\pdflastximage
          \ifx\GPT@page\@empty\else , page=\GPT@page\fi
          \ifx\GPT@print\@empty
@@ -754,7 +762,7 @@ E     \else
         \Gin@clipfalse
       }{}%
       \ifGin@clip
-        \ifnum\driver@release<6
+        \ifnum\driver@release<6 %
           \GPT@warn{No clipping support in pdfTeX < 0.14}%
         \else
           \if!\Gin@vllx\Gin@vlly\Gin@vurx\Gin@vury!%
@@ -888,7 +896,7 @@ E     \else
         \Gin@clipfalse
       }{}%
       \ifGin@clip
-        \ifnum\driver@release<6
+        \ifnum\driver@release<6 %
           \GPT@warn{No clipping support in pdfTeX < 0.14}%
         \else
           \if!\Gin@vllx\Gin@vlly\Gin@vurx\Gin@vury!%
@@ -929,11 +937,11 @@ E     \else
   \let\Gread@png\Gread@pdfbitmap
   \let\Gread@jpg\Gread@pdfbitmap
   \ifnum\driver@release>5 %
-    \ifnum\driver@release<8 %
+    \ifnum\driver@release<9 %
       \let\Gread@tif\Gread@pdfbitmap
       \let\Ginclude@tif\Ginclude@pdftex
     \else
-      \ifnum\driver@release>8 %
+      \ifnum\driver@release>9 %
         \expandafter\let\csname Gread@jbig2\endcsname\Gread@pdfbitmap
         \expandafter\let\csname Ginclude@jbig2\endcsname\Ginclude@pdftex
       \fi
@@ -951,39 +959,39 @@ E     \else
       \convertPDFtoPDF{#1}{\Gin@scalex}{\Gin@scaley} {0bp} {0bp}%
       {\Gin@req@width}{\Gin@req@height}%
     }%
-  }
+  }%
 \fi
 
 % v0.02e: restrict the rules to just the types that pdftex can currently
 % deal with.
 \ifnum\driver@release>3 %
-  \def\Gin@extensions{.png,.pdf,.jpg,.mps,.jpeg,.PNG,.PDF,.JPG,.JPEG}
-  \@namedef{Gin@rule@.jpg}#1{{jpg}{.jpg}{#1}}
-  \@namedef{Gin@rule@.jpeg}#1{{jpg}{.jpeg}{#1}}
-  \@namedef{Gin@rule@.JPG}#1{{jpg}{.JPG}{#1}}
-  \@namedef{Gin@rule@.JPEG}#1{{jpg}{.JPEG}{#1}}
+  \def\Gin@extensions{.png,.pdf,.jpg,.mps,.jpeg,.PNG,.PDF,.JPG,.JPEG}%
+  \@namedef{Gin@rule@.jpg}#1{{jpg}{.jpg}{#1}}%
+  \@namedef{Gin@rule@.jpeg}#1{{jpg}{.jpeg}{#1}}%
+  \@namedef{Gin@rule@.JPG}#1{{jpg}{.JPG}{#1}}%
+  \@namedef{Gin@rule@.JPEG}#1{{jpg}{.JPEG}{#1}}%
   \ifnum\driver@release>5 %
-    \ifnum\driver@release<8 %
+    \ifnum\driver@release<9 %
       \def\Gin@extensions{%
         .png,.pdf,.jpg,.mps,.tif,.jpeg,%
         .PNG,.PDF,.JPG,.JPEG%
       }%
-      \@namedef{Gin@rule@.tif}#1{{tif}{.tif}{#1}}
+      \@namedef{Gin@rule@.tif}#1{{tif}{.tif}{#1}}%
     \else
-      \ifnum\driver@release>8 %
+      \ifnum\driver@release>9 %
         \ifnum\pdfminorversion>3 %
           \def\Gin@extensions{%
             .png,.pdf,.jpg,.mps,.jpeg,.jbig2,.jb2,%
             .PNG,.PDF,.JPG,.JPEG,.JBIG2,.JB2%
           }%
         \fi
-        \@namedef{Gin@rule@.jb2}#1{{jbig2}{.jb2}{#1}}
-        \@namedef{Gin@rule@.jbig2}#1{{jbig2}{.jbig2}{#1}}
+        \@namedef{Gin@rule@.jb2}#1{{jbig2}{.jb2}{#1}}%
+        \@namedef{Gin@rule@.jbig2}#1{{jbig2}{.jbig2}{#1}}%
       \fi
     \fi
   \fi
 \else
-  \def\Gin@extensions{.png,.pdf,.mps,.PNG,.PDF}
+  \def\Gin@extensions{.png,.pdf,.mps,.PNG,.PDF}%
 \fi
 \@namedef{Gin@rule@.png}#1{{png}{.png}{#1}}
 \@namedef{Gin@rule@.PNG}#1{{png}{.PNG}{#1}}
@@ -1027,7 +1035,7 @@ E     \else
     }%
     \wd\z@\z@
   }%
-  \def\Grot@end{\pdfrestore}
+  \def\Grot@end{\pdfrestore}%
   \def\Gscale@start{%
     \pdfsave
     \pdfsetmatrix{%
@@ -1069,7 +1077,7 @@ E     \else
       \pdfpagewidth\paperwidth
     \fi
   \fi
-  \pdfoutput=1
+  \pdfoutput=1 %
 \fi
 
 
diff --git a/Master/texmf-dist/tpm/pdftex-def.tpm b/Master/texmf-dist/tpm/pdftex-def.tpm
index f46de856008..74e031890cb 100644
--- a/Master/texmf-dist/tpm/pdftex-def.tpm
+++ b/Master/texmf-dist/tpm/pdftex-def.tpm
@@ -9,10 +9,10 @@
     <TPM:Title>The pdftex-def package.</TPM:Title>
     <TPM:Description></TPM:Description>
     <TPM:Author></TPM:Author>
-    <TPM:Size>32740</TPM:Size>
+    <TPM:Size>33456</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="33456">
+    <TPM:RunFiles size="33873">
 texmf-dist/tex/latex/pdftex-def/pdftex.def
 texmf-dist/tpm/pdftex-def.tpm
     </TPM:RunFiles>