textpos update (22mar07)

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

2 files changed, 80 insertions, 28 deletions

diff --git a/Master/texmf-dist/source/latex/textpos/textpos.drv b/Master/texmf-dist/source/latex/textpos/textpos.drv
index 246f3b2a66f..40f151eb618 100644
--- a/Master/texmf-dist/source/latex/textpos/textpos.drv
+++ b/Master/texmf-dist/source/latex/textpos/textpos.drv
@@ -6,7 +6,7 @@
 %%
 %% textpos.dtx  (with options: `driver')
 %% 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,23 +28,28 @@
 %% 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}
 \documentclass{ltxdoc}
 \title{Textpos: absolute positioning of text on the page}
 \author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})}
 \date{Version \fileversion, \filedate}
-\newcommand\Lopt[1]{\textsf {#1}}
+\newcommand\Lopt[1]{\textsf {\small [#1]}}
 \newcommand\file[1]{\texttt {#1}}
 \newcommand\Lcount[1]{\textsl {\small#1}}
 \newcommand\Lenv[1]{\texttt{\{#1\}}}
 \newcommand\pstyle[1]{\textsl {#1}}
+\makeatletter % make the ttfamily font less overbearingly large
+\renewcommand\ttfamily{\not@math@alphabet\ttfamily\mathtt
+    \fontfamily\ttdefault
+    \fontsize{9}{\f@baselineskip}\selectfont}
+\makeatother
 \def\activemeta#1>{\meta{#1}}
 {\catcode`\<=\active
  \gdef\cmd{\begingroup
diff --git a/Master/texmf-dist/source/latex/textpos/textpos.dtx b/Master/texmf-dist/source/latex/textpos/textpos.dtx
index 475a7ab62a3..b13c43e782e 100644
--- a/Master/texmf-dist/source/latex/textpos/textpos.dtx
+++ b/Master/texmf-dist/source/latex/textpos/textpos.dtx
@@ -2,7 +2,7 @@
 % This is textpos.dtx, which allows you to place text (and graphics)
 % anywhere on the LaTeX page.  It's useful for posters.
 %
-%% 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
@@ -24,15 +24,15 @@
 %% 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 .
 %%
-%<+package|driver|example>%%% Source: $Id: textpos.dtx.in,v 1.11 2006/09/04 10:13:51 norman Exp $
+%<+package|driver|example>%%% Source: $Id: textpos.dtx.in,v 1.13 2007/03/21 20:37:33 norman Exp $
 %%
 %<*package|driver>
 %%\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}
 %</package|driver>
 %<+package>\NeedsTeXFormat{LaTeX2e}
 %<+package>\ProvidesPackage{textpos}[\filedate\space v\fileversion]
@@ -43,11 +43,16 @@
 \title{Textpos: absolute positioning of text on the page}
 \author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})}
 \date{Version \fileversion, \filedate}
-\newcommand\Lopt[1]{\textsf {#1}}
+\newcommand\Lopt[1]{\textsf {\small [#1]}}
 \newcommand\file[1]{\texttt {#1}}
 \newcommand\Lcount[1]{\textsl {\small#1}}
 \newcommand\Lenv[1]{\texttt{\{#1\}}}
 \newcommand\pstyle[1]{\textsl {#1}}
+\makeatletter % make the ttfamily font less overbearingly large
+\renewcommand\ttfamily{\not@math@alphabet\ttfamily\mathtt
+    \fontfamily\ttdefault
+    \fontsize{9}{\f@baselineskip}\selectfont}
+\makeatother
 % Make command strings easier to write
 \def\activemeta#1>{\meta{#1}}
 {\catcode`\<=\active
@@ -319,11 +324,11 @@
 %
 % \pstyle{Textpos} overrides any \Lenv{figure} and \Lenv{table}
 % \marginpar{Figure and table environments}
-% environments within instances of the \Lenv{textblock} environment
-% (it does not, however, do so outside the environment, so you are
+% environments \emph{within} instances of the \Lenv{textblock} environment.
+% It does not, however, do so outside the environment, so you are
 % still able to use \pstyle{textblock} within figures, as described
 % above; also it avoids doing so unless the documentclass already
-% defined a \Lenv{figure} environment).  This is because the normal
+% defined a \Lenv{figure} environment.  This is because the normal
 % behaviour of these environments -- which is to float their contents
 % away from the point of definition -- obviously interacts very badly
 % with the \Lenv{textblock} environment, since 
@@ -338,8 +343,30 @@
 % example -- but many people automatically use them to surround
 % graphics or tables, and also expect to use these environments to
 % number figures and tables within \Lenv{textblock} environments; they
-% are therefore here on a principle of least surprise.  This feature
-% is still somewhat provisional, and may still be a little buggy.
+% are therefore here on a principle of least surprise.
+%
+% Since both \LaTeX's floats mechanism (that is, \Lenv{figure} and
+% \Lenv{table}) and the \Lopt{absolute} mode are designed to move
+% content around, we can't expect them to play together nicely.  With
+% \Lopt{absolute} mode on, the contents of a \Lenv{textblock} inside a
+% floating \Lenv{figure} probably isn't going to end up where you
+% expect it to.  The only case I can think of where this would
+% inconvenience you, is if you wanted some absolutely-positioned
+% material to appear on the `next' page.  You might at first try to use
+% a |\begin{figure}[p]| -- that won't work, but the following will, if
+% you first load the \pstyle{afterpage} package:
+% \begin{verbatim}
+%  \afterpage{%
+%    \newpage%
+%    \begin{textblock*}{297mm}(0mm,0mm)%
+%      \includegraphics{picture.png}% a full-page picture?
+%    \end{textblock*}%
+%    \null%
+%    \newpage}
+% \end{verbatim}
+% This inserts a complete page, with some graphic on it, immediately
+% after the end of the current page (thanks to Matthias Gloede for
+% this technique).
 %
 % \DescribeMacro{\textblockcolour}
 % The text blocks can be coloured in.  If you load the \pstyle{color}
@@ -558,7 +585,11 @@
 % borders, and that it would be useful to turn the bordering feature
 % on and off within the file.
 %
-% Thanks also for bugreports to Jozef Bednarcik and Wolfgang Fleischer.
+% Thanks also for bugreports to Jozef Bednarcik, Wolfgang Fleischer
+% and Robert Whittaker.
+%
+% If you've reported a bug or made a suggestion and I haven't credited
+% you here, please do accept my apologies, and please let me know.
 %
 % \section{Example}
 %
@@ -1027,15 +1058,24 @@ located at that point, rather than the top-left corner.
 % of the margin, to set the text in a block which is that much smaller
 % than the enclosing box, and (b) include the same amount of vertical
 % skip before and after the text block.
+% \changes{v1.7b}{2007/03/21}{Fixed lists inside boxes with non-zero margins}
 %    \begin{macrocode}
-    \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
   }
 %    \end{macrocode}
 % \end{macro}
@@ -1071,7 +1111,14 @@ located at that point, rather than the top-left corner.
 % value of this margin.
 %    \begin{macrocode}
 \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}%