From cbff04af8ef44a84b301ef7e606946111c6b2676 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 9 Jun 2010 22:19:07 +0000 Subject: eso-pic update (8jun10) git-svn-id: svn://tug.org/texlive/trunk@18847 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/eso-pic/eso-ex6.tex | 48 ++++++++ Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf | Bin 260855 -> 196780 bytes Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx | 122 +++++++++++++++------ Master/texmf-dist/source/latex/eso-pic/eso-pic.ins | 81 ++++++-------- Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty | 66 +++++++---- 5 files changed, 222 insertions(+), 95 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/eso-pic/eso-ex6.tex diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex6.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex6.tex new file mode 100644 index 00000000000..991454014c3 --- /dev/null +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex6.tex @@ -0,0 +1,48 @@ + +\listfiles +\documentclass{article} +\usepackage{eso-pic,xcolor,pict2e,picture} +\usepackage[latin1]{inputenc} +\usepackage[T1]{fontenc} +\usepackage[english]{babel} +\usepackage{blindtext} + +\newcommand*\Bild{} + +\AddToShipoutPictureBG{ + \AtTextCenter{ + \put(10mm,10mm){% + \textcolor{blue!30}{\circle*{.5\textwidth}}}% + }% +} +% ^^-- The same as \AddToShipoutPicture + +\AddToShipoutPictureFG{ + \AtTextCenter{ + \put(-10mm,-10mm){% + \textcolor{green!30}{\circle*{.5\textwidth}}}% + }% +} + +\begin{document} + +\blindtext\par\blindtext\par +\blindtext\par\blindtext\par +\blindtext \newpage + +\ClearShipoutPictureFG + +\blindtext\par\blindtext\par +\blindtext\par\blindtext\par +\blindtext \newpage + +\ClearShipoutPictureBG +% ^^-- The same as \ClearShipoutPicture + +\blindtext\par\blindtext\par +\blindtext\par\blindtext\par +\blindtext + +\end{document} + + diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf b/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf index 3d38963ab8d..c5e1124aa22 100644 Binary files a/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf and b/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf differ 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 +% Copyright (C) 1998-2010 by Rolf Niepraschk % ------------------------------------------------------------------- % % This file may be distributed and/or modified under the @@ -25,7 +25,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{eso-pic} -% [2009/10/07 v2.0a eso-pic (RN)] +% [2010/06/08 v2.0b eso-pic (RN)] % %<*driver> \documentclass[a4paper]{ltxdoc} @@ -37,7 +37,7 @@ % % \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 -%% -%% 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 +Copyright (C) 2010 +Rolf Niepraschk 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 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 and %% -%% Copyright (C) 1998-2009 by Rolf Niepraschk -%% -%% 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'. -- cgit v1.2.3