eso-pic update (8jun10)

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

2 files changed, 127 insertions, 76 deletions

diff --git a/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx b/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx
index 443258ae40f..293fbcaab10 100644
--- a/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx
+++ b/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1998-2009 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+% Copyright (C) 1998-2010 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
 % -------------------------------------------------------------------
 % 
 % This file may be distributed and/or modified under the
@@ -25,7 +25,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{eso-pic}
-%<package>   [2009/10/07 v2.0a eso-pic (RN)]
+%<package>   [2010/06/08 v2.0b eso-pic (RN)]
 %
 %<*driver>
 \documentclass[a4paper]{ltxdoc}
@@ -37,7 +37,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{681}
+% \CheckSum{745}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -60,7 +60,7 @@
 %  @LaTeX-package-file{
 %    author         = {Rolf Niepraschk},
 %    version        = "v2.0a",
-%    date           = "07 Oct 2009",
+%    date           = "08 Jun 2010",
 %    filename       = "eso-pic.sty",
 %    address        = "",
 %    telephone      = "",
@@ -118,28 +118,47 @@
 %   See also the example \LaTeX\ documents (|eso-*.tex|).
 %
 %  \subsection{Basic commands for adding \LaTeX{} stuff to the page background}
-%  \DescribeMacro{\AddToShipoutPicture} All the picture commands which are
-%  parameters of an \cs{AddToShipoutPicture} command will be added to the 
-%  internal macro \cs{ESO@HookI}. This macro is part of a 
+%  \DescribeMacro{\AddToShipoutPictureBG} All the picture commands which are
+%  parameters of an \cs{AddToShipoutPictureBG} command will be added to the 
+%  internal macro \cs{ESO@HookIBG}. This macro is part of a 
 %  zero-length \texttt{picture} environment with basepoint at the lower left 
 %  corner of the page (default) or at the upper left corner 
 %  (package option "texcoord"). The \texttt{picture} environment will be 
 %  shipped out at every new page.
+%  
+%  \DescribeMacro{\AddToShipoutPictureBG*} \cs{AddToShipoutPictureBG*} works like 
+%  \cs{AddToShipoutPictureBG} but only for the current page. It used the internal
+%  macro \cs{ESO@HookIIBG} which contents will be removed 
+%  automatically.
+%  
+%  For compatibility the macros \cs{AddToShipoutPicture} and 
+%  \cs{AddToShipoutPicture*} are aliases for \cs{AddToShipoutPictureBG} 
+%  and \cs{AddToShipoutPictureBG*}.
+%  
+%  \DescribeMacro{\AddToShipoutPictureFG}
+%  \DescribeMacro{\AddToShipoutPictureFG*} Works like 
+%  \cs{AddToShipoutPictureBG} but the picture commands are on the top 
+%  oft the normal document content.
 %
-%  \DescribeMacro{\ClearShipoutPicture} A call of \cs{ClearShipoutPicture} 
-%  clears the contents of \cs{ESO@HookI}. 
+%  \DescribeMacro{\ClearShipoutPictureBG} A call of 
+%  \cs{ClearShipoutPictureBG} 
+%  clears the contents of \cs{ESO@HookIBG}. 
+%
+%  For compatibility the macro \cs{ClearShipoutPicture} 
+%  is an alias for \cs{ClearShipoutPictureBG}.
 %  
-%  \DescribeMacro{\AddToShipoutPicture*} \cs{AddToShipoutPicture*} works like 
-%  \cs{AddToShipoutPicture} but only for the current page. It used the internal
-%  macro \cs{ESO@HookII} which contents will be removed automatically.
+%  \DescribeMacro{\ClearShipoutPictureFG} A call of 
+%  \cs{ClearShipoutPictureFG} 
+%  clears the contents of \cs{ESO@HookIFG}. 
 %
-%  \DescribeMacro{\LenToUnit} Allows a length as parameter to a picture
-%    command.
+%   \DescribeMacro{\LenToUnit} Allows a length as parameter to a picture
+%    command. Note that this macro is no more necessary when using 
+%      |\usepackage{picture}|.
 %
 %  \DescribeMacro{\gridSetup} 
 %   \cmd{\gridSetup}\oarg{gridunitname}\marg{gridunit}\marg{labelfactor}^^A
 %     \marg{griddelta} \marg{gridDelta}\marg{gap}. For details see the 
-%     implementation section.\par
+%     implementation section.\par\clearpage
 %  \DescribeMacro{\AtPageUpperLeft}
 %  \DescribeMacro{\AtPageLowerLeft}
 %  \DescribeMacro{\AtPageCenter} 
@@ -149,7 +168,7 @@
 %  \DescribeMacro{\AtStockUpperLeft}
 %  \DescribeMacro{\AtStockLowerLeft}
 %  \DescribeMacro{\AtStockCenter} 
-%    Helper macros for easier positioning on the page.  \vfill\mbox{}
+%    Helper macros for easier positioning on the page. 
 %
 %  \subsection{Package options}
 %  \begin{center}
@@ -332,35 +351,63 @@
   \put(\LenToUnit{.5\textwidth},\LenToUnit{-.5\textheight}){#1}}}
 %    \end{macrocode}
 % \end{macro}
-% \DescribeMacro{\ESO@HookI}\DescribeMacro{\ESO@HookII}
-% \DescribeMacro{\ESO@HookIII}
+% \DescribeMacro{\ESO@HookIBG}\DescribeMacro{\ESO@HookIIBG}
+% \DescribeMacro{\ESO@HookIIIBG}\DescribeMacro{\ESO@HookIFG}
+% \DescribeMacro{\ESO@HookIIFG}
 %    \begin{macrocode}
-\newcommand{\ESO@HookI}{} 
+\newcommand{\ESO@HookIBG}{}
+\newcommand{\ESO@HookIIBG}{}
+\newcommand{\ESO@HookIIIBG}{}
+\newcommand{\ESO@HookIFG}{}
+\newcommand{\ESO@HookIIFG}{}
+\newcommand{\ESO@HookI}{}
 \newcommand{\ESO@HookII}{}
 \newcommand{\ESO@HookIII}{}
+\let\ESO@HookI=\ESO@HookIBG
+\let\ESO@HookII=\ESO@HookIIBG
+\let\ESO@HookIII=\ESO@HookIIIBG
 %    \end{macrocode}
-% \begin{macro}{\AddToShipoutPicture}
+% \begin{macro}{\AddToShipoutPictureBG}
+% \begin{macro}{\AddToShipoutPictureFG}
+% \changes{v2.0b}{2010/06/08}{New command \cmd{\AddToShipoutPictureFG}}
 %    \begin{macrocode}
-\newcommand{\AddToShipoutPicture}{%
-  \@ifstar{\g@addto@macro\ESO@HookII}{\g@addto@macro\ESO@HookI}}
+\newcommand{\AddToShipoutPictureBG}{%
+  \@ifstar{\g@addto@macro\ESO@HookIIBG}{\g@addto@macro\ESO@HookIBG}}
+\newcommand{\AddToShipoutPicture}{}
+\let\AddToShipoutPicture=\AddToShipoutPictureBG
+%    \end{macrocode}  
+% \end{macro}
+% \end{macro}
+% \begin{macro}{\AddToShipoutPictureFG}
+%    \begin{macrocode}
+\newcommand{\AddToShipoutPictureFG}{%
+  \@ifstar{\g@addto@macro\ESO@HookIIFG}{\g@addto@macro\ESO@HookIFG}}
 %    \end{macrocode}  
 % \end{macro}  
+% \begin{macro}{\ClearShipoutPictureBG}
 % \begin{macro}{\ClearShipoutPicture}
+% \begin{macro}{\ClearShipoutPictureFG}
 % \changes{v1.0a}{2002/10/07}{Changed \cmd{\let} to 
 %   \cmd{\global}\cmd{\let} (suggested by Alberto Lusiani).}
 %    \begin{macrocode}
-\newcommand{\ClearShipoutPicture}{\global\let\ESO@HookI\@empty}
+\newcommand{\ClearShipoutPictureBG}{\global\let\ESO@HookIBG\@empty}
+\newcommand{\ClearShipoutPicture}{}
+\let\ClearShipoutPicture=\ClearShipoutPictureBG
+\newcommand{\ClearShipoutPictureFG}{\global\let\ESO@HookIFG\@empty}
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
+% \end{macro}
 % \begin{macro}{\AtBeginShipout}
 % \begin{macro}{\AtBeginShipoutUpperLeft}
+% \begin{macro}{\AtBeginShipoutUpperLeftForeground}
 % (see package \pkgname{atbegshi})
 %    \begin{macrocode}
 \ESO@isMEMOIR{%
   \AtBeginShipout{%
     \@tempdima=-\trimedge
     \advance\@tempdima-\paperwidth
-    \advance\@tempdima\stockwidth  
+    \advance\@tempdima\stockwidth
     \if@twoside\ifodd\c@page\else
       \advance\@tempdima2\trimedge
       \advance\@tempdima\paperwidth
@@ -371,8 +418,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
       }%
     }%
   }
@@ -381,8 +434,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
       }%
     }%
   }
