From e57b5ddc88de53d52adec85044dfe5eab9a2f697 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 18 Jul 2006 18:29:21 +0000
Subject: eso-pic update (18jul06)

git-svn-id: svn://tug.org/texlive/trunk@1875 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty   | 28 ++++++++---------------
 Master/texmf-dist/tex/latex/eso-pic/showframe.sty | 24 ++++++++-----------
 2 files changed, 18 insertions(+), 34 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/eso-pic')

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.)
-- 
cgit v1.2.3