summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-04-22 17:17:44 +0000
committerKarl Berry <karl@freefriends.org>2007-04-22 17:17:44 +0000
commit8a756de114b8f79175c82eecacd9a7c87546982f (patch)
tree7dfcd38cfe2371779588a479a24fd2cd499e00b7 /Master
parent5fdc1983dd12ec0b4ec68aad3d0c6ab016207208 (diff)
pdftex-def 0.04g (17apr07)
git-svn-id: svn://tug.org/texlive/trunk@4174 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/tex/latex/pdftex-def/pdftex.def37
-rw-r--r--Master/texmf-dist/tpm/pdftex-def.tpm4
2 files changed, 32 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def b/Master/texmf-dist/tex/latex/pdftex-def/pdftex.def
index cfebffba882..f9a29a7d7e5 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/06 v0.04f Graphics/color for pdfTeX]
+\ProvidesFile{pdftex.def}[2007/04/17 v0.04g Graphics/color for pdfTeX]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% LaTeX Colour and Graphics support for PDFTeX
@@ -160,6 +160,9 @@
% the images contain their own color settings.
% If option `resetcolor' is set to `true', then the current color
% is reset to \normalcolor during image inclusion.
+% 2007/04/17 v0.04g (HO)
+% * Small improvement of robustness of \pagecolor
+% and using e-TeX if available.
%
% prefix of internal commands for this file `pdftex.def':
% \GPT@ (Graphics bundle PdfTex driver)
@@ -376,6 +379,14 @@
\def\no@page@color{%
\global\GPT@pagecolorfalse
}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname currentgrouplevel\endcsname\relax
+ \catcode`X=9 % ignore
+ \catcode`E=14 % comment
+\else
+ \catcode`X=14 % comment
+ \catcode`E=9 % ignore
+\fi
\def\set@page@color{%
\global\GPT@pagecolortrue
\global\let\current@page@color\current@color
@@ -386,23 +397,33 @@
\@ifundefined{GPTorg@shipout}{%
\global\let\GPTorg@shipout\shipout
\gdef\shipout{%
+X % ensure \GPT@outputbox is really void
+X \begingroup
+X \setbox\GPT@outputbox=\box\GPT@outputbox
+X \endgroup
+E \edef\GPT@saved@grouplevel{\number\currentgrouplevel}%
\afterassignment\GPT@shipout
\global\setbox\GPT@outputbox=%
}%
\gdef\GPT@shipout{%
+X \ifvoid\GPT@outputbox\relax
+E \ifnum\GPT@saved@grouplevel=\currentgrouplevel
+E \else
+ \expandafter\aftergroup
+ \fi
+ \GPT@@shipout
+ }%
+ \gdef\GPT@@shipout{%
\ifvoid\GPT@outputbox\relax
- \aftergroup\GPT@@shipout
- \GPT@pageliteral
+ \GPT@warn{Ignoring void output box}%
\else
- \GPTorg@shipout\vbox{%
+ \setbox\GPT@outputbox=\vbox{%
\GPT@pageliteral
\box\GPT@outputbox
}%
+ \GPTorg@shipout\box\GPT@outputbox\relax
\fi
}%
- \gdef\GPT@@shipout{%
- \GPTorg@shipout\box\GPT@outputbox\relax
- }%
\gdef\GPT@pageliteral{%
\ifGPT@pagecolor
\pdfliteral page{%
@@ -419,6 +440,8 @@
}%
}{}%
}
+\catcode`\X=11 %
+\catcode`\E=11 %
% Need the `colorfix' modifications as no internal colour stack
% is maintained
diff --git a/Master/texmf-dist/tpm/pdftex-def.tpm b/Master/texmf-dist/tpm/pdftex-def.tpm
index bc227413d13..f46de856008 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>31652</TPM:Size>
+ <TPM:Size>32740</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="32740">
+ <TPM:RunFiles size="33456">
texmf-dist/tex/latex/pdftex-def/pdftex.def
texmf-dist/tpm/pdftex-def.tpm
</TPM:RunFiles>