textpos 1.7a (5sep06)

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

12 files changed, 91 insertions, 38 deletions

diff --git a/Master/texmf-dist/doc/latex/textpos/README b/Master/texmf-dist/doc/latex/textpos/README
index effe781c205..e53a0473ca3 100644
--- a/Master/texmf-dist/doc/latex/textpos/README
+++ b/Master/texmf-dist/doc/latex/textpos/README
@@ -2,7 +2,7 @@
 Textpos: absolute positioning of text on the LaTeX page
 -------------------------------------------------------
 
-Version 1.7
+Version 1.7a
 
 This package facilitates placing boxes at absolute positions on the
 LaTeX page.  There are several reasons why this might be useful, but
@@ -38,7 +38,7 @@ or one of the other CTAN hosts.
 Licence
 -------
 
-This software is copyright, 1999, 2001--2003, 2005, Norman Gray.  It
+This software is copyright, 1999, 2001--2003, 2005-6, Norman Gray.  It
 is released under the terms of the GNU General Public Licence.  See
 the copyright declaration at the top of file textpos.dtx, and the file
 LICENCE for the licence conditions.
diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7 b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7
deleted file mode 100644
index 5a1ce950e7e..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7
+++ /dev/null
@@ -1 +0,0 @@
-textpos-1.7, released 2006 August 24
diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7a b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7a
new file mode 100644
index 00000000000..7b56e0a95b5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7a
@@ -0,0 +1 @@
+textpos-1.7a, released 2006 September 2
diff --git a/Master/texmf-dist/doc/latex/textpos/examples/README b/Master/texmf-dist/doc/latex/textpos/examples/README
new file mode 100644
index 00000000000..16b23fb6977
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/examples/README
@@ -0,0 +1,11 @@
+The t?.tex files in this directory are intended as regression tests,
+rather than strictly as examples.  They nonetheless serve to illustrate
+some of what textpos can do.
+
+Not all of them actually work, as regression tests, right now, but
+this is because when comparing binary formats such as .dvi files,
+it's not always completely obvious what counts as a significant
+change.  Any comments and suggestions would be welcome.
+
+Norman
+2006 September 2
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
index 163ad90f3c8..4e80331da49 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
+++ b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
@@ -6,7 +6,7 @@
 %%
 %% textpos.dtx  (with options: `example')
 %% Textpos: absolute positioning of text on the page
-%% This software is copyright, 1999, 2001--2003, 2005, 2006 Norman Gray.
+%% This software is copyright, 1999, 2001--2003, 2005-6 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,7 +28,7 @@
 %% 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.9 2006/08/24 13:59:21 norman Exp $
+%%% Source: $Id: textpos.dtx.in,v 1.11 2006/09/04 10:13:51 norman Exp $
 %%
 \documentclass{article}
 
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.html b/Master/texmf-dist/doc/latex/textpos/textpos.html
index ec75a9dfc3a..edf4e38897b 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.html
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.html
@@ -15,7 +15,7 @@
 page.</p>
 <p>The textpos home page is at <a href='http://purl.org/nxg/dist/textpos'
 ><code>http://purl.org/nxg/dist/textpos</code></a></p>
-<p>Version 1.7, 2006 August 24.</p>
+<p>Version 1.7a, 2006 September 2.</p>
 </div>
 
 <p>This package facilitates placing boxes at absolute positions on the
@@ -39,6 +39,13 @@ conference posters with LaTeX</a>.</p>
 
 <dl>
 
+<dt>1.7a, 2006 September 2</dt>
+<dd>Version 1.7 created an inadvertant dependency on the
+<code>{color}</code> package.  Now, if you do not load that package,
+<code>\textblockrulecolour</code> will have no effect, rather than
+failing.  Textpos will give you a warning in this case, reminding you
+to load the <code>{color}</code> package.</dd>
+
 <dt>1.7, 2006 August 24</dt>
 <dd>Added the <code>\textblockrulecolour</code> and
 <code>\TPshowboxes{true,false}</code> commands, to further control the
@@ -135,7 +142,7 @@ up-to-date versions available there.</p>
 
 <div class="signature">
 <a href="http://nxg.me.uk" >Norman Gray</a><br />
-2006 August 24
+2006 September 2
 </div>
 
 </body>
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.pdf b/Master/texmf-dist/doc/latex/textpos/textpos.pdf
index 00522e9e03d..480ef1395e1 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.pdf
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.pdf
diff --git a/Master/texmf-dist/source/latex/textpos/textpos.drv b/Master/texmf-dist/source/latex/textpos/textpos.drv
index afc9b558934..246f3b2a66f 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, 2006 Norman Gray.
+%% This software is copyright, 1999, 2001--2003, 2005-6 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.9 2006/08/24 13:59:21 norman Exp $
+%%% Source: $Id: textpos.dtx.in,v 1.11 2006/09/04 10:13:51 norman Exp $
 %%
 %%\def\ParseRCSDate$#1: #2 #3 ${\def\TP@Date{#2}}
-%%\ParseRCSDate$Date: 2006/08/24 13:59:21 $
+%%\ParseRCSDate$Date: 2006/09/04 10:13:51 $
 \def\filename{textpos}
-\def\fileversion{1.7}
-\def\filedate{2006/08/24}
-\def\docdate{2006 August 24}
+\def\fileversion{1.7a}
+\def\filedate{2006/09/02}
+\def\docdate{2006 September 2}
 \documentclass{ltxdoc}
 \title{Textpos: absolute positioning of text on the page}
 \author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})}
diff --git a/Master/texmf-dist/source/latex/textpos/textpos.dtx b/Master/texmf-dist/source/latex/textpos/textpos.dtx
index 9e29d4df826..475a7ab62a3 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, 2006 Norman Gray. 
+%% This software is copyright, 1999, 2001--2003, 2005-6 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.9 2006/08/24 13:59:21 norman Exp $
+%<+package|driver|example>%%% Source: $Id: textpos.dtx.in,v 1.11 2006/09/04 10:13:51 norman Exp $
 %%
 %<*package|driver>
 %%\def\ParseRCSDate$#1: #2 #3 ${\def\TP@Date{#2}}
-%%\ParseRCSDate$Date: 2006/08/24 13:59:21 $
+%%\ParseRCSDate$Date: 2006/09/04 10:13:51 $
 \def\filename{textpos}
-\def\fileversion{1.7}
-\def\filedate{2006/08/24}
-\def\docdate{2006 August 24}
+\def\fileversion{1.7a}
+\def\filedate{2006/09/02}
+\def\docdate{2006 September 2}
 %</package|driver>
 %<+package>\NeedsTeXFormat{LaTeX2e}
 %<+package>\ProvidesPackage{textpos}[\filedate\space v\fileversion]
@@ -112,7 +112,7 @@
 % \url{http://www.tex.ac.uk/tex-archive/macros/latex/contrib/supported/ms/} 
 % or one of the other CTAN hosts.
 %
-% This software is copyright, 1999, 2001--03, 2005, Norman Gray.  It
+% This software is copyright, 1999, 2001--03, 2005-6, Norman Gray.  It
 % is released under
 % the terms of the GNU General Public Licence.  See the copyright
 % declaration at the top of file \texttt{textpos.dtx}, and the file
@@ -867,7 +867,11 @@ located at that point, rather than the top-left corner.
 %    \begin{macrocode}
 \def\textblockcolour#1{%
   \@ifundefined{color}%
-    {\gdef\TP@blockcolour{}}% ignore argument, switch off colour blocking below
+    {%
+      \gdef\TP@blockcolour{}% ignore argument, switch off colour blocking below
+      \PackageWarning{textpos}{command textblockcolour used, but
+        {color} package not loaded.\MessageBreak Colour changes ignored.}%
+    }
     {%
       \def\@tempa{#1}
       \gdef\TP@blockcolour{#1}
@@ -892,11 +896,19 @@ located at that point, rather than the top-left corner.
 % \end{macro}
 %
 % \begin{macro}{\textblockrulecolour}
+% We select the colour of the box rules using |\color| (since v1.7).
+% However we don't want to depend on the `color' package, so if we're
+% showing box rules, and so would be selecting box colours, then give
+% a warning but do not fail.  Note the faking of that package's
+% commands below.
 % \changes{v1.7}{2006/08/24}{Add textblockrulecolour}
 %    \begin{macrocode}
 \def\textblockrulecolour#1{%
   \@ifundefined{color}%
-    {\gdef\TP@rulecolour{}}% ignore argument, switch off colour blocking below
+    {%
+      \gdef\TP@rulecolour{}% ignore argument, switch off colour blocking below
+      \PackageWarning{textpos}{command textblockrulecolour used, but
+        {color} package not loaded.\MessageBreak Colour changes ignored.}}%
     {%
       \def\@tempa{#1}
       \gdef\TP@rulecolour{#1}%
@@ -909,6 +921,16 @@ located at that point, rather than the top-left corner.
 \let\tekstblokroolkulur\textblockrulecolour
 %    \end{macrocode}
 %
+% We don't want to create a dependency on the \pstyle{color} package,
+% so we shouldn't fail if that package isn't loaded.  Check that here,
+% and if not, create dummy no-op definitions for the package commands
+% we use.
+%    \begin{macrocode}
+\@ifundefined{color}%
+  {\gdef\color#1{}%
+   \gdef\color@block#1#2#3{}%
+  }{}
+%
 % \begin{macro}{\textblock}
 % Now define the start of the textblock environment.  Read the first
 % argument, and save it for the moment as |\@tempdima|.  If we are
@@ -991,7 +1013,7 @@ located at that point, rather than the top-left corner.
 % If we're showing boxes, then draw a rule here
 %    \begin{macrocode}
     \ifTPshowboxes
-      {\color{\TP@rulecolour} \hrule height0pt depth \TPboxrulesize }%
+      {\color{\TP@rulecolour}\hrule height0pt depth \TPboxrulesize }%
       \vskip-\TPboxrulesize
     \fi
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/textpos/textpos.sty b/Master/texmf-dist/tex/latex/textpos/textpos.sty
index b9d6f0b236b..559932ffc10 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, 2006 Norman Gray.
+%% This software is copyright, 1999, 2001--2003, 2005-6 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.9 2006/08/24 13:59:21 norman Exp $
+%%% Source: $Id: textpos.dtx.in,v 1.11 2006/09/04 10:13:51 norman Exp $
 %%
 %%\def\ParseRCSDate$#1: #2 #3 ${\def\TP@Date{#2}}
-%%\ParseRCSDate$Date: 2006/08/24 13:59:21 $
+%%\ParseRCSDate$Date: 2006/09/04 10:13:51 $
 \def\filename{textpos}
-\def\fileversion{1.7}
-\def\filedate{2006/08/24}
-\def\docdate{2006 August 24}
+\def\fileversion{1.7a}
+\def\filedate{2006/09/02}
+\def\docdate{2006 September 2}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{textpos}[\filedate\space v\fileversion]
 \typeout{Package: `textpos' \fileversion\space<\docdate>}
@@ -141,7 +141,11 @@
 \def\textblocklabel#1{\gdef\TP@textblocklabel{#1}}
 \def\textblockcolour#1{%
   \@ifundefined{color}%
-    {\gdef\TP@blockcolour{}}% ignore argument, switch off colour blocking below
+    {%
+      \gdef\TP@blockcolour{}% ignore argument, switch off colour blocking below
+      \PackageWarning{textpos}{command textblockcolour used, but
+        {color} package not loaded.\MessageBreak Colour changes ignored.}%
+    }
     {%
       \def\@tempa{#1}
       \gdef\TP@blockcolour{#1}
@@ -154,7 +158,10 @@
 \let\tekstblokkulur\textblockcolour
 \def\textblockrulecolour#1{%
   \@ifundefined{color}%
-    {\gdef\TP@rulecolour{}}% ignore argument, switch off colour blocking below
+    {%
+      \gdef\TP@rulecolour{}% ignore argument, switch off colour blocking below
+      \PackageWarning{textpos}{command textblockrulecolour used, but
+        {color} package not loaded.\MessageBreak Colour changes ignored.}}%
     {%
       \def\@tempa{#1}
       \gdef\TP@rulecolour{#1}%
@@ -162,6 +169,10 @@
 \def\TP@rulecolour{black}
 \let\textblockrulecolor\textblockrulecolour
 \let\tekstblokroolkulur\textblockrulecolour
+\@ifundefined{color}%
+  {\gdef\color#1{}%
+   \gdef\color@block#1#2#3{}%
+  }{}
 \def\textblock#1{%
   \@tempdima=#1\TPHorizModule
   \ifvmode\else
@@ -201,7 +212,7 @@
   }
   \setbox\TP@textbox=\vbox\bgroup
     \ifTPshowboxes
-      {\color{\TP@rulecolour} \hrule height0pt depth \TPboxrulesize }%
+      {\color{\TP@rulecolour}\hrule height0pt depth \TPboxrulesize }%
       \vskip-\TPboxrulesize
     \fi
     \hsize=\@tempdima
diff --git a/Master/texmf-dist/tpm/textpos.tpm b/Master/texmf-dist/tpm/textpos.tpm
index 34c4c007374..10b39162f70 100644
--- a/Master/texmf-dist/tpm/textpos.tpm
+++ b/Master/texmf-dist/tpm/textpos.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/textpos.zip">
     <TPM:Name>textpos</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/08/25 18:03:45</TPM:Date>
+    <TPM:Date>2006/09/04 23:14:35</TPM:Date>
     <TPM:Version>1.5b</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Place boxes at absolute positions.</TPM:Title>
@@ -16,14 +16,15 @@ conference posters, for example.
     <TPM:Author>Norman Gray</TPM:Author>
     <TPM:Size>196226</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="12466">
+    <TPM:RunFiles size="12848">
 texmf-dist/tex/latex/textpos/textpos.sty
 texmf-dist/tpm/textpos.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="129250">
+    <TPM:DocFiles size="130137">
 texmf-dist/doc/latex/textpos/LICENCE
 texmf-dist/doc/latex/textpos/README
-texmf-dist/doc/latex/textpos/VERSION-1.7
+texmf-dist/doc/latex/textpos/VERSION-1.7a
+texmf-dist/doc/latex/textpos/examples/README
 texmf-dist/doc/latex/textpos/examples/t1.tex
 texmf-dist/doc/latex/textpos/examples/t2.tex
 texmf-dist/doc/latex/textpos/examples/t3.tex
@@ -37,7 +38,7 @@ texmf-dist/doc/latex/textpos/textpos-example.tex
 texmf-dist/doc/latex/textpos/textpos.html
 texmf-dist/doc/latex/textpos/textpos.pdf
     </TPM:DocFiles>
-    <TPM:SourceFiles size="54510">
+    <TPM:SourceFiles size="55431">
 texmf-dist/source/latex/textpos/textpos.drv
 texmf-dist/source/latex/textpos/textpos.dtx
 texmf-dist/source/latex/textpos/textpos.ins
diff --git a/Master/texmf/lists/textpos b/Master/texmf/lists/textpos
index ab6a4766911..548494b718b 100644
--- a/Master/texmf/lists/textpos
+++ b/Master/texmf/lists/textpos
@@ -1,6 +1,7 @@
 texmf-dist/doc/latex/textpos/LICENCE
 texmf-dist/doc/latex/textpos/README
-texmf-dist/doc/latex/textpos/VERSION-1.7
+texmf-dist/doc/latex/textpos/VERSION-1.7a
+texmf-dist/doc/latex/textpos/examples/README
 texmf-dist/doc/latex/textpos/examples/t1.tex
 texmf-dist/doc/latex/textpos/examples/t2.tex
 texmf-dist/doc/latex/textpos/examples/t3.tex