From efa300558205320b779ab9de9ac92cc0b6c1872e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 10 Oct 2013 22:27:56 +0000 Subject: eso-pic (10oct13) git-svn-id: svn://tug.org/texlive/trunk@31875 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 221566 -> 248747 bytes Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx | 28 ++++++++---- Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty | 24 ++++++++--- 4 files changed, 37 insertions(+), 63 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/eso-pic/eso-ex6.tex (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex6.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex6.tex deleted file mode 100644 index 991454014c3..00000000000 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex6.tex +++ /dev/null @@ -1,48 +0,0 @@ - -\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 0ce3a4507f3..c8fe544e0d3 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 9872dcaa713..497bc1b7f2b 100644 --- a/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx +++ b/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx @@ -25,7 +25,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{eso-pic} -% [2010/10/06 v2.0c eso-pic (RN)] +% [2013/10/06 v2.0d eso-pic (RN)] % %<*driver> \documentclass[a4paper]{ltxdoc} @@ -37,7 +37,7 @@ % % \fi % -% \CheckSum{745} +% \CheckSum{751} % % \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 @@ -476,11 +476,11 @@ \newcommand*\ESO@vline[1]{\ESO@subgridlines\line(0,1){#1}} \newcommand*\ESO@Hline[1]{\ESO@gridlines\line(1,0){#1}} \newcommand*\ESO@Vline[1]{\ESO@gridlines\line(0,1){#1}} -\newcommand\ESO@fcolorbox[4][]{\fbox{#4}} +\newcommand\ESO@fcolorbox[3]{\fbox{#3}} \newcommand\ESO@color[1]{} -\newcommand\ESO@colorbox[3][]{% +\newcommand\ESO@colorbox[2]{% \begingroup - \fboxrule=\z@\fbox{#3}% + \fboxrule=\z@\fbox{#2}% \endgroup } % \end{macrocode} @@ -556,14 +556,25 @@ % \changes{v1.1c}{2005/12/24}{Remove the disadvantageous check of % `pdfTeX'. Now using with Xe\LaTeX\ should be possible.} % \changes{v2.0a}{2009/10/07}{Better test of color/xcolor} +% \changes{v2.0d}{2013/10/06}{Improved color commands} % \begin{macrocode} \@ifundefined{colorbox}{% \IfFileExists{xcolor.sty}{\RequirePackage{xcolor}}% {\RequirePackage{color}}% }{}% \let\ESO@color=\color -\let\ESO@colorbox=\colorbox -\let\ESO@fcolorbox=\fcolorbox +\renewcommand\ESO@colorbox[2]{% + \begingroup + \fboxsep=.4ex % + \colorbox{#1}{#2}% + \endgroup +} +\renewcommand\ESO@fcolorbox[3]{% + \begingroup + \fboxsep=.5ex % + \fcolorbox{#1}{#2}{#3}% + \endgroup +} \AtBeginDocument{% \ESO@dvipsfalse \@ifundefined{Gin@driver}{}% @@ -674,8 +685,9 @@ % Add the grid to the shipout picture (\cmd{\ESO@HookIIIBG} is independed % from the user commands % \cmd{\AddToShipoutPictureBG} and \cmd{\AddToShipoutPictureBG*}). +% \changes{v2.0d}{2013/10/06}{grid should be in foreground} % \begin{macrocode} -\ifESO@grid\g@addto@macro\ESO@HookIIIBG{\ESO@gridpicture}\fi +\ifESO@grid\g@addto@macro\ESO@HookIFG{\ESO@gridpicture}\fi % \end{macrocode} % % \Finale 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 5ae84afb890..596b4f011f9 100644 --- a/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty +++ b/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{eso-pic} - [2010/10/06 v2.0c eso-pic (RN)] + [2013/10/06 v2.0d eso-pic (RN)] \RequirePackage{atbegshi} \providecommand*\LenToUnit[1]{#1\@gobble} \newcommand\ESO@isMEMOIR[2]{#2} @@ -199,11 +199,11 @@ \newcommand*\ESO@vline[1]{\ESO@subgridlines\line(0,1){#1}} \newcommand*\ESO@Hline[1]{\ESO@gridlines\line(1,0){#1}} \newcommand*\ESO@Vline[1]{\ESO@gridlines\line(0,1){#1}} -\newcommand\ESO@fcolorbox[4][]{\fbox{#4}} +\newcommand\ESO@fcolorbox[3]{\fbox{#3}} \newcommand\ESO@color[1]{} -\newcommand\ESO@colorbox[3][]{% +\newcommand\ESO@colorbox[2]{% \begingroup - \fboxrule=\z@\fbox{#3}% + \fboxrule=\z@\fbox{#2}% \endgroup } \newcommand\gridSetup[6][]{% @@ -260,8 +260,18 @@ {\RequirePackage{color}}% }{}% \let\ESO@color=\color -\let\ESO@colorbox=\colorbox -\let\ESO@fcolorbox=\fcolorbox +\renewcommand\ESO@colorbox[2]{% + \begingroup + \fboxsep=.4ex % + \colorbox{#1}{#2}% + \endgroup +} +\renewcommand\ESO@fcolorbox[3]{% + \begingroup + \fboxsep=.5ex % + \fcolorbox{#1}{#2}{#3}% + \endgroup +} \AtBeginDocument{% \ESO@dvipsfalse \@ifundefined{Gin@driver}{}% @@ -342,7 +352,7 @@ \normalcolor% \endgroup } -\ifESO@grid\g@addto@macro\ESO@HookIIIBG{\ESO@gridpicture}\fi +\ifESO@grid\g@addto@macro\ESO@HookIFG{\ESO@gridpicture}\fi \endinput %% %% End of file `eso-pic.sty'. -- cgit v1.2.3