eso-pic update (8jun10)

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

1 files changed, 47 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty b/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
index 4fb6031ce1e..80887196f7f 100644
--- a/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
+++ b/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
@@ -6,23 +6,24 @@
 %%
 %% eso-pic.dtx  (with options: `package')
 %% 
-%% This is a generated file.
+%% Copyright (C) 2010
+%% Rolf Niepraschk <Rolf.Niepraschk@gmx.de> and
 %% 
-%% Copyright (C) 1998-2009 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
-%% 
-%% This file may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, either version 1.2 of this license
-%% or (at your option) any later version.  The latest version of this
-%% license is in:
+%% This file may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in:
 %% 
 %%    http://www.latex-project.org/lppl.txt
 %% 
-%% and version 1.2 or later is part of all distributions of LaTeX version
-%% 1999/12/01 or later.
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "author-maintained".
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{eso-pic}
-   [2009/10/07 v2.0a eso-pic (RN)]
+   [2010/06/08 v2.0b eso-pic (RN)]
 \RequirePackage{atbegshi}
 \providecommand*\LenToUnit[1]{#1\@gobble}
 \newcommand\ESO@isMEMOIR[2]{#2}
@@ -115,12 +116,27 @@
   \put(0,\LenToUnit{-\textheight}){#1}}}
 \newcommand\AtTextCenter[1]{\AtTextUpperLeft{%
   \put(\LenToUnit{.5\textwidth},\LenToUnit{-.5\textheight}){#1}}}
+\newcommand{\ESO@HookIBG}{}
+\newcommand{\ESO@HookIIBG}{}
+\newcommand{\ESO@HookIIIBG}{}
+\newcommand{\ESO@HookIFG}{}
+\newcommand{\ESO@HookIIFG}{}
 \newcommand{\ESO@HookI}{}
 \newcommand{\ESO@HookII}{}
 \newcommand{\ESO@HookIII}{}
-\newcommand{\AddToShipoutPicture}{%
-  \@ifstar{\g@addto@macro\ESO@HookII}{\g@addto@macro\ESO@HookI}}
-\newcommand{\ClearShipoutPicture}{\global\let\ESO@HookI\@empty}
+\let\ESO@HookI=\ESO@HookIBG
+\let\ESO@HookII=\ESO@HookIIBG
+\let\ESO@HookIII=\ESO@HookIIIBG
+\newcommand{\AddToShipoutPictureBG}{%
+  \@ifstar{\g@addto@macro\ESO@HookIIBG}{\g@addto@macro\ESO@HookIBG}}
+\newcommand{\AddToShipoutPicture}{}
+\let\AddToShipoutPicture=\AddToShipoutPictureBG
+\newcommand{\AddToShipoutPictureFG}{%
+  \@ifstar{\g@addto@macro\ESO@HookIIFG}{\g@addto@macro\ESO@HookIFG}}
+\newcommand{\ClearShipoutPictureBG}{\global\let\ESO@HookIBG\@empty}
+\newcommand{\ClearShipoutPicture}{}
+\let\ClearShipoutPicture=\ClearShipoutPictureBG
+\newcommand{\ClearShipoutPictureFG}{\global\let\ESO@HookIFG\@empty}
 \ESO@isMEMOIR{%
   \AtBeginShipout{%
     \@tempdima=-\trimedge
@@ -136,8 +152,14 @@
     \nointerlineskip
     \AtBeginShipoutUpperLeft{%
       \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
-        \ESO@HookIII\ESO@HookI\ESO@HookII
-        \global\let\ESO@HookII\@empty
+        \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG
+        \global\let\ESO@HookIIBG\@empty
+      }%
+    }%
+    \AtBeginShipoutUpperLeftForeground{%
+      \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
+        \ESO@HookIBG\ESO@HookIIBG
+        \global\let\ESO@HookIIBG\@empty
       }%
     }%
   }
@@ -146,8 +168,14 @@
     \nointerlineskip
     \AtBeginShipoutUpperLeft{%
       \put(0,\LenToUnit{\ESO@yoffsetI}){%
-        \ESO@HookIII\ESO@HookI\ESO@HookII
-        \global\let\ESO@HookII\@empty
+        \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG
+        \global\let\ESO@HookIIBG\@empty
+      }%
+    }%
+    \AtBeginShipoutUpperLeftForeground{%
+      \put(0,\LenToUnit{\ESO@yoffsetI}){%
+        \ESO@HookIFG\ESO@HookIIFG
+        \global\let\ESO@HookIIFG\@empty
       }%
     }%
   }
@@ -255,7 +283,7 @@
         (0,0)(0,##1)}
     }{}
   \else
-    \ifx\ESO@gridcolor\ESO@subgridcolor%
+    \ifx\ESO@gridcolor\ESO@subgridcolor
       \renewcommand*\ESO@gridlines{\thicklines}
     \fi
   \fi
@@ -314,7 +342,7 @@
     \normalcolor%
   \endgroup
 }
-\ifESO@grid\g@addto@macro\ESO@HookIII{\ESO@gridpicture}\fi
+\ifESO@grid\g@addto@macro\ESO@HookIIIBG{\ESO@gridpicture}\fi
 \endinput
 %%
 %% End of file `eso-pic.sty'.