summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-22 23:00:41 +0000
committerKarl Berry <karl@freefriends.org>2015-07-22 23:00:41 +0000
commitaf5d616299af5e2cf9a727ba04285bc1cb9de3e1 (patch)
tree7665dc45722449543a24392fc6b764689e6590f9 /Master/texmf-dist
parent276fd5507c7ac807f3da11501d4f3323e4edc3a4 (diff)
eso-pic (22jul15)
git-svn-id: svn://tug.org/texlive/trunk@37925 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex2
-rw-r--r--Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdfbin249688 -> 250481 bytes
-rw-r--r--Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx32
-rw-r--r--Master/texmf-dist/source/latex/eso-pic/eso-pic.ins4
-rw-r--r--Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty20
5 files changed, 40 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex
index 36d2e4382f6..6c6e1e9ea5e 100644
--- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex
+++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex
@@ -12,7 +12,7 @@
\usepackage[dvips]{geometry}
% `dvips', `pdfTeX' and `VTeX' should know the papersize.
-\usepackage[colorgrid,gridunit=mm,texcoord]{eso-pic}
+\usepackage[colorgrid,gridBG=true,gridunit=mm,texcoord]{eso-pic}
%\usepackage[colorgrid,gridunit=in,subgridcolor=blue,texcoord]{eso-pic}
%\usepackage[grid,gridunit=bp,subgridstyle=dotted]{eso-pic}
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 e1b544e9faa..e4cf2ba69eb 100644
--- a/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf
+++ b/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf
Binary files 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 fea95dd2e1e..2093d3c376f 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> [2015/07/14 v2.0f eso-pic (RN)]
+%<package> [2015/07/21 v2.0g eso-pic (RN)]
%
%<*driver>
\documentclass[a4paper]{ltxdoc}
@@ -37,7 +37,7 @@
%</driver>
% \fi
%
-% \CheckSum{760}
+% \CheckSum{776}
%
% \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
@@ -181,6 +181,8 @@
% the coordinate system is the upper left corner of the page. \\
% grid & empty or \textit{true}, \textit{false} & A grid is drawing;
% default: false. \\
+% gridBG & empty or \textit{true}, \textit{false} & Put the grid in the
+% background; default: false.\\
% gridunit & \textit{mm}, \textit{in}, \textit{bp}, \textit{pt} & Distance
% between gridlines are multiples of \texttt{gridunit}. default: mm.\\
% gridcolor & a valid color name & Color of the main gridlines;
@@ -360,13 +362,15 @@
% \end{macro}
% \DescribeMacro{\ESO@HookIBG}\DescribeMacro{\ESO@HookIIBG}
% \DescribeMacro{\ESO@HookIIIBG}\DescribeMacro{\ESO@HookIFG}
-% \DescribeMacro{\ESO@HookIIFG}
+% \DescribeMacro{\ESO@HookIIFG}\DescribeMacro{\ESO@HookIIIFG}
+% \changes{v2.0g}{2015/07/21}{New macro \cmd{\ESO@HookIIIFG} for foreground grid.}
% \begin{macrocode}
\newcommand{\ESO@HookIBG}{}
\newcommand{\ESO@HookIIBG}{}
\newcommand{\ESO@HookIIIBG}{}
\newcommand{\ESO@HookIFG}{}
\newcommand{\ESO@HookIIFG}{}
+\newcommand{\ESO@HookIIIFG}{}
\newcommand{\ESO@HookI}{}
\newcommand{\ESO@HookII}{}
\newcommand{\ESO@HookIII}{}
@@ -433,7 +437,7 @@
}%
\AtBeginShipoutUpperLeftForeground{%
\put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
- \ESO@HookIFG\ESO@HookIIFG
+ \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG
\global\let\ESO@HookIIFG\@empty
}%
}%
@@ -449,7 +453,7 @@
}%
\AtBeginShipoutUpperLeftForeground{%
\put(0,\LenToUnit{\ESO@yoffsetI}){%
- \ESO@HookIFG\ESO@HookIIFG
+ \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG
\global\let\ESO@HookIIFG\@empty
}%
}%
@@ -464,9 +468,10 @@
\RequirePackage{keyval}
% \end{macrocode}
% Initialising some macros
+% \changes{v2.0g}{2015/07/21}{New \cmd{\ifESO@gridBG} for foreground/background grid.}
% \begin{macrocode}
\newif\ifESO@dvips\ESO@dvipsfalse \newif\ifESO@grid\ESO@gridfalse
-\newif\ifESO@texcoord\ESO@texcoordfalse
+\newif\ifESO@texcoord\ESO@texcoordfalse \newif\ifESO@gridBG\ESO@gridBGfalse
\newcommand*\ESO@gridunitname{}
\newcommand*\ESO@gridunit{}
\newcommand*\ESO@labelfactor{}
@@ -500,6 +505,7 @@
% \end{macrocode}
% \end{macro}
% All the key-value options
+% \changes{v2.0g}{2015/07/21}{New option `gridBG'.}
% \begin{macrocode}
\define@key{ESO}{texcoord}[true]{\csname ESO@texcoord#1\endcsname}
\define@key{ESO}{pscoord}[true]{\csname @tempswa#1\endcsname
@@ -507,6 +513,7 @@
\define@key{ESO}{dvips}[true]{\csname ESO@dvips#1\endcsname}
\define@key{ESO}{grid}[true]{\csname ESO@grid#1\endcsname
\setkeys{ESO}{gridcolor=black,subgridcolor=black}}
+\define@key{ESO}{gridBG}[true]{\csname ESO@gridBG#1\endcsname}
\define@key{ESO}{colorgrid}[true]{\csname ESO@grid#1\endcsname
\setkeys{ESO}{gridcolor=red,subgridcolor=green}}
\define@key{ESO}{gridcolor}{\def\ESO@gridcolor{#1}}
@@ -689,12 +696,19 @@
}
% \end{macrocode}
% \end{macro}
-% Add the grid to the shipout picture (\cmd{\ESO@HookIIIBG} is independed
-% from the user commands
+% Add the grid to the shipout picture (\cmd{\ESO@HookIIIFG} or
+% \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}
+% \changes{v2.0g}{2015/07/21}{Foreground/background grid.}
% \begin{macrocode}
-\ifESO@grid\g@addto@macro\ESO@HookIFG{\ESO@gridpicture}\fi
+\ifESO@grid
+ \ifESO@gridBG
+ \g@addto@macro\ESO@HookIIIBG{\ESO@gridpicture}%
+ \else
+ \g@addto@macro\ESO@HookIIIFG{\ESO@gridpicture}%
+ \fi
+\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 af4f9121696..d4cd5bc1e9b 100644
--- a/Master/texmf-dist/source/latex/eso-pic/eso-pic.ins
+++ b/Master/texmf-dist/source/latex/eso-pic/eso-pic.ins
@@ -3,7 +3,7 @@
\preamble
-Copyright (C) 1998-2010
+Copyright (C) 1998-2015
Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
This file may be distributed and/or modified under the
@@ -14,7 +14,7 @@ The latest version of this license is in:
http://www.latex-project.org/lppl.txt
and version 1.3 or later is part of all distributions of LaTeX
-version 2003/12/01 or later.
+version 2003/12/01 or later.
This work has the LPPL maintenance status "author-maintained".
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 8bc696ce6f5..13613813e3e 100644
--- a/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
+++ b/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
@@ -6,7 +6,7 @@
%%
%% eso-pic.dtx (with options: `package')
%%
-%% Copyright (C) 1998-2010
+%% Copyright (C) 1998-2015
%% Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
%%
%% This file may be distributed and/or modified under the
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{eso-pic}
- [2015/07/14 v2.0f eso-pic (RN)]
+ [2015/07/21 v2.0g eso-pic (RN)]
\RequirePackage{atbegshi}
\providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength}
\newcommand\ESO@isMEMOIR[2]{#2}
@@ -125,6 +125,7 @@
\newcommand{\ESO@HookIIIBG}{}
\newcommand{\ESO@HookIFG}{}
\newcommand{\ESO@HookIIFG}{}
+\newcommand{\ESO@HookIIIFG}{}
\newcommand{\ESO@HookI}{}
\newcommand{\ESO@HookII}{}
\newcommand{\ESO@HookIII}{}
@@ -162,7 +163,7 @@
}%
\AtBeginShipoutUpperLeftForeground{%
\put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){%
- \ESO@HookIFG\ESO@HookIIFG
+ \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG
\global\let\ESO@HookIIFG\@empty
}%
}%
@@ -178,7 +179,7 @@
}%
\AtBeginShipoutUpperLeftForeground{%
\put(0,\LenToUnit{\ESO@yoffsetI}){%
- \ESO@HookIFG\ESO@HookIIFG
+ \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG
\global\let\ESO@HookIIFG\@empty
}%
}%
@@ -186,7 +187,7 @@
}
\RequirePackage{keyval}
\newif\ifESO@dvips\ESO@dvipsfalse \newif\ifESO@grid\ESO@gridfalse
-\newif\ifESO@texcoord\ESO@texcoordfalse
+\newif\ifESO@texcoord\ESO@texcoordfalse \newif\ifESO@gridBG\ESO@gridBGfalse
\newcommand*\ESO@gridunitname{}
\newcommand*\ESO@gridunit{}
\newcommand*\ESO@labelfactor{}
@@ -220,6 +221,7 @@
\define@key{ESO}{dvips}[true]{\csname ESO@dvips#1\endcsname}
\define@key{ESO}{grid}[true]{\csname ESO@grid#1\endcsname
\setkeys{ESO}{gridcolor=black,subgridcolor=black}}
+\define@key{ESO}{gridBG}[true]{\csname ESO@gridBG#1\endcsname}
\define@key{ESO}{colorgrid}[true]{\csname ESO@grid#1\endcsname
\setkeys{ESO}{gridcolor=red,subgridcolor=green}}
\define@key{ESO}{gridcolor}{\def\ESO@gridcolor{#1}}
@@ -356,7 +358,13 @@
\normalcolor%
\endgroup
}
-\ifESO@grid\g@addto@macro\ESO@HookIFG{\ESO@gridpicture}\fi
+\ifESO@grid
+ \ifESO@gridBG
+ \g@addto@macro\ESO@HookIIIBG{\ESO@gridpicture}%
+ \else
+ \g@addto@macro\ESO@HookIIIFG{\ESO@gridpicture}%
+ \fi
+\fi
\endinput
%%
%% End of file `eso-pic.sty'.