@@ -390,6 +449,7 @@
 %    \end{macrocode}  
 % \end{macro}
 % \end{macro}
+% \end{macro}
 % \subsection{The background grid}
 %    \begin{macrocode}
 \RequirePackage{keyval}
@@ -609,11 +669,11 @@
 }
 %    \end{macrocode}  
 %    \end{macro}    
-%  Add the grid to the shipout picture (\cmd{\ESO@HookIII} is independed 
+%  Add the grid to the shipout picture (\cmd{\ESO@HookIIIBG} is independed 
 %  from the user commands 
-%  \cmd{\AddToShipoutPicture} and \cmd{\AddToShipoutPicture*}).
+%  \cmd{\AddToShipoutPictureBG} and \cmd{\AddToShipoutPictureBG*}).
 %    \begin{macrocode}   
-\ifESO@grid\g@addto@macro\ESO@HookIII{\ESO@gridpicture}\fi
+\ifESO@grid\g@addto@macro\ESO@HookIIIBG{\ESO@gridpicture}\fi
 %    \end{macrocode} 
 %
 % \Finale
diff --git a/Master/texmf-dist/source/latex/eso-pic/eso-pic.ins b/Master/texmf-dist/source/latex/eso-pic/eso-pic.ins
index 8becc8776e9..164a94e2bf8 100644
--- a/Master/texmf-dist/source/latex/eso-pic/eso-pic.ins
+++ b/Master/texmf-dist/source/latex/eso-pic/eso-pic.ins
@@ -1,56 +1,47 @@
-%%
-%% Copyright (C) 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:
-%% 
-%%    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.
-%%
-
-\input docstrip.tex
-\keepsilent
-\askforoverwritefalse
-\preamble
 
-This is a generated file.
+\input docstrip
+
+\preamble
 
-Copyright (C) 1998-2009 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+Copyright (C) 2010
+Rolf Niepraschk <Rolf.Niepraschk@gmx.de> and
 
-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".
 
 \endpreamble
 
-\generate{\file{eso-pic.sty}{\from{eso-pic.dtx}{package}}}
-
-\Msg{***************************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the following}
-\Msg{* file into a directory searched by TeX:}
-\Msg{*}
-\Msg{* \space\space eso-pic.sty}
-\Msg{*}
-\Msg{* To produce the documentation run the file eso-pic.dtx}
-\Msg{* through LaTeX.}
-\Msg{*}
-\Msg{* For a list of changes, process the file eso-pic.glo by:}
-\Msg{*}
-\Msg{* \space\space makeindex -s gglo.ist -o eso-pic.gls eso-pic.glo}
-\Msg{*}
-\Msg{*}
-\Msg{* Happy TeXing}
-\Msg{***********************************************************}
+\keepsilent
+\askforoverwritefalse
+
+\usedir{tex/latex/contrib/eso-pic}
+
+\generate{
+  \file{eso-pic.sty}{\from{eso-pic.dtx}{package}}
+}
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{*                                                           *}
+\Msg{* To finish the installation you have to move the following *}
+\Msg{* file into a directory searched by TeX:                    *}
+\Msg{*                                                           *}
+\Msg{*     eso-pic.sty                                           *}
+\Msg{*                                                           *}
+\Msg{* To produce the documentation run the file eso-pic.dtx     *}
+\Msg{* through LaTeX.                                            *}
+\Msg{*                                                           *}
+\Msg{* Happy TeXing!                                             *}
+\Msg{*                                                           *}
+\Msg{*************************************************************}
 
 \endbatchfile