summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/eso-pic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-10 22:27:56 +0000
committerKarl Berry <karl@freefriends.org>2013-10-10 22:27:56 +0000
commitefa300558205320b779ab9de9ac92cc0b6c1872e (patch)
tree8eef658be7076e058227ec1df7bef33e5e0a9e37 /Master/texmf-dist/source/latex/eso-pic
parent902eb7f3759df28b9ccead1963d456a85da3263c (diff)
eso-pic (10oct13)
git-svn-id: svn://tug.org/texlive/trunk@31875 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/eso-pic')
-rw-r--r--Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx28
1 files changed, 20 insertions, 8 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 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
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{eso-pic}
-%<package> [2010/10/06 v2.0c eso-pic (RN)]
+%<package> [2013/10/06 v2.0d eso-pic (RN)]
%
%<*driver>
\documentclass[a4paper]{ltxdoc}
@@ -37,7 +37,7 @@
%</driver>
% \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