textpos 1.7 (24aug06)

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

1 files changed, 31 insertions, 21 deletions

diff --git a/Master/texmf-dist/tex/latex/textpos/textpos.sty b/Master/texmf-dist/tex/latex/textpos/textpos.sty
index 00e89a02afe..b9d6f0b236b 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 Norman Gray.
+%% This software is copyright, 1999, 2001--2003, 2005, 2006 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,20 +28,20 @@
 %% 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.8 2006/08/10 21:40:56 norman Exp $
+%%% Source: $Id: textpos.dtx.in,v 1.9 2006/08/24 13:59:21 norman Exp $
 %%
 %%\def\ParseRCSDate$#1: #2 #3 ${\def\TP@Date{#2}}
-%%\ParseRCSDate$Date: 2006/08/10 21:40:56 $
+%%\ParseRCSDate$Date: 2006/08/24 13:59:21 $
 \def\filename{textpos}
-\def\fileversion{1.6b}
-\def\filedate{2006/08/10}
-\def\docdate{2006 August 10}
+\def\fileversion{1.7}
+\def\filedate{2006/08/24}
+\def\docdate{2006 August 24}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{textpos}[\filedate\space v\fileversion]
 \typeout{Package: `textpos' \fileversion\space<\docdate>}
-\newif\ifTP@showboxes
-\TP@showboxesfalse
-\DeclareOption{showboxes}{\TP@showboxestrue}
+\newif\ifTPshowboxes
+\TPshowboxesfalse
+\DeclareOption{showboxes}{\TPshowboxestrue}
 \newif\ifTP@showtext
 \TP@showtexttrue
 \DeclareOption{noshowtext}{\TP@showtextfalse}
@@ -152,6 +152,16 @@
 \def\TP@blockcolour{}           % safe initial default
 \let\textblockcolor\textblockcolour
 \let\tekstblokkulur\textblockcolour
+\def\textblockrulecolour#1{%
+  \@ifundefined{color}%
+    {\gdef\TP@rulecolour{}}% ignore argument, switch off colour blocking below
+    {%
+      \def\@tempa{#1}
+      \gdef\TP@rulecolour{#1}%
+    }}
+\def\TP@rulecolour{black}
+\let\textblockrulecolor\textblockrulecolour
+\let\tekstblokroolkulur\textblockrulecolour
 \def\textblock#1{%
   \@tempdima=#1\TPHorizModule
   \ifvmode\else
@@ -190,8 +200,8 @@
     \let\endtable\relax
   }
   \setbox\TP@textbox=\vbox\bgroup
-    \ifTP@showboxes
-      \hrule height0pt depth \TPboxrulesize
+    \ifTPshowboxes
+      {\color{\TP@rulecolour} \hrule height0pt depth \TPboxrulesize }%
       \vskip-\TPboxrulesize
     \fi
     \hsize=\@tempdima
@@ -208,9 +218,9 @@
 \newdimen\TP@prevdepth
 \def\TP@commonendtextblock{%
     \vskip \TP@absmargin
-    \ifTP@showboxes
+    \ifTPshowboxes
         \vskip-\TPboxrulesize
-        \hrule depth 0pt height \TPboxrulesize
+        {\color{\TP@rulecolour}\hrule depth 0pt height \TPboxrulesize}%
     \fi
     \egroup % end of \TP@textbox
   \TP@prevdepth=\prevdepth
@@ -261,16 +271,16 @@
     \ifx\TP@defaultblockcolour\@undefined \else
       \global\let\TP@blockcolour\TP@defaultblockcolour
     \fi
-    \ifTP@showboxes
-      \vrule width \TPboxrulesize
+    \ifTPshowboxes
+      {\color{\TP@rulecolour}\vrule width \TPboxrulesize}%
       \hskip -\TPboxrulesize
     \fi
     \ifTP@showtext
       \box\TP@textbox
     \else
       \vbox to\ht\TP@textbox{%
-        \ifTP@showboxes
-          \hrule depth 0pt height \TPboxrulesize \vskip-\TPboxrulesize
+        \ifTPshowboxes
+          {\color{\TP@rulecolour}\hrule depth 0pt height \TPboxrulesize \vskip-\TPboxrulesize}%
         \fi
         \vskip\smallskipamount
         \hbox to\wd\TP@textbox{%
@@ -284,15 +294,15 @@
           \hss
         }%
         \vss
-        \ifTP@showboxes
+        \ifTPshowboxes
           \vskip -\TPboxrulesize
-          \hrule depth 0pt height \TPboxrulesize
+          {\color{\TP@rulecolour}\hrule depth 0pt height \TPboxrulesize}%
         \fi
       }%
     \fi
-    \ifTP@showboxes
+    \ifTPshowboxes
       \hskip -\TPboxrulesize
-      \vrule width \TPboxrulesize
+      {\color{\TP@rulecolour}\vrule width \TPboxrulesize}%
     \fi
     \hss}%
   \vss