From a9502e7a832eee7a924f5f6bdaccddef01bf5b74 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 9 Jan 2007 01:34:46 +0000
Subject: pdftex.def 0.04d

git-svn-id: svn://tug.org/texlive/trunk@3259 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/pdftex-def/pdftex.def | 54 ++++++++++++++++++-----
 Master/texmf-dist/tpm/pdftex-def.tpm              |  2 +-
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def b/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def
index d9106c92639..b6f393eb6c4 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/01/02 v0.04b Graphics/color for pdfTeX]
+\ProvidesFile{pdftex.def}[2007/01/08 v0.04d Graphics/color for pdfTeX]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% LaTeX Colour and Graphics support for PDFTeX
@@ -6,7 +6,7 @@
 %% License
 %% =======
 %%
-%% Copyright (C) 2000-2006 David Carlisle, Sebastian Rahtz, Hans Hagen,
+%% Copyright (C) 2000-2007 David Carlisle, Sebastian Rahtz, Hans Hagen,
 %% Heiko Oberdiek and Martin Schr\"oder
 %%
 %% This work may be distributed and/or modified under the
@@ -142,6 +142,13 @@
 %    should be redefined, if someone wants to use another color stack
 %    (e.g. for footnotes). \main@pdfcolorstack should not be changed
 %    for this purpose.
+% 2007/01/06 v0.04c (HO)
+%  * Support for JBIG2 added (pdfTeX 1.40.0).
+% 2007/01/08 v0.04d (HO)
+%  * Bug fix: .mps forgotten for extension list if pdfTeX >= 1.40.0
+%  * .jbig2 and .jb2 are not listed in the extension list
+%    if \pdfminorversion < 4. Thus \pdfminorversion should have
+%    the correct value, if pdftex.def is loaded.
 %
 % prefix of internal commands for this file `pdftex.def':
 %   \GPT@ (Graphics bundle PdfTex driver)
@@ -207,8 +214,13 @@
           \ifnum\pdftexversion<110
             \def\driver@release{7}%
           \else
-            % .tif support was dropped in pdfTeX 1.10a
-            \def\driver@release{8}%
+            \ifnum\pdftexversion<140
+              % .tif support was dropped in pdfTeX 1.10a
+              \def\driver@release{8}%
+            \else
+              % JBIG2 support added in pdfTeX 1.40.0
+              \def\driver@release{9}%
+            \fi
           \fi
         \fi
       \fi
@@ -848,17 +860,24 @@
   }%
 }
 \def\Gread@mps{\Gread@eps}
-\ifnum\driver@release>5
-  \let\Gread@tif\Gread@pdfbitmap
-  \let\Ginclude@tif\Ginclude@pdftex
-\fi
-\ifnum\driver@release>3
+\ifnum\driver@release>3 %
   \let\Ginclude@png\Ginclude@pdftex
   \let\Ginclude@jpg\Ginclude@pdftex
   \let\Ginclude@pdf\Ginclude@pdftex
   \let\Gread@pdf\Gread@pdftex
   \let\Gread@png\Gread@pdfbitmap
   \let\Gread@jpg\Gread@pdfbitmap
+  \ifnum\driver@release>5 %
+    \ifnum\driver@release<8 %
+      \let\Gread@tif\Gread@pdfbitmap
+      \let\Ginclude@tif\Ginclude@pdftex
+    \else
+      \ifnum\driver@release>8 %
+        \expandafter\let\csname Gread@jbig2\endcsname\Gread@pdfbitmap
+        \expandafter\let\csname Ginclude@jbig2\endcsname\Ginclude@pdftex
+      \fi
+    \fi
+  \fi
 \else
   \def\Ginclude@pdf#1{%
     \def\@tempa{!}%
@@ -876,19 +895,30 @@
 
 % v0.02e: restrict the rules to just the types that pdftex can currently
 % deal with.
-\ifnum\driver@release>3
+\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}}
-  \ifnum\driver@release>5
-    \ifnum\driver@release<8
+  \ifnum\driver@release>5 %
+    \ifnum\driver@release<8 %
       \def\Gin@extensions{%
         .png,.pdf,.jpg,.mps,.tif,.jpeg,%
         .PNG,.PDF,.JPG,.JPEG%
       }%
       \@namedef{Gin@rule@.tif}#1{{tif}{.tif}{#1}}
+    \else
+      \ifnum\driver@release>8 %
+        \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}}
+      \fi
     \fi
   \fi
 \else
diff --git a/Master/texmf-dist/tpm/pdftex-def.tpm b/Master/texmf-dist/tpm/pdftex-def.tpm
index 9dd732d4f0f..f6e75e33b4f 100644
--- a/Master/texmf-dist/tpm/pdftex-def.tpm
+++ b/Master/texmf-dist/tpm/pdftex-def.tpm
@@ -12,7 +12,7 @@
     <TPM:Size>30444</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="30444">
+    <TPM:RunFiles size="31553">
 texmf-dist/tex/latex/pdftex-def/pdftex.def
 texmf-dist/tpm/pdftex-def.tpm
     </TPM:RunFiles>
-- 
cgit v1.2.3