From 971a4c28d717ab58e5bd3394f497e1cede329128 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Fri, 20 Nov 2009 10:31:02 +0000 Subject: eso-pic update (2009/10/07 v2.0a) git-svn-id: svn://tug.org/texlive/trunk@16100 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty | 199 ++++++++++++++-------- Master/texmf-dist/tex/latex/eso-pic/showframe.sty | 50 ------ 2 files changed, 131 insertions(+), 118 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/eso-pic/showframe.sty (limited to 'Master/texmf-dist/tex/latex') 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 9d294621022..4fb6031ce1e 100644 --- a/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty +++ b/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1998-2002 by Rolf Niepraschk +%% Copyright (C) 1998-2009 by Rolf Niepraschk %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.2 of this license @@ -22,74 +22,136 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{eso-pic} - [2006/07/14 v1.1d eso-pic (RN)] -\RequirePackage{everyshi} + [2009/10/07 v2.0a eso-pic (RN)] +\RequirePackage{atbegshi} \providecommand*\LenToUnit[1]{#1\@gobble} +\newcommand\ESO@isMEMOIR[2]{#2} +\@ifclassloaded{memoir}{\renewcommand\ESO@isMEMOIR[2]{#1}}{} \newcommand\AtPageUpperLeft[1]{% - \put(0,\LenToUnit{\ESO@yoffsetI}){#1}% + \put(0,\LenToUnit{-\ESO@yoffsetI}){#1}% } \newcommand\AtPageLowerLeft[1]{\AtPageUpperLeft{% \put(0,\LenToUnit{-\paperheight}){#1}}} \newcommand\AtPageCenter[1]{\AtPageUpperLeft{% \put(\LenToUnit{.5\paperwidth},\LenToUnit{-.5\paperheight}){#1}}% } -\newcommand\AtTextUpperLeft[1]{% - \begingroup - \setlength\@tempdima{1in}% - \ifodd\c@page% - \advance\@tempdima\oddsidemargin% - \else% - \advance\@tempdima\evensidemargin% - \fi% - \@tempdimb=\ESO@yoffsetI\relax\advance\@tempdimb-1in\relax% - \advance\@tempdimb-\topmargin% - \advance\@tempdimb-\headheight\advance\@tempdimb-\headsep% - \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}% - \endgroup +\newcommand\AtStockLowerLeft{} +\ESO@isMEMOIR{% + \renewcommand\AtStockLowerLeft[1]{% + \begingroup + \@tempdima=-\stockwidth + \advance\@tempdima\trimedge + \advance\@tempdima\paperwidth + \if@twoside\ifodd\c@page\else + \@tempdima=-\trimedge + \fi\fi + \@tempdimb=-\stockheight + \advance\@tempdimb\paperheight + \advance\@tempdimb\trimtop + \AtPageLowerLeft{% + \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}% + }% + \endgroup + } +}{% + \let\AtStockLowerLeft=\AtPageLowerLeft +} +\newcommand\AtStockUpperLeft{} +\ESO@isMEMOIR{% + \renewcommand\AtStockUpperLeft[1]{% + \AtStockLowerLeft{% + \put(0,\LenToUnit{\stockheight}){#1}% + }% + }% +}{% + \let\AtStockUpperLeft=\AtPageUpperLeft +} +\newcommand\AtStockCenter{} +\ESO@isMEMOIR{% + \renewcommand\AtStockCenter[1]{% + \AtStockLowerLeft{% + \put(\LenToUnit{.5\stockwidth},\LenToUnit{.5\stockheight}){#1}% + }% + }% +}{% + \let\AtStockCenter=\AtPageCenter +} +\ESO@isMEMOIR{% + \newcommand\AtTextUpperLeft[1]{% + \begingroup + \ifodd\c@page + \@tempdima=\spinemargin + \else + \@tempdima=\paperwidth + \advance\@tempdima-\textwidth + \advance\@tempdima-\spinemargin + \fi + \@tempdimb=-\uppermargin + \AtPageUpperLeft{% + \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}% + }% + \endgroup + } +}{% + \newcommand\AtTextUpperLeft[1]{% + \begingroup + \@tempdima=1in\relax + \ifodd\c@page + \advance\@tempdima\oddsidemargin + \else + \advance\@tempdima\evensidemargin + \fi + \@tempdimb=-1in\relax + \advance\@tempdimb-\topmargin + \advance\@tempdimb-\headheight + \advance\@tempdimb-\headsep + \AtPageUpperLeft{% + \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){#1}% + }% + \endgroup + } } \newcommand\AtTextLowerLeft[1]{\AtTextUpperLeft{% \put(0,\LenToUnit{-\textheight}){#1}}} \newcommand\AtTextCenter[1]{\AtTextUpperLeft{% \put(\LenToUnit{.5\textwidth},\LenToUnit{-.5\textheight}){#1}}} -\newcommand{\ESO@HookI}{} \newcommand{\ESO@HookII}{} +\newcommand{\ESO@HookI}{} +\newcommand{\ESO@HookII}{} \newcommand{\ESO@HookIII}{} \newcommand{\AddToShipoutPicture}{% \@ifstar{\g@addto@macro\ESO@HookII}{\g@addto@macro\ESO@HookI}} \newcommand{\ClearShipoutPicture}{\global\let\ESO@HookI\@empty} -\newcommand\ESO@isMEMOIR[1]{} -\@ifclassloaded{memoir}{\renewcommand\ESO@isMEMOIR[1]{#1}}{} -\newcommand{\@ShipoutPicture}{% - \bgroup - \@tempswafalse% - \ifx\ESO@HookI\@empty\else\@tempswatrue\fi% - \ifx\ESO@HookII\@empty\else\@tempswatrue\fi% - \ifx\ESO@HookIII\@empty\else\@tempswatrue\fi% - \if@tempswa% - \@tempdima=1in\@tempdimb=-\@tempdima% - \advance\@tempdimb\ESO@yoffsetI% - \ESO@isMEMOIR{% - \advance\@tempdima\trimedge% - \advance\@tempdima\paperwidth% - \advance\@tempdima-\stockwidth% - \if@twoside\ifodd\c@page\else% - \advance\@tempdima-2\trimedge% - \advance\@tempdima-\paperwidth% - \advance\@tempdima\stockwidth% - \fi\fi% - \advance\@tempdimb\trimtop}% - \unitlength=\p@% - \global\setbox\@cclv\vbox{% - \vbox{\let\protect\relax - \pictur@(0,0)(\strip@pt\@tempdima,\strip@pt\@tempdimb)% - \ESO@HookIII\ESO@HookI\ESO@HookII% - \global\let\ESO@HookII\@empty% - \endpicture}% - \nointerlineskip% - \box\@cclv}% - \fi - \egroup +\ESO@isMEMOIR{% + \AtBeginShipout{% + \@tempdima=-\trimedge + \advance\@tempdima-\paperwidth + \advance\@tempdima\stockwidth + \if@twoside\ifodd\c@page\else + \advance\@tempdima2\trimedge + \advance\@tempdima\paperwidth + \advance\@tempdima-\stockwidth + \fi\fi + \@tempdimb=\ESO@yoffsetI + \advance\@tempdimb-\trimtop + \nointerlineskip + \AtBeginShipoutUpperLeft{% + \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){% + \ESO@HookIII\ESO@HookI\ESO@HookII + \global\let\ESO@HookII\@empty + }% + }% + } +}{% + \AtBeginShipout{% + \nointerlineskip + \AtBeginShipoutUpperLeft{% + \put(0,\LenToUnit{\ESO@yoffsetI}){% + \ESO@HookIII\ESO@HookI\ESO@HookII + \global\let\ESO@HookII\@empty + }% + }% + } } -\EveryShipout{\@ShipoutPicture} \RequirePackage{keyval} \newif\ifESO@dvips\ESO@dvipsfalse \newif\ifESO@grid\ESO@gridfalse \newif\ifESO@texcoord\ESO@texcoordfalse @@ -163,21 +225,22 @@ \ProcessOptionsWithKV{ESO}% \newcommand\ESO@div[2]{% \@tempdima=#1\relax\@tempdimb=\ESO@gridunit\relax - \@tempdimb=#2\@tempdimb\divide\@tempdima by \@tempdimb% + \@tempdimb=#2\@tempdimb\divide\@tempdima by \@tempdimb \@tempcnta\@tempdima\advance\@tempcnta\@ne} +\@ifundefined{colorbox}{% + \IfFileExists{xcolor.sty}{\RequirePackage{xcolor}}% + {\RequirePackage{color}}% +}{}% +\let\ESO@color=\color +\let\ESO@colorbox=\colorbox +\let\ESO@fcolorbox=\fcolorbox \AtBeginDocument{% - \IfFileExists{color.sty} - {% - \RequirePackage{color} - \let\ESO@color=\color\let\ESO@colorbox=\colorbox - \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% + \ifx\filename@base\reserved@a\ESO@dvipstrue\fi \fi }% \ifESO@dvips\def\@tempb{eepic}\else\def\@tempb{epic}\fi @@ -201,7 +264,7 @@ \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{\z@} + \def\ESO@yoffsetI{-\paperheight}\def\ESO@yoffsetII{\z@} \edef\ESO@griddeltaY{\ESO@griddelta}\edef\ESO@gridDeltaY{\ESO@gridDelta} \fi \newcommand\ESO@gridpicture{% @@ -224,26 +287,26 @@ \fontsize{10}{12}\normalfont% \ESO@div{\paperwidth}{\ESO@gridDelta}% \multiput(0,\ESO@gridDeltaY)(\ESO@gridDelta,0){\@tempcnta}{% - \@tempcntb=\@tempcnta\advance\@tempcntb-\@multicnt% + \@tempcntb=\@tempcnta\advance\@tempcntb-\@multicnt \ifnum\@tempcntb>1\relax - \multiply\@tempcntb by \ESO@gridDelta\relax% - \@tempdima=\@tempcntb sp\@tempdima=\ESO@labelfactor\@tempdima% + \multiply\@tempcntb by \ESO@gridDelta\relax + \@tempdima=\@tempcntb sp\@tempdima=\ESO@labelfactor\@tempdima \@tempcntb=\@tempdima% \makebox(0,0)[c]{\ESO@colorbox{white}{\the\@tempcntb}}% \fi}% - \ifx\ESO@gridunitname\@empty\def\@tempa{0}\else\def\@tempa{1}\fi% + \ifx\ESO@gridunitname\@empty\def\@tempa{0}\else\def\@tempa{1}\fi \ESO@div{\paperheight}{\ESO@gridDelta}% \multiput(\ESO@gridDelta,0)(0,\ESO@gridDeltaY){\@tempcnta}{% \@tempcntb=\@tempcnta\advance\@tempcntb-\@multicnt% \ifnum\@tempcntb>\@tempa\relax \multiply\@tempcntb by \ESO@gridDelta\relax% - \@tempdima=\@tempcntb sp\@tempdima=\ESO@labelfactor\@tempdima% - \@tempcntb=\@tempdima% + \@tempdima=\@tempcntb sp\@tempdima=\ESO@labelfactor\@tempdima + \@tempcntb=\@tempdima \makebox(0,0)[c]{\ESO@colorbox{white}{\the\@tempcntb}}% \fi }% - \ifx\ESO@gridunitname\@empty\else% - \thicklines\fboxrule=\@wholewidth% + \ifx\ESO@gridunitname\@empty\else + \thicklines\fboxrule=\@wholewidth \put(\ESO@gridDelta,\ESO@gridDeltaY){\makebox(0,0)[c]{% \ESO@fcolorbox{\ESO@gridcolor}{white}{% \textbf{\ESO@gridunitname}}}}% diff --git a/Master/texmf-dist/tex/latex/eso-pic/showframe.sty b/Master/texmf-dist/tex/latex/eso-pic/showframe.sty deleted file mode 100644 index 04b11d60ce4..00000000000 --- a/Master/texmf-dist/tex/latex/eso-pic/showframe.sty +++ /dev/null @@ -1,50 +0,0 @@ - -% 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. 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". - -\ProvidesPackage{showframe}[2008/12/09 v0.1h showframe (new impl., RN)] - -\newif\ifSF@frame\SF@frametrue - -\DeclareOption{noframe}{\SF@framefalse} -\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{eso-pic}} -\ProcessOptions\relax - -\RequirePackage{eso-pic}[2002/10/30] - -\newcommand\ShowFramePicture{% - \begingroup - \normalcolor\thicklines - \AtPageLowerLeft{% - \framebox(\LenToUnit{\paperwidth},\LenToUnit{\paperheight}){}}% - \AtTextLowerLeft{% - \framebox(\LenToUnit{\textwidth},\LenToUnit{\textheight}){}}% - \AtTextUpperLeft{% - \put(0,\LenToUnit{\headsep}){% - \framebox(\LenToUnit{\textwidth},\LenToUnit{\headheight}){}}}% - \AtTextLowerLeft{% - \put(0,\LenToUnit{-\footskip}){% - \line(1,0){\LenToUnit{\textwidth}}}}% - \AtTextLowerLeft{% - \@tempdima=\textwidth\advance\@tempdima\marginparsep% - \if@twoside - \ifodd\c@page\else - \if@mparswitch - \@tempdima=-\marginparsep\advance\@tempdima-\marginparwidth - \fi - \fi - \fi - \put(\LenToUnit{\@tempdima},0)% - {\framebox(\LenToUnit{\marginparwidth},\LenToUnit{\textheight}){}}% - }% - \endgroup -} - -\ifSF@frame\AddToShipoutPicture{\ShowFramePicture}\fi - -\endinput -- cgit v1.2.3