textpos update (22mar07)

git-svn-id: svn://tug.org/texlive/trunk@4105 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 29 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/textpos/textpos.sty b/Master/texmf-dist/tex/latex/textpos/textpos.sty
index 559932ffc10..67de86e0372 100644
--- a/Master/texmf-dist/tex/latex/textpos/textpos.sty
+++ b/Master/texmf-dist/tex/latex/textpos/textpos.sty
@@ -6,7 +6,7 @@
 %%
 %% textpos.dtx  (with options: `package')
 %% Textpos: absolute positioning of text on the page
-%% This software is copyright, 1999, 2001--2003, 2005-6 Norman Gray.
+%% This software is copyright, 1999, 2001--2003, 2005--7 Norman Gray.
 %%
 %% This program is free software; you can redistribute it and/or
 %% modify it under the terms of the GNU General Public License
@@ -28,14 +28,14 @@
 %% See the file LICENCE for a copy of the GPL.
 %% You can also find an online copy at http://www.gnu.org/copyleft/gpl.html .
 %%
-%%% Source: $Id: textpos.dtx.in,v 1.11 2006/09/04 10:13:51 norman Exp $
+%%% Source: $Id: textpos.dtx.in,v 1.13 2007/03/21 20:37:33 norman Exp $
 %%
 %%\def\ParseRCSDate$#1: #2 #3 ${\def\TP@Date{#2}}
-%%\ParseRCSDate$Date: 2006/09/04 10:13:51 $
+%%\ParseRCSDate$Date: 2007/03/21 20:37:33 $
 \def\filename{textpos}
-\def\fileversion{1.7a}
-\def\filedate{2006/09/02}
-\def\docdate{2006 September 2}
+\def\fileversion{1.7b}
+\def\filedate{2007/03/21}
+\def\docdate{2007 March 21}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{textpos}[\filedate\space v\fileversion]
 \typeout{Package: `textpos' \fileversion\space<\docdate>}
@@ -215,20 +215,35 @@
       {\color{\TP@rulecolour}\hrule height0pt depth \TPboxrulesize }%
       \vskip-\TPboxrulesize
     \fi
-    \hsize=\@tempdima
-    \ifdim\TP@margin < 0pt
-        \advance\hsize by 2\TP@absmargin % bigger box
+    \ifdim\TP@margin = 0pt
+      \hsize=\@tempdima
+      \textwidth\hsize \columnwidth\hsize \linewidth\hsize
+    \else
+      \vskip\TP@absmargin
+      \@tempdimb=\@tempdima % \@tempdimb is outer box width
+      \hsize=\@tempdima     % \hsize is inner box width
+      \ifdim\TP@margin < 0pt
+        \advance\@tempdimb by 2\TP@absmargin % bigger box
+      \else
+        \advance\hsize by -2\TP@absmargin    % narrower content
+      \fi
+      \hbox to \@tempdimb\bgroup
+        \hskip\TP@absmargin\vbox\bgroup
+          \textwidth\hsize \columnwidth\hsize \linewidth\hsize
     \fi
-    \leftskip=\TP@absmargin
-    \rightskip=\TP@absmargin
-    \vskip \TP@absmargin
-    \textwidth\hsize \columnwidth\hsize \linewidth\hsize
   }
 \def\endtextblock{\global\@tempswatrue\TP@commonendtextblock}
 \@namedef{endtextblock*}{\global\@tempswafalse\TP@commonendtextblock}
 \newdimen\TP@prevdepth
 \def\TP@commonendtextblock{%
-    \vskip \TP@absmargin
+    \ifdim\TP@margin = 0pt
+      \relax
+    \else
+      \egroup % end of inner vbox
+      \hskip\TP@absmargin
+      \egroup % end of inner hbox
+      \vskip \TP@absmargin
+    \fi
     \ifTPshowboxes
         \vskip-\TPboxrulesize
         {\color{\TP@rulecolour}\hrule depth 0pt height \TPboxrulesize}%