textpos (30sep10)

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

1 files changed, 6 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/textpos/textpos.sty b/Master/texmf-dist/tex/latex/textpos/textpos.sty
index e8c0f34d251..20d6a6d4288 100644
--- a/Master/texmf-dist/tex/latex/textpos/textpos.sty
+++ b/Master/texmf-dist/tex/latex/textpos/textpos.sty
@@ -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}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{textpos}[\filedate\space v\fileversion]
 \typeout{Package: `textpos' \fileversion\space<\docdate>}
@@ -67,8 +66,7 @@
 \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?}}
 \newbox\TP@textbox
 \ifTP@abspos
   \newbox\TP@holdbox            % starts off void
@@ -175,8 +173,8 @@
 \let\textblockrulecolor\textblockrulecolour
 \let\tekstblokroolkulur\textblockrulecolour
 \@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
   }{}
 \def\textblock#1{%
   \@tempdima=#1\TPHorizModule