From 96017976c095713d2013168eeb9d3c2ad8c1c7dc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Oct 2020 21:43:27 +0000 Subject: eso-pic (14oct20) git-svn-id: svn://tug.org/texlive/trunk@56658 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/eso-pic/README | 11 ------ Master/texmf-dist/doc/latex/eso-pic/README.md | 11 ++++++ Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex | 30 ++++++++------- Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex | 25 ++++++------ Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex | 42 --------------------- Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex | 38 +++++++++++++++---- Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex | 1 - .../doc/latex/eso-pic/eso-memoir-test.tex | 3 +- Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf | Bin 250230 -> 250019 bytes 9 files changed, 70 insertions(+), 91 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/eso-pic/README create mode 100644 Master/texmf-dist/doc/latex/eso-pic/README.md delete mode 100644 Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex (limited to 'Master/texmf-dist/doc/latex') diff --git a/Master/texmf-dist/doc/latex/eso-pic/README b/Master/texmf-dist/doc/latex/eso-pic/README deleted file mode 100644 index 2633b5dc54c..00000000000 --- a/Master/texmf-dist/doc/latex/eso-pic/README +++ /dev/null @@ -1,11 +0,0 @@ -eso-pic -======= - -LaTeX package to add pic­ture com­mands (or back­grounds) to ev­ery page. - -The pack­age adds one or more user com­mands to LaTeX’s shipout rou­tine, which -may be used to place the out­put at fixed po­si­tions. The grid op­tion may be -used to find the cor­rect places. - -Rolf Niepraschk - diff --git a/Master/texmf-dist/doc/latex/eso-pic/README.md b/Master/texmf-dist/doc/latex/eso-pic/README.md new file mode 100644 index 00000000000..2633b5dc54c --- /dev/null +++ b/Master/texmf-dist/doc/latex/eso-pic/README.md @@ -0,0 +1,11 @@ +eso-pic +======= + +LaTeX package to add pic­ture com­mands (or back­grounds) to ev­ery page. + +The pack­age adds one or more user com­mands to LaTeX’s shipout rou­tine, which +may be used to place the out­put at fixed po­si­tions. The grid op­tion may be +used to find the cor­rect places. + +Rolf Niepraschk + diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex index c9a43c24f97..c780356975a 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex @@ -1,22 +1,22 @@ % file `eso-ex1.tex'; a framed background example -% Rolf Niepraschk, 2020-09-27, Rolf.Niepraschk@gmx.de \documentclass[a4paper]{article} \usepackage{eso-pic} \listfiles -\newdimen\myTempdima -\newdimen\myTempdimb -\newdimen\myTempdimc - -\AddToShipoutPicture{% - \setlength{\myTempdima}{15mm}% - \setlength{\myTempdimb}{\dimexpr\paperwidth-2\myTempdima}% - \setlength{\myTempdimc}{\dimexpr\paperheight-2\myTempdima}% - \thicklines% - \put(\LenToUnit{\myTempdima},\LenToUnit{\myTempdima}){% - \framebox(\LenToUnit{\myTempdimb},\LenToUnit{\myTempdimc}){}}% +\newdimen\myLenA +\newdimen\myLenB +\newdimen\myLenC + +\AddToShipoutPictureBG{% + \begingroup + \setlength\myLenA{15mm}% + \setlength\myLenB{\dimexpr\paperwidth-2\myLenA}% + \setlength\myLenC{\dimexpr\paperheight-2\myLenA}% + \thicklines% + \put(\myLenA,\myLenA){\framebox(\myLenB,\myLenC){}}% + \endgroup } \begin{document} @@ -24,11 +24,13 @@ \section*{First page} This page and all the following have a frame with 15~mm - distance from the paper edges.\newpage + distance from the paper edges. + + \newpage \section*{Second page} - \AddToShipoutPicture*{\put(100,100){\circle{40}}} + \AddToShipoutPictureBG*{\put(100,100){\circle{40}}} Only this page has a circle on the lower left side. diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex index 37012a958e1..affe690bd71 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex @@ -1,24 +1,23 @@ % file `eso-ex2.tex'; an example for background pictures -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de -\listfiles\setcounter{errorcontextlines}{100} + \documentclass{article} \usepackage{eso-pic} \usepackage{graphicx} -\usepackage[dvips]{geometry} -% Tells `dvips' and `pdfTeX' the papersize. % `rose.eps' from CTAN: macros/generic/boxedeps/ \newcommand\BackgroundPicture{% - \put(0,0){% - \parbox[b][\paperheight]{\paperwidth}{% - \vfill - \centering - \includegraphics[width=\paperwidth,height=\paperheight,% - keepaspectratio]{rose}% - \vfill - }}} + \put(0,0){% + \parbox[b][\paperheight]{\paperwidth}{% + \vfill + \centering + \includegraphics[width=\paperwidth,height=\paperheight,% + keepaspectratio]{rose}% + \vfill + } + } +} % The picture is centered on the page background \AddToShipoutPicture{\BackgroundPicture} @@ -34,7 +33,7 @@ \newpage -\AddToShipoutPicture{\BackgroundPicture} +\AddToShipoutPictureBG{\BackgroundPicture} \section{\LaTeX} \end{document} diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex deleted file mode 100644 index 4465d3e3f89..00000000000 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex +++ /dev/null @@ -1,42 +0,0 @@ - -% file `eso-ex3.tex'; an example for import pages of another (pdf) document. -% This works only with `pdfTeX' (maybe `VTeX'?). -% Based on an article from Andreas Matthias in d.c.t.t -% -% A much better solution is Andreas' package `pdfpages'. -% -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de - -\documentclass[a4paper]{article} -\usepackage[pdftex]{graphicx}% -% `pdftex.def' >= 2000/05/12 v0.02u and `pdftex' >= v0.14 are needed. -\usepackage{ifthen,calc,eso-pic} - -\newcounter{thispdfpage}\newcounter{afterlastpdfpage} -\newcommand{\includepdfpages}[3] -{% - \setcounter{thispdfpage}{#2}\setcounter{afterlastpdfpage}{#3+1}% - \newpage - \whiledo{\value{thispdfpage} < \value{afterlastpdfpage}}% - {% - \AddToShipoutPicture* - {% - \put(0,0){% - \includegraphics[width=\paperwidth,height=\paperheight,% - keepaspectratio,page=\arabic{thispdfpage}]{#1}}% - } - \thispagestyle{empty}\mbox{}\newpage - \stepcounter{thispdfpage}% - } -} - -\begin{document} - -\section{First page of the main document} - -% import pages 1 to 3 of an external document. -\includepdfpages{ltx3info.pdf}{1}{3} - -\section{First page after the imported pages of the external document} - -\end{document} diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex index eb617a7bbd6..46a66c5774c 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex @@ -1,32 +1,54 @@ % file `eso-ex4.tex'; a framed text area example -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de \listfiles\setcounter{errorcontextlines}{100} \documentclass[a4paper,twoside]{article} -\usepackage{graphicx,color} +\usepackage{graphicx,pict2e} \usepackage{eso-pic} -\definecolor{lightgray}{gray}{.75} -\AddToShipoutPicture{% - \AtTextLowerLeft{% - \framebox(\LenToUnit{\textwidth},\LenToUnit{\textheight}){}}} +\AddToShipoutPictureBG{% + \AtTextLowerLeft{\framebox(\textwidth,\textheight){}}} \setlength\parindent{0pt} \begin{document} \section*{First page} + + \AddToShipoutPictureBG*{% on the background, only this page + \AtTextUpperLeft{% + \put(30mm,-25mm){\color{lightgray}\circle*{50}} + } + } + \AddToShipoutPictureFG*{% on the foreground, only this page + \AtTextUpperLeft{% + \put(60mm,-25mm){\color{lightgray}\circle*{50}} + } + } This page and all the following have a frame around the - text area. + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par \vfill X \hfill X\newpage \section*{Second page} - \AddToShipoutPicture*{% + \AddToShipoutPictureBG*{% \AtTextCenter{% \makebox(0,0)[c]{\resizebox{\textwidth}{!}{% \rotatebox{45}{\textsf{\textbf{\color{lightgray}DRAFT}}}}} 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 6c6e1e9ea5e..78d0ee5ef79 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex @@ -1,6 +1,5 @@ % file `eso-ex5.tex'; background grid example -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de \listfiles\setcounter{errorcontextlines}{100} \documentclass[a4paper,twoside]{article} diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex b/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex index 5df69f737e4..ad88f57fcdf 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex @@ -1,5 +1,3 @@ -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de - \setcounter{errorcontextlines}{100} \listfiles \documentclass[twoside,a4paper,showtrims]{memoir} @@ -19,6 +17,7 @@ \AddToShipoutPicture{% \AtPageLowerLeft{\circle*{40}}% \AtPageUpperLeft{\circle*{40}}% + \AtPageCenter{\circle*{40}}% \AtTextLowerLeft{\circle*{15}}% \AtTextUpperLeft{\circle*{15}}% \AtStockLowerLeft{\circle*{40}}% 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 c1b4fe471b3..961f29e1504 100644 Binary files a/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf and b/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf differ -- cgit v1.2.3