textpos (30sep10)

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

2 files changed, 44 insertions, 39 deletions

diff --git a/Master/texmf-dist/source/latex/textpos/textpos.drv b/Master/texmf-dist/source/latex/textpos/textpos.drv
index b4e38eaf756..d7469f6cbe1 100644
--- a/Master/texmf-dist/source/latex/textpos/textpos.drv
+++ b/Master/texmf-dist/source/latex/textpos/textpos.drv
@@ -28,12 +28,11 @@
 %% 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: @HGIDENT@
 %%
 \def\filename{textpos}
-\def\fileversion{1.7f}
-\def\filedate{2009/05/28}
-\def\docdate{2009 May 28}
+\def\fileversion{1.7g}
+\def\filedate{2010/09/30}
+\def\docdate{2010 September 30}
 \documentclass{ltxdoc}
 \title{Textpos: absolute positioning of text on the page}
 \author{Norman Gray\\(\texttt{http://nxg.me.uk})}
diff --git a/Master/texmf-dist/source/latex/textpos/textpos.dtx b/Master/texmf-dist/source/latex/textpos/textpos.dtx
index b2faedc0d2e..4f31405e049 100644
--- a/Master/texmf-dist/source/latex/textpos/textpos.dtx
+++ b/Master/texmf-dist/source/latex/textpos/textpos.dtx
@@ -24,13 +24,12 @@
 %% 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: @HGIDENT@
 %%
 %<*package|driver>
 \def\filename{textpos}
-\def\fileversion{1.7f}
-\def\filedate{2009/05/28}
-\def\docdate{2009 May 28}
+\def\fileversion{1.7g}
+\def\filedate{2010/09/30}
+\def\docdate{2010 September 30}
 %</package|driver>
 %<+package>\NeedsTeXFormat{LaTeX2e}
 %<+package>\ProvidesPackage{textpos}[\filedate\space v\fileversion]
@@ -96,7 +95,7 @@
 %
 % This package facilitates placing boxes at absolute positions on the
 % \LaTeX\ page.  There are several reasons why this might be useful, but
-% the reaason which originally motivated this package is to help produce a
+% the reason which originally motivated this package is to help produce a
 % large-format conference poster.  However the facility is also useful
 % for filling in forms or other special purpose layout.
 %
@@ -158,7 +157,7 @@
 % box \meta{hsize} modules wide, and placed on the page with its
 % upper left corner at the position (\textit{hpos,vpos}).  As is
 % natural in \TeX, the \meta{vpos} parameter indicates distance
-% \emph{down} from the reference point.
+% \emph{down} from the `anchor point' (see below).
 %
 % The \Lenv{textblock} parameters may be whole numbers or
 % fractional.  If you want or need to give explicit sizes here, see
@@ -171,6 +170,33 @@
 % environment, and whether or not this is sensible, it's not going to
 % change now.
 %
+% This package works in two modes, relative and absolute.
+% \marginpar{relative \& absolute mode}
+% In the first one, the default, the block-positioning parameters in the
+% \Lenv{textblock} envirionment are taken to be relative to an `anchor
+% point' which is the current position on the page, that is, the place
+% where (the bottom left of) a character would appear if it were typed
+% at this point.  This will be appropriate if you are
+% laying out text within a \texttt{figure} environment or the like.
+% In this mode, you will typically give several \Lenv{textblock}
+% environments one after the other, so that they are all relative to
+% the same point.
+%
+% If, however, your entire 
+% document is to be laid out piece by piece (which is the case in the
+% canonical use of the package, to lay out a poster), then you might
+% want to be more sure of where the origin is.  In this case, you make
+% the package work in its absolute mode, by invoking it with
+% the \Lopt{absolute} option: |\usepackage[absolute]{textpos}|.
+% In this mode, all the block-positioning parameters are given
+% relative to a single origin on the page.  By default, this `anchor point' is the
+% top-left corner of the page, but you may change it with the 
+% command \cmd|\textblockorigin{<hpos>}{<vpos>}|.
+% Here \meta{hpos} and \meta{vpos} are dimensions such as `10mm',
+% relative to the top-left corner of the paper.  You may use this
+% command only if the package was invoked with the \Lopt{absolute}
+% option.  See also section~\ref{absolute-newpage}.
+%
 % The textblocks are placed on the page in the order in which they
 % appear in the file.  This means that later textblocks will be placed
 % on top of earlier ones, which may matter if one or other contains,
@@ -219,7 +245,7 @@
 % \end{quote}
 % The coordinates \meta{ho} and \meta{vo} are fractions of the
 % width and height of the text box, respectively, and state that the
-% box is to be placed so that the
+% box is to be placed so that the reference
 % point (\meta{ho},\meta{vo}) within the box is to be placed at the point
 % (\meta{hpos},\meta{vpos}) on the page.  The default specification is
 % [0,0], the top left of the box: [0,1] would be the bottom left, and
@@ -285,30 +311,6 @@
 % being overprinted), so you can (and typically will) use several of
 % the environments in a row to scatter text all over the page.
 %
-% This package works in two modes, relative and absolute.  In the
-% first one, the default, the block-positioning parameters in the
-% \Lenv{textblock} envirionment are taken to be relative to the
-% current position on the page.  This will be appropriate if you are
-% laying out text within a \texttt{figure} environment or the like.
-% In this mode, you will typically give several \Lenv{textblock}
-% environments one after the other, so that they are all relative to
-% the same point.
-%
-% If, however, your entire 
-% document is to be laid out piece by piece (which is the case in the
-% canonical use of the package, to lay out a poster), then you might
-% want to be more sure of where the origin is.  In this case, you make
-% the package work in its absolute mode, by invoking it with
-% the \Lopt{absolute} option: |\usepackage[absolute]{textpos}|.
-% In this mode, all the block-positioning parameters are given
-% relative to a single origin on the page.  By default, this is the
-% top-left corner of the page, but you may change it with the 
-% command \cmd|\textblockorigin{<hpos>}{<vpos>}|.
-% Here \meta{hpos} and \meta{vpos} are dimensions such as `10mm',
-% relative to the top-left corner of the paper.  You may use this
-% command only if the package was invoked with the \Lopt{absolute}
-% option.  See also section~\ref{absolute-newpage}.
-%
 % The package is compatible with the \pstyle{calc} package, so that
 % you may use calc-style expressions when specifying lengths.  Thus
 % \begin{quote}
@@ -559,6 +561,11 @@
 % slides start at a consistent point, you can fairly happily use Textpos in
 % relative mode as long as the \Lenv{textblock} environment is the
 % first thing on the slide.
+% \marginpar{\dots \& beamer}
+% The same appears to be true with the beamer package.  Indeed
+% \emph{anything} doing things at |\shipout| time (which includes
+% Textpos in absolute mode) is going to be in a precarious position
+% with respect ot anything else which plays games here.
 %
 % There's also an unfortunate interaction with the \texttt{color}
 % package\marginpar{textpos \& color}.  Textpos in absolute mode, and
@@ -773,8 +780,7 @@ located at that point, rather than the top-left corner.
 \def\TP@xympar{
   \PackageError{textpos}
     {You can't use \protect\marginpar\space within a textblock}
-    {You're using textpos because you _don't_ want things to float
-      around, yes?}}
+    {You're using textpos because you _don't_ want things to float around, yes?}}
 %    \end{macrocode}
 %
 % \subsection{The box handling starts here}
@@ -1017,8 +1023,8 @@ located at that point, rather than the top-left corner.
 % we use.
 %    \begin{macrocode}
 \@ifundefined{color}%
-  {\gdef\color#1{}%
-   \gdef\color@block#1#2#3{}%
+  {\DeclareRobustCommand\color[2][]{}% Replace \color{foo} and \color[x]{foo}
+   \gdef\color@block#1#2#3{}% I think this 2nd one is redundant, given the TP@colourblock code below
   }{}
 %
 % \begin{macro}{\textblock}