summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-07-18 18:29:21 +0000
committerKarl Berry <karl@freefriends.org>2006-07-18 18:29:21 +0000
commite57b5ddc88de53d52adec85044dfe5eab9a2f697 (patch)
tree48b155fc4af3df95870fbdd7d9bdc1b178902d49 /Master
parent98fd6239a0d381a229dac26511316eccff74c162 (diff)
eso-pic update (18jul06)
git-svn-id: svn://tug.org/texlive/trunk@1875 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/eso-pic/eso-ex1.pdfbin17782 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eso-pic/eso-ex2.pdfbin11542 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eso-pic/eso-ex3.pdfbin270 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eso-pic/eso-ex4.pdfbin18630 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eso-pic/eso-ex5.pdfbin23019 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdfbin0 -> 211507 bytes
-rw-r--r--Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx65
-rw-r--r--Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty28
-rw-r--r--Master/texmf-dist/tex/latex/eso-pic/showframe.sty24
-rw-r--r--Master/texmf-dist/tpm/eso-pic.tpm14
-rw-r--r--Master/texmf/lists/eso-pic6
11 files changed, 56 insertions, 81 deletions
diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.pdf b/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.pdf
deleted file mode 100644
index 4a9e4cb846b..00000000000
--- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.pdf b/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.pdf
deleted file mode 100644
index fedaf52aff7..00000000000
--- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.pdf b/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.pdf
deleted file mode 100644
index 6552471a86f..00000000000
--- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.pdf b/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.pdf
deleted file mode 100644
index 6e9ef5b2786..00000000000
--- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.pdf b/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.pdf
deleted file mode 100644
index d72a215218b..00000000000
--- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf b/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf
new file mode 100644
index 00000000000..c06613000ca
--- /dev/null
+++ 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 e9c2e3f7078..f551b28c65f 100644
--- a/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx
+++ b/Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
-% Copyright (C) 1998-2002 by Rolf Niepraschk <niepraschk@ptb.de>
-% --------------------------------------------------
+% Copyright (C) 1998-2005 by Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+% -------------------------------------------------------------------
%
% This file may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.2
@@ -12,16 +12,20 @@
%
% 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".
%
% Please send error reports and suggestions for improvements to
-% Rolf Niepraschk <niepraschk@ptb.de>.
+% Rolf Niepraschk <Rolf.Niepraschk@ptb.de>.
%
% \fi
%
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{eso-pic}
-%<package> [2002/11/16 v1.1b eso-pic (RN)]
+%<package> [2006/07/14 v1.1d eso-pic (RN)]
%
%<*driver>
\documentclass[a4paper]{ltxdoc}
@@ -33,7 +37,7 @@
%</driver>
% \fi
%
-% \CheckSum{637}
+% \CheckSum{619}
%
% \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
@@ -55,14 +59,14 @@
% ===================================================================
% @LaTeX-package-file{
% author = {Rolf Niepraschk},
-% version = "v1.1b",
-% date = "16 November 2002",
+% version = "v1.1d",
+% date = "14 July 2006",
% filename = "eso-pic.sty",
% address = "",
% telephone = "",
-% email = "niepraschk@ptb.de",
+% email = "Rolf.Niepraschk@ptb.de",
% codetable = "ISO/ASCII",
-% keywords = "LaTeX2e, \shipout, picture",
+% keywords = "LaTeX2e, \shipout, picture",
% dependences = "everyshi",
% supported = "yes",
% docstring = "LaTeX package which makes it easy to add some
@@ -100,7 +104,7 @@
%
% \title{The \pkgname{eso-pic} package\thanks{This document
% corresponds to \pkgname{eso-pic}~\fileversion, dated \filedate.}}
-% \author{Rolf Niepraschk \\ \texttt{niepraschk@ptb.de}}
+% \author{Rolf Niepraschk \\ \texttt{Rolf.Niepraschk@ptb.de}}
%
% \date{}
%
@@ -118,6 +122,7 @@
% \LaTeX's shipout routine.
%
% \section{Usage}
+% See also the example \LaTeX\ documents |eso-ex?.tex|.
%
% \subsection{Basic commands for adding \LaTeX{} stuff to the page background}
% \DescribeMacro{\AddToShipoutPicture} All the picture commands which are
@@ -139,9 +144,9 @@
% command.
%
% \DescribeMacro{\gridSetup}
-% |\gridSetup[|\meta{gridunitname}|]||{|\meta{gridunit}|}|^^A
-% |{|\meta{labelfactor}|}||{|\meta{griddelta}|}| |{|\meta{gridDelta}|}|^^A
-% |{|\meta{gap}|}|. For details see the implementation section.\par
+% \cmd{\gridSetup}\oarg{gridunitname}\marg{gridunit}\marg{labelfactor}^^A
+% \marg{griddelta} \marg{gridDelta}\marg{gap}. For details see the
+% implementation section.\par
% \DescribeMacro{\AtPageUpperLeft}
% \DescribeMacro{\AtPageLowerLeft}
% \DescribeMacro{\AtPageCenter}
@@ -190,18 +195,16 @@
\RequirePackage{everyshi}
% \end{macrocode}
% \begin{macro}{\LenToUnit}
+% \changes{v1.0d}{2006/07/14}{Using \cmd{\providecommand} instead of
+% \cmd{\newcommand} for \cmd{\LenToUnit}}
% \begin{macrocode}
-\newcommand\LenToUnit[1]{#1\@gobble}
+\providecommand*\LenToUnit[1]{#1\@gobble}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\AtPageUpperLeft}
-
% \begin{macrocode}
\newcommand\AtPageUpperLeft[1]{%
- \begingroup
- \@tempdima=0pt\relax\@tempdimb=\ESO@yoffsetI\relax
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
- \endgroup
+ \put(0,\LenToUnit{\ESO@yoffsetI}){#1}%
}
% \end{macrocode}
% \end{macro}
@@ -303,7 +306,7 @@
\advance\@tempdima\stockwidth%
\fi\fi%
\advance\@tempdimb\trimtop}%
- \unitlength=1pt%
+ \unitlength=\p@%
\global\setbox\@cclv\vbox{%
\vbox{\let\protect\relax
\pictur@(0,0)(\strip@pt\@tempdima,\strip@pt\@tempdimb)%
@@ -348,7 +351,7 @@
\newcommand\ESO@color[1]{}
\newcommand\ESO@colorbox[3][]{%
\begingroup
- \fboxrule=0pt\fbox{#3}%
+ \fboxrule=\z@\fbox{#3}%
\endgroup
}
% \end{macrocode}
@@ -381,7 +384,7 @@
\else
\def\@tempb{pt}
\ifx\@tempa\@tempb
- \gridSetup[\@tempa]{1pt}{1}{10}{50}{2}
+ \gridSetup[\@tempa]{\p@}{1}{10}{50}{2}
\else
\def\@tempb{in}
\ifx\@tempa\@tempb
@@ -421,28 +424,24 @@
\@tempcnta\@tempdima\advance\@tempcnta\@ne}
% \end{macrocode}
% \end{macro}
+% \changes{v1.1c}{2005/12/24}{Remove the disadvantageous check of
+% `pdfTeX'. Now using with Xe\LaTeX\ should be possible.}
% \begin{macrocode}
\AtBeginDocument{%
\IfFileExists{color.sty}
{%
\RequirePackage{color}
\let\ESO@color=\color\let\ESO@colorbox=\colorbox
- \let\ESO@fcolorbox=\fcolorbox
+ \let\ESO@fcolorbox=\fcolorbox
}{}
+ \ESO@dvipsfalse
\@ifundefined{Gin@driver}{}%
{%
\ifx\Gin@driver\@empty\else%
\filename@parse{\Gin@driver}\def\reserved@a{dvips}%
\ifx\filename@base\reserved@a\ESO@dvipstrue\fi%
\fi
- }%
- \ifx\pdfoutput\undefined\else
- \ifx\pdfoutput\relax\else
- \ifcase\pdfoutput\else
- \ESO@dvipsfalse%
- \fi
- \fi
- \fi
+ }%
\ifESO@dvips\def\@tempb{eepic}\else\def\@tempb{epic}\fi
\def\@tempa{dotted}%\def\ESO@gap{\LenToUnit{6\@wholewidth}}%
\ifx\@tempa\ESO@subgridstyle
@@ -461,10 +460,10 @@
\fi
}
\ifESO@texcoord
- \def\ESO@yoffsetI{0pt}\def\ESO@yoffsetII{-\paperheight}
+ \def\ESO@yoffsetI{\z@}\def\ESO@yoffsetII{-\paperheight}
\edef\ESO@griddeltaY{-\ESO@griddelta}\edef\ESO@gridDeltaY{-\ESO@gridDelta}
\else
- \def\ESO@yoffsetI{\paperheight}\def\ESO@yoffsetII{0pt}
+ \def\ESO@yoffsetI{\paperheight}\def\ESO@yoffsetII{\z@}
\edef\ESO@griddeltaY{\ESO@griddelta}\edef\ESO@gridDeltaY{\ESO@gridDelta}
\fi
% \end{macrocode}
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 995bbb57375..9d294621022 100644
--- a/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
+++ b/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty
@@ -22,15 +22,11 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{eso-pic}
- [2002/11/16 v1.1b eso-pic (RN)]
+ [2006/07/14 v1.1d eso-pic (RN)]
\RequirePackage{everyshi}
-\newcommand\LenToUnit[1]{#1\@gobble}
-
+\providecommand*\LenToUnit[1]{#1\@gobble}
\newcommand\AtPageUpperLeft[1]{%
- \begingroup
- \@tempdima=0pt\relax\@tempdimb=\ESO@yoffsetI\relax
- \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}%
- \endgroup
+ \put(0,\LenToUnit{\ESO@yoffsetI}){#1}%
}
\newcommand\AtPageLowerLeft[1]{\AtPageUpperLeft{%
\put(0,\LenToUnit{-\paperheight}){#1}}}
@@ -81,7 +77,7 @@
\advance\@tempdima\stockwidth%
\fi\fi%
\advance\@tempdimb\trimtop}%
- \unitlength=1pt%
+ \unitlength=\p@%
\global\setbox\@cclv\vbox{%
\vbox{\let\protect\relax
\pictur@(0,0)(\strip@pt\@tempdima,\strip@pt\@tempdimb)%
@@ -117,7 +113,7 @@
\newcommand\ESO@color[1]{}
\newcommand\ESO@colorbox[3][]{%
\begingroup
- \fboxrule=0pt\fbox{#3}%
+ \fboxrule=\z@\fbox{#3}%
\endgroup
}
\newcommand\gridSetup[6][]{%
@@ -143,7 +139,7 @@
\else
\def\@tempb{pt}
\ifx\@tempa\@tempb
- \gridSetup[\@tempa]{1pt}{1}{10}{50}{2}
+ \gridSetup[\@tempa]{\p@}{1}{10}{50}{2}
\else
\def\@tempb{in}
\ifx\@tempa\@tempb
@@ -176,6 +172,7 @@
\let\ESO@color=\color\let\ESO@colorbox=\colorbox
\let\ESO@fcolorbox=\fcolorbox
}{}
+ \ESO@dvipsfalse
\@ifundefined{Gin@driver}{}%
{%
\ifx\Gin@driver\@empty\else%
@@ -183,13 +180,6 @@
\ifx\filename@base\reserved@a\ESO@dvipstrue\fi%
\fi
}%
- \ifx\pdfoutput\undefined\else
- \ifx\pdfoutput\relax\else
- \ifcase\pdfoutput\else
- \ESO@dvipsfalse%
- \fi
- \fi
- \fi
\ifESO@dvips\def\@tempb{eepic}\else\def\@tempb{epic}\fi
\def\@tempa{dotted}%\def\ESO@gap{\LenToUnit{6\@wholewidth}}%
\ifx\@tempa\ESO@subgridstyle
@@ -208,10 +198,10 @@
\fi
}
\ifESO@texcoord
- \def\ESO@yoffsetI{0pt}\def\ESO@yoffsetII{-\paperheight}
+ \def\ESO@yoffsetI{\z@}\def\ESO@yoffsetII{-\paperheight}
\edef\ESO@griddeltaY{-\ESO@griddelta}\edef\ESO@gridDeltaY{-\ESO@gridDelta}
\else
- \def\ESO@yoffsetI{\paperheight}\def\ESO@yoffsetII{0pt}
+ \def\ESO@yoffsetI{\paperheight}\def\ESO@yoffsetII{\z@}
\edef\ESO@griddeltaY{\ESO@griddelta}\edef\ESO@gridDeltaY{\ESO@gridDelta}
\fi
\newcommand\ESO@gridpicture{%
diff --git a/Master/texmf-dist/tex/latex/eso-pic/showframe.sty b/Master/texmf-dist/tex/latex/eso-pic/showframe.sty
index 674e343c386..af62b075e60 100644
--- a/Master/texmf-dist/tex/latex/eso-pic/showframe.sty
+++ b/Master/texmf-dist/tex/latex/eso-pic/showframe.sty
@@ -1,12 +1,13 @@
-% Copyright (C) 2002 Rolf Niepraschk -- niepraschk@ptb.de
+% Rolf Niepraschk -- Rolf.Niepraschk@ptb.de
% Draws visible frames for the text and margin area, and lines
-% for the head and foot to check layout in detail.
+% for the head and foot to check layout in detail. Using the package
+% option "noframe" you can draw the frames later only for a single
+% page with \AddToShipoutPicture*{\ShowFramePicture}. Another useful
+% options maybe eso-pic's "colorgrid", "grid" and "texcoord".
-% See further instructions and licence after "\endinput".
-
-\ProvidesPackage{showframe}[2002/11/10 v0.1f showframe (new impl., RN)]
+\ProvidesPackage{showframe}[2005/12/18 v0.1g showframe (new impl., RN)]
\newif\ifSF@frame\SF@frametrue
@@ -31,7 +32,9 @@
\@tempdima=\textwidth\advance\@tempdima\marginparsep%
\if@twoside%
\ifodd\c@page\else%
- \@tempdima=-\marginparsep\advance\@tempdima-\marginparwidth%
+ \if@mparswitch
+ \@tempdima=-\marginparsep\advance\@tempdima-\marginparwidth%
+ \fi
\fi%
\fi%
\put(\LenToUnit{\@tempdima},0)%
@@ -43,12 +46,3 @@
\ifSF@frame\AddToShipoutPicture{\ShowFramePicture}\fi
\endinput
-
-% Using the package option "noframe" you can draw the frames later only
-% for a single page with \AddToShipoutPicture*{\ShowFramePicture}. Other
-% useful options maybe eso-pic's "colorgrid" or "grid".
-
-% This software is released under the terms of the LaTeX Project Public
-% License (ftp://dante.ctan.org/tex-archive/macros/latex/base/lppl.txt).
-% (Essentially: Free to use, copy, distribute (sell) and change, but, if
-% changed, the name must be changed.)
diff --git a/Master/texmf-dist/tpm/eso-pic.tpm b/Master/texmf-dist/tpm/eso-pic.tpm
index f4ce1337f7b..4786108236d 100644
--- a/Master/texmf-dist/tpm/eso-pic.tpm
+++ b/Master/texmf-dist/tpm/eso-pic.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/eso-pic.zip">
<TPM:Name>eso-pic</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:52:54</TPM:Date>
+ <TPM:Date>2006/07/14 18:29:00</TPM:Date>
<TPM:Version>1.0c</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
@@ -18,25 +18,21 @@ user commands to LaTeX's shipout actions.
<TPM:Author>Rolf Niepraschk</TPM:Author>
<TPM:Size>112692</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="13026">
+ <TPM:RunFiles size="12529">
texmf-dist/tex/latex/eso-pic/eso-pic.sty
texmf-dist/tex/latex/eso-pic/showframe.sty
texmf-dist/tpm/eso-pic.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="76976">
+ <TPM:DocFiles size="217240">
texmf-dist/doc/latex/eso-pic/README
-texmf-dist/doc/latex/eso-pic/eso-ex1.pdf
texmf-dist/doc/latex/eso-pic/eso-ex1.tex
-texmf-dist/doc/latex/eso-pic/eso-ex2.pdf
texmf-dist/doc/latex/eso-pic/eso-ex2.tex
-texmf-dist/doc/latex/eso-pic/eso-ex3.pdf
texmf-dist/doc/latex/eso-pic/eso-ex3.tex
-texmf-dist/doc/latex/eso-pic/eso-ex4.pdf
texmf-dist/doc/latex/eso-pic/eso-ex4.tex
-texmf-dist/doc/latex/eso-pic/eso-ex5.pdf
texmf-dist/doc/latex/eso-pic/eso-ex5.tex
+texmf-dist/doc/latex/eso-pic/eso-pic.pdf
</TPM:DocFiles>
- <TPM:SourceFiles size="22690">
+ <TPM:SourceFiles size="22919">
texmf-dist/source/latex/eso-pic/Makefile
texmf-dist/source/latex/eso-pic/eso-pic.dtx
texmf-dist/source/latex/eso-pic/eso-pic.ins
diff --git a/Master/texmf/lists/eso-pic b/Master/texmf/lists/eso-pic
index 1d27340ef51..2104528ef9b 100644
--- a/Master/texmf/lists/eso-pic
+++ b/Master/texmf/lists/eso-pic
@@ -1,14 +1,10 @@
texmf-dist/doc/latex/eso-pic/README
-texmf-dist/doc/latex/eso-pic/eso-ex1.pdf
texmf-dist/doc/latex/eso-pic/eso-ex1.tex
-texmf-dist/doc/latex/eso-pic/eso-ex2.pdf
texmf-dist/doc/latex/eso-pic/eso-ex2.tex
-texmf-dist/doc/latex/eso-pic/eso-ex3.pdf
texmf-dist/doc/latex/eso-pic/eso-ex3.tex
-texmf-dist/doc/latex/eso-pic/eso-ex4.pdf
texmf-dist/doc/latex/eso-pic/eso-ex4.tex
-texmf-dist/doc/latex/eso-pic/eso-ex5.pdf
texmf-dist/doc/latex/eso-pic/eso-ex5.tex
+texmf-dist/doc/latex/eso-pic/eso-pic.pdf
texmf-dist/source/latex/eso-pic/Makefile
texmf-dist/source/latex/eso-pic/eso-pic.dtx
texmf-dist/source/latex/eso-pic/eso-pic.ins