From 29b2df230459512a0f73e5769a1cfc16e4125510 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 Jun 2016 22:53:55 +0000 Subject: textpos (8jun16) git-svn-id: svn://tug.org/texlive/trunk@41331 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/textpos/textpos.sty | 41 ++++++++++++++----------- 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/textpos/textpos.sty b/Master/texmf-dist/tex/latex/textpos/textpos.sty index 3a0776a36ef..e43feb50a6c 100644 --- a/Master/texmf-dist/tex/latex/textpos/textpos.sty +++ b/Master/texmf-dist/tex/latex/textpos/textpos.sty @@ -7,7 +7,7 @@ %% textpos.dtx (with options: `package') %% Textpos: absolute positioning of text on the page %%%% File: textpos.dtx -%%%% Copyright 1999, 2001--2003, 2005-7, 2009-12, 2014, Norman Gray +%%%% Copyright 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -29,11 +29,11 @@ %% %% See the file LICENCE for a copy of the LPPL. %% -%% Mercurial ident: 41b12ce5565c, 2014-01-03 19:15 +0000 +%% Mercurial ident: 8aa202e2b283, 2016-06-07 23:52 +0100 %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{textpos}[2014/01/03 v1.7j] -\typeout{Package: textpos 2014/01/03 1.7j, absolute positioning of text on the page} +\ProvidesPackage{textpos}[2016/06/07 v1.8] +\typeout{Package: textpos 2016/06/07 1.8, absolute positioning of text on the page} \newif\ifTPshowboxes \TPshowboxesfalse @@ -44,6 +44,7 @@ \newif\ifTP@abspos \TP@absposfalse \DeclareOption{absolute}{\TP@abspostrue} +\DeclareOption{relative}{\TP@absposfalse} \newif\ifTP@overlay \TP@overlayfalse \DeclareOption{overlay}{\TP@overlaytrue} @@ -55,6 +56,13 @@ \ifTP@abspos \RequirePackage{everyshi} \fi +\RequirePackage{keyval} +\define@key{tp}{absolute}{\csname TP@abspos#1\endcsname} +\define@key{tp}{overlay}{\csname TP@overlay#1\endcsname} +\define@key{tp}{verbose}{\csname TP@chatter#1\endcsname} +\define@key{tp}{showboxes}{\csname TPshowboxes#1\endcsname} +\define@key{tp}{showtext}{\csname TP@showtext#1\endcsname} +\def\TPoptions{\setkeys{tp}} \def\TP@xfloat#1[#2]{ \par\def\@captype{#1}% \@floatpenalty\z@ @@ -236,9 +244,9 @@ \relax \else \egroup % end of inner vbox - \hskip\TP@absmargin + \hskip\TP@absmargin % (just \hfil would work here, too) \egroup % end of inner hbox - \vskip \TP@absmargin + \vskip\TP@absmargin \fi \ifTPshowboxes \vskip-\TPboxrulesize @@ -260,21 +268,18 @@ \ifdim\TP@margin < 0pt \advance\@tempdima \TP@margin \advance\@tempdimb \TP@margin - % #1,#2 are proportions of \TP@textbox size - \@tempdimc=-#1\wd\TP@textbox - \advance\@tempdima\@tempdimc - \@tempdimc=-#2\ht\TP@textbox - \advance\@tempdimb\@tempdimc - \else - % \TP@margin is positive - % #1,#2 are proportions of \TP@framebox size = \TP@textbox+2\TP@margin \@tempdimc=\wd\TP@textbox - \advance\@tempdimc 2\TP@margin - \@tempdimc=#1\@tempdimc + \advance\@tempdimc 2\TP@margin % now \@tempdimc is width of textblock + \multiply\@tempdimc #1 \advance\@tempdima -\@tempdimc \@tempdimc=\ht\TP@textbox - \advance\@tempdimc 2\TP@margin - \@tempdimc=#2\@tempdimc + \advance\@tempdimc 2\TP@margin % now \@tempdimc is height of textblock + \multiply\@tempdimc #2 + \advance\@tempdimb -\@tempdimc + \else + \@tempdimc=#1\wd\TP@textbox + \advance\@tempdima -\@tempdimc + \@tempdimc=#2\ht\TP@textbox \advance\@tempdimb -\@tempdimc \fi \ifTP@abspos -- cgit v1.2.3