diff options
author | Karl Berry <karl@freefriends.org> | 2015-07-17 22:43:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-07-17 22:43:40 +0000 |
commit | 434655949fe52c9a2e013395851a44b5c944afc7 (patch) | |
tree | 06832acdd057141d41f0b5efc172819a18f69661 | |
parent | 2eb68739e4e9efd16a86725579bcbda3e55157e7 (diff) |
eso-pic (14jul15)
git-svn-id: svn://tug.org/texlive/trunk@37881 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex | 16 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex | 20 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex | 14 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/eso-pic/eso-memoir-test.tex | 18 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf | bin | 248697 -> 249688 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/eso-pic/eso-pic.dtx | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty | 4 |
9 files changed, 49 insertions, 45 deletions
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 98824b7f602..6241e37d3fc 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex1.tex @@ -1,6 +1,6 @@ % file `eso-ex1.tex'; a framed background example -% Rolf Niepraschk, 2005-12-25, Rolf.Niepraschk@ptb.de +% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de \documentclass[a4paper]{article} \usepackage{eso-pic,calc} @@ -15,7 +15,7 @@ \thicklines% \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdima}){% \framebox(\LenToUnit{\@tempdimb},\LenToUnit{\@tempdimc}){}}% - \endgroup + \endgroup } \makeatother @@ -26,14 +26,14 @@ This page and all the following have a frame with 15~mm distance from the paper edges.\newpage - \section*{Second page} - + \section*{Second page} + \AddToShipoutPicture*{\put(100,100){\circle{40}}} - - Only this page has a circle on the lower left side. - + + Only this page has a circle on the lower left side. + \newpage \section*{Last page} - + \end{document} 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 2874ca477d0..37012a958e1 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex2.tex @@ -1,7 +1,7 @@ % file `eso-ex2.tex'; an example for background pictures -% Rolf Niepraschk, 2005-12-25, Rolf.Niepraschk@ptb.de -\listfiles +% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de +\listfiles\setcounter{errorcontextlines}{100} \documentclass{article} \usepackage{eso-pic} @@ -18,7 +18,7 @@ \includegraphics[width=\paperwidth,height=\paperheight,% keepaspectratio]{rose}% \vfill - }}} + }}} % The picture is centered on the page background \AddToShipoutPicture{\BackgroundPicture} @@ -37,4 +37,4 @@ \AddToShipoutPicture{\BackgroundPicture} \section{\LaTeX} -\end{document} +\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 index ccbb75f2b86..4465d3e3f89 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex3.tex @@ -5,7 +5,7 @@ % % A much better solution is Andreas' package `pdfpages'. % -% Rolf Niepraschk, 2005-12-25, Rolf.Niepraschk@ptb.de +% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de \documentclass[a4paper]{article} \usepackage[pdftex]{graphicx}% @@ -29,7 +29,7 @@ \stepcounter{thispdfpage}% } } - + \begin{document} \section{First page of the main document} @@ -37,6 +37,6 @@ % 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} +\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 fed7e016740..eb617a7bbd6 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex4.tex @@ -1,8 +1,8 @@ % file `eso-ex4.tex'; a framed text area example -% Rolf Niepraschk, 2005-12-25, Rolf.Niepraschk@ptb.de +% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de -\listfiles\errorcontextlines=100 +\listfiles\setcounter{errorcontextlines}{100} \documentclass[a4paper,twoside]{article} \usepackage{graphicx,color} \usepackage{eso-pic} @@ -17,30 +17,30 @@ \begin{document} \section*{First page} - + This page and all the following have a frame around the text area. \vfill X \hfill X\newpage - \section*{Second page} - + \section*{Second page} + \AddToShipoutPicture*{% \AtTextCenter{% \makebox(0,0)[c]{\resizebox{\textwidth}{!}{% - \rotatebox{45}{\textsf{\textbf{\color{lightgray}DRAFT}}}}} + \rotatebox{45}{\textsf{\textbf{\color{lightgray}DRAFT}}}}} } } - + Only this page has rotated text in the center of the text area. - + \vfill X \hfill X\newpage \section*{Last page} - + \vfill X \hfill X - + \end{document} 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 26c4f1033ba..36d2e4382f6 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-ex5.tex @@ -1,13 +1,13 @@ -% file `eso-ex5.tex'; background grid example -% Rolf Niepraschk, 2005-12-25, Rolf.Niepraschk@ptb.de +% file `eso-ex5.tex'; background grid example +% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de -\listfiles\errorcontextlines=100 +\listfiles\setcounter{errorcontextlines}{100} \documentclass[a4paper,twoside]{article} % a4paper = 210mm x 297mm = 596bp x 842bp = 8.27in x 11.69in -% letterpaper = 215.9mm x 279.4mm = 612bp x 792bp = 8.5in x 11in +% letterpaper = 215.9mm x 279.4mm = 612bp x 792bp = 8.5in x 11in -%\usepackage[a3,center]{crop} +%\usepackage[a3,center]{crop} \usepackage[dvips]{geometry} % `dvips', `pdfTeX' and `VTeX' should know the papersize. @@ -33,14 +33,14 @@ \AtPageUpperLeft{\circle*{6}% \put(-2,-5){\makebox(0,0)[lb]{\cmd{AtPageUpperLeft}}}}% \AtPageLowerLeft{\circle*{6}% - \put(-2,5){\makebox(0,0)[lt]{\cmd{AtPageLowerLeft}}}}% + \put(-2,5){\makebox(0,0)[lt]{\cmd{AtPageLowerLeft}}}}% } \setlength\parindent{0pt} \begin{document} \Huge \bfseries -\hrulefill First Page\hrulefill \vfill X \hfill X \newpage +\hrulefill First Page\hrulefill \vfill X \hfill X \newpage \hrulefill Second Page\hrulefill \vfill X \hfill X \end{document} 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 17343367b01..5df69f737e4 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,4 +1,6 @@ -\errorcontextlines=100\relax +% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de + +\setcounter{errorcontextlines}{100} \listfiles \documentclass[twoside,a4paper,showtrims]{memoir} %------------------------------------ @@ -23,19 +25,19 @@ \AtStockUpperLeft{\circle*{40}}% \AtStockCenter{\circle*{40}}% } - + \begin{document} \Huge \bfseries \noindent -\hrulefill First Page\hrulefill +\hrulefill First Page\hrulefill \vfill -\noindent -X \hfill X -\newpage \noindent -\hrulefill Second Page\hrulefill +X \hfill X +\newpage +\noindent +\hrulefill Second Page\hrulefill \vfill -\noindent +\noindent X \hfill X \end{document} diff --git a/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf b/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf Binary files differindex 3e423dfd754..e1b544e9faa 100644 --- a/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf +++ b/Master/texmf-dist/doc/latex/eso-pic/eso-pic.pdf 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 231b1ca007b..fea95dd2e1e 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/04/20 v2.0e eso-pic (RN)] +%<package> [2015/07/14 v2.0f eso-pic (RN)] % %<*driver> \documentclass[a4paper]{ltxdoc} @@ -37,7 +37,7 @@ %</driver> % \fi % -% \CheckSum{757} +% \CheckSum{760} % % \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 @@ -212,8 +212,10 @@ % \begin{macro}{\LenToUnit} % \changes{v1.0d}{2006/07/14}{Using \cmd{\providecommand} instead of % \cmd{\newcommand} for \cmd{\LenToUnit}} +% \changes{v2.0f}{2015/07/14}{Changed definition for better compatibility +% with package \pkgname{curve2e} suggested by Claudio Beccari.} % \begin{macrocode} -\providecommand*\LenToUnit[1]{#1\@gobble} +\providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength} % \end{macrocode} % \end{macro} % \begin{macro}{\ESO@isMEMOIR} 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 0f2d8e1da0e..8bc696ce6f5 100644 --- a/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty +++ b/Master/texmf-dist/tex/latex/eso-pic/eso-pic.sty @@ -23,9 +23,9 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{eso-pic} - [2015/04/20 v2.0e eso-pic (RN)] + [2015/07/14 v2.0f eso-pic (RN)] \RequirePackage{atbegshi} -\providecommand*\LenToUnit[1]{#1\@gobble} +\providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength} \newcommand\ESO@isMEMOIR[2]{#2} \@ifclassloaded{memoir}{\renewcommand\ESO@isMEMOIR[2]{#1}}{} \newcommand\AtPageUpperLeft[1]{% |