textpos update

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

25 files changed, 288 insertions, 342 deletions

diff --git a/Master/texmf-dist/doc/latex/textpos/README b/Master/texmf-dist/doc/latex/textpos/README
index a7b0a50ec95..28dd61a7c91 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.6a
+Version 1.6b
 
 This package facilitates placing boxes at absolute positions on the
 LaTeX page.  There are several reasons why this might be useful, but
@@ -12,166 +12,10 @@ large-format conference poster.
 This package provides a single environment, plus a starred variant,
 which contains the text (or graphics, or table, or whatever) which is
 to be placed on the page, and which specifies where it is to be
-placed.  The environment is accompanied by various configuration commands.
+placed.  The environment is accompanied by various configuration
+commands.
 
-Changes in 1.6a, 2005 October 13
---------------------------------
-
-The overriding of the figure and table environments now also works
-when there is no previous environment to override (blush).
-
-
-Changes in 1.6, 2005 August 30
-------------------------------
-
-* Made {calc}-style dimensions to the {textblock*}
-  argument work again.
-* Override the figure and table environments within textblock
-  environments, to avoid their surprising and undesirable interaction
-  with textblock.
-
-Changes in 1.5a, 2005 March 26
-------------------------------
-
-Documentation fixes: added a section on the interaction between
-absolute mode and LaTeX's \newpage command.
-  
-Changes in 1.5, 2005 March 23
------------------------------
-
-Implement \TPMargin command, which causes a margin
-to appear round the blocks of text within textblock
-environments.  This makes it easy to use blocks of colour which
-are larger than the block of text by a decent margin, or to put a
-border round textblocks by setting a suitably-sized margin and using
-the showboxes package option.
-
-Changes in v1.4, 7 September 2003
----------------------------------
-
-* I made some changes in the handling of vertical spacing before and
-after the {textblock} environment.  The environment claims not to affect
-the vertical spacing (that is, to be `invisible'), and this was not
-true in some circumstances.  There should be no difference in the
-spacing which results in absolute mode, though there might be some
-changes in relative mode _if_ the environment is surrounded by glue of
-one type or another.
-
-* Now {textblock} may be used in horizontal mode.  The behaviour
-hasn't changed at all in fact (insert a \par), except that the
-warning in this case has been removed, and the behaviour has been
-documented.  It is this which prompted the reexamination of the
-spacing around the environment, referred to above.
-
-* Slight change to the technique which ensures that material is output
-in absolute mode even when (as normal in that mode) there is no
-non-{textblock} material on the page.  I believe this is perfectly
-robust, but if you discover any error in this respect, it's probably
-this version it was introduced.
-
-Changes in v1.3a, 25 June 2003
-------------------------------
-
-Blush.  I was prompted to run the regression tests (so _that's_ what
-they're for), and this fixes the error they expose.  You may now use
-textpos _without_ loading the {color} package.
-
-Changes in v1.3, 25 June 2003
------------------------------
-
-Added \textblockcolour command, to set the background colour of textblocks.
-
-Changes in v1.2b, 1 July 2002
------------------------------
-
-Added code to cope with the case when box 255 isn't a vbox at shipout
-(that's wrong, and not our fault, but we shouldn't collapse when it
-happens!).  Thanks to Wybo Dekker and Hans Hagen for the report and
-the fix.
-
-
-Changes in v1.2a, 28 April 2002
--------------------------------
-
-The way that I implemented the {calc} compatibility was wrong in v1.2
-(Rolf's code was correct, but I `improved' it).  It meant that things
-went badly wrong if you tried to give fractional sizes in the
-dimensions arguments to the {textblock} environment (I choose the grid 
-so that I only ever use whole numbers for these, so I hadn't had any
-real numbers in my test cases).  There's now a {textblock*}
-environment, which has absolute dimensions (that is, not in terms of
-the module, though you can still use \TPHorizModule and \TPVertModule
-as dimensions), to which you can give calc-compatible dimensions if
-you wish.  You can't give expressions in the arguments to the
-unstarred {textblock} environment.
-
-Changes in  v1.2, 21 April 2002
--------------------------------
-
-Rolf Niepraschk <niepraschk@ptb.de> provided code to make textpos
-compatible with the {calc} package.
-
-Added the [verbose] and [quiet] package options.
-
-Changes in v1.1e, 19 April 2001
--------------------------------
-
-Corrected a spacing misfeature, which caused extra space when
-textblocks were interspersed with paragraphs.  Thanks to Peter
-Muenster <peter@univ-rennes1.fr> for spotting and reporting this.
-
-Changes in v1.1d, 6 June 1999
------------------------------
-
-Clarified the copyright and licence status, including a copy of the
-GPL in the distribution.  The immediate motivation was the CTAN
-campaign to do this for all the CTAN packages, but it should have been
-done before.
-
-Changes in v1.1c
-----------------
-
-Added an optional argument to \TPGrid, which controls a border round
-the grid.  Made the checksum correct!
-
-Added the `overlay' option.
-
-Corrected a spacing bug, which made textblocks in the non-`absolute'
-mode drift out of place.
-
-Changes in v1.1b
-----------------
-
-Added a note to the effect that the required everyshi package can also
-be found at CTAN
-
-Changes in v1.1a
-----------------
-
-Blush!  The example file distributed with the package exposed a bug!
-When there was no text on the page outside {textblock} blocks (the
-usual case, if you're producing a poster), the TeX engine didn't know
-there was anything on the page at all, and (sensibly) output nothing.
-I made the obvious fix (thanks to Bjoern Pedersen for diagnosing the
-problem, and to Wolfgang Erdmann <earthmen@mail1.cityweb.de> for
-reporting it so promptly).
-
-
-Changes in v1.1, and credits
-----------------------------
-
-The package now clearly distinguishes between a `relative' and an
-`absolute' mode of positioning text (the distinction was largely
-present before, but neither as clear nor as robust).  It also now
-distinguishes the horizontal and vertical units used for positioning.
-
-Olaf Maibaum (Olaf.Maibaum@informatik.uni-oldenburg.de)
-produced the elegant code which I've incorporated here as the
-`absolute mode'.
-
-Bjoern Pedersen (bjoern@poseidon.org.chemie.tu-muenchen.de)
-made the excellent suggestion (including code) that the horizontal and
-vertical modules should be independent.
+For the change history, see textpos.html.
 
 
 Installation
@@ -202,4 +46,4 @@ LICENCE for the licence conditions.
 
 
 Norman Gray, (norman@astro.gla.ac.uk)
-http://www.astro.gla.ac.uk/users/norman
+http://nxg.me.uk
diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.6a b/Master/texmf-dist/doc/latex/textpos/VERSION-1.6a
deleted file mode 100644
index c3a22d30a36..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/VERSION-1.6a
+++ /dev/null
@@ -1 +0,0 @@
-textpos-1.6a, released 2005 October 13
diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.6b b/Master/texmf-dist/doc/latex/textpos/VERSION-1.6b
new file mode 100644
index 00000000000..0bf08568b00
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/VERSION-1.6b
@@ -0,0 +1 @@
+textpos-1.6b, released 2006 August 10
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t1.tex b/Master/texmf-dist/doc/latex/textpos/examples/t1.tex
index 80bba4322a5..80bba4322a5 100644
--- a/Master/texmf-dist/doc/latex/textpos/t/t1.tex
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t1.tex
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t2.tex b/Master/texmf-dist/doc/latex/textpos/examples/t2.tex
index be52319c5a4..be52319c5a4 100644
--- a/Master/texmf-dist/doc/latex/textpos/t/t2.tex
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t2.tex
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t3.tex b/Master/texmf-dist/doc/latex/textpos/examples/t3.tex
index 1768033b740..1768033b740 100644
--- a/Master/texmf-dist/doc/latex/textpos/t/t3.tex
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t3.tex
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t4.tex b/Master/texmf-dist/doc/latex/textpos/examples/t4.tex
index fa712d1eb8b..fa712d1eb8b 100644
--- a/Master/texmf-dist/doc/latex/textpos/t/t4.tex
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t4.tex
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t5.tex b/Master/texmf-dist/doc/latex/textpos/examples/t5.tex
index 37a181c87de..37a181c87de 100644
--- a/Master/texmf-dist/doc/latex/textpos/t/t5.tex
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t5.tex
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t6.tex b/Master/texmf-dist/doc/latex/textpos/examples/t6.tex
index 91428161b0a..91428161b0a 100644
--- a/Master/texmf-dist/doc/latex/textpos/t/t6.tex
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t6.tex
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t7.tex b/Master/texmf-dist/doc/latex/textpos/examples/t7.tex
index 6deceeff770..6deceeff770 100644
--- a/Master/texmf-dist/doc/latex/textpos/t/t7.tex
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t7.tex
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t8.tex b/Master/texmf-dist/doc/latex/textpos/examples/t8.tex
index 25d05d8da94..25d05d8da94 100644
--- a/Master/texmf-dist/doc/latex/textpos/t/t8.tex
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t8.tex
diff --git a/Master/texmf-dist/doc/latex/textpos/style.css b/Master/texmf-dist/doc/latex/textpos/style.css
new file mode 100644
index 00000000000..8a6b4650b71
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/style.css
@@ -0,0 +1,256 @@
+body {
+  color: #000;
+  background: white;
+  margin-left: 10%;
+  margin-right: 10%;
+}
+
+/* Link colours should be specified, since text colour was in <body> */
+a:link { color: rgb(43,43,175); }
+a:visited { color: rgb(43,43,175); }
+a[href]:hover { background: rgb(175,175,43); }
+/*
+a:link    { color: #009; }
+a:active  { color: #00C; }
+a:visited { color: #600; }
+a[href]:hover { background: #FF9; }	/* CSS2 */
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: Optima, "Gill Sans", gill, sans-serif;
+}
+h1 {
+  background: rgb(175,43,43);
+  /* background: #C33; */
+  padding: 1em;
+  border-style: none;
+  margin-left: -10%;
+  margin-right: -10%;
+  color: #FFF;
+  text-align: right;
+  font: 24pt/30pt;
+}
+h1 a:link { color: #99F; }
+h1 a:visited { color: #99F; }
+h1 a[href]:hover { background: #F43; }
+
+h2 {
+  color: #C33;
+  margin-left: -5%;
+  /* clear: both; -- don't do this, or else initial toc no longer
+                     looks floated */
+}
+
+p.figure {
+  text-align: center;
+}
+
+p.copyright {
+  font-size: x-small;
+}
+
+dt {
+  margin-left: +5%;
+  font-style: italic;
+  margin-top: 0.5ex;
+}
+dd {
+  margin-bottom: 0.5ex;
+}
+
+li {
+  margin-top: 0.5ex;
+  margin-bottom: 0.5ex;
+}
+li.current {
+  font-weight: bold;
+}
+
+img.smallimage {
+  float: right;
+  margin: 24pt;
+}
+
+img.smallimageleft {
+  float: left;
+  margin: 24pt;
+}
+
+pre {
+  margin: +5%;
+  background: #FF9;
+  clear: both;
+}
+
+pre.doc-history {
+  margin-left: 30%;
+  font-family: Optima, Arial, sans-serif;
+  font-size: x-small;
+  background: #EEE;
+}
+
+table {
+  /* background-color: #CCF; */
+  background-color: white;
+}
+td {
+  /* Hmmm, I still get the background showing through... */
+  border-style: none;
+  padding: 4px;
+  margin: 2px;
+}
+/* header can be indiated two ways, either with <th>,
+   or with <tr class='header'>  */
+tr.header {
+  background-color: #C33;
+  color: white;
+}
+th {
+  background-color: #C33;
+  color: white;
+}
+/* Odd and even table rows */
+tr.r0 {
+  background-color: #FBA;
+}
+tr.r1 {
+  background-color: #D99;
+}
+
+q:before { content: "`"; }
+q:after { content: "\'"; }
+/*
+q:before { content: open-quote; }
+q:after { content: close-quote; }
+*/
+
+div.abstract {
+  margin-left: 30%;
+  margin-right: 0%;
+  font-style: oblique;
+  text-align: left;
+}
+div.abstract em { font-style: normal; }
+div.abstract code {
+  font-style: normal;
+  font-size: 80%;
+}
+
+/* TOC element.  Note -5%+35% = 30%, which is the left-margin of the
+   abstract, above. */
+div#toc {
+  float: left;
+  width: 35%;
+  margin: 1em 0pt 0pt -5%;
+  padding: 0;
+  font-size: smaller;
+  text-align: left;
+}
+
+div#toc > ul {
+  padding: 0.5em 0.5em 0.5em 0pt;
+  margin: 0pt;
+  list-style: decimal inside;
+}
+div#toc li {
+  padding: 0pt;
+  padding-left: 1em;
+}
+div#toc li ul {
+  padding-left: 1em;
+  margin-left: 0;
+  font-style: italic;
+}
+div#toc li ul:before {
+    content: "[ ";
+}
+div#toc li ul:after {
+   content: " ]";
+}
+div#toc li li {
+  display: inline;
+  padding-left: 0pt;
+}
+div#toc li li:after {
+  content: "; ";
+}
+/* Avoid displaying the <p> which contains the "Contents" */
+/*
+div#toc>p {
+  display: none;
+}
+   */
+
+div.subtoc {
+  float: right;
+  width: 35%;
+  margin: 0 0 0 0.3em;
+  padding: 0.5em;
+  /* background: rgb(235,200,200); */
+  padding: 0px 0px 0px 0.3em;
+  border-left: solid thin red;
+  font-size: smaller;
+  text-align: left;
+}
+div.subtoc ul {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+
+div.subsubtoc {
+  display: none;
+}
+/*
+div.subsubtoc {
+  float: right;
+  width: 35%;
+  margin: 0 0 0 0.3em;
+  padding: 0.5em;
+  background: rgb(255,255,127);
+  font-size: smaller;
+  text-align: left;
+}
+div.subsubtoc p {
+  margin: 0;
+}
+div.subsubtoc ul {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+div.subsubtoc p {
+  font-weight: bold;
+}
+div.subsubtoc p:after {
+  content: "...";
+}
+div.subsubtoc li:before {
+  content: "...";
+}
+*/
+
+div.signature {
+  font-style: oblique;
+  text-align: right;
+  margin-left: -10%;
+  margin-right: -10%;
+  /* background: #006; */
+  background: #C33;
+  color: #FFF;
+  clear: both;
+
+  padding: 1em;
+  border: none;
+  /*
+  border-width: thin;
+  border-top: ridge;
+  border-left: none;
+  border-right: none;
+  border-bottom: none;
+  border-color: black;
+  */
+}
+
+div.signature a:link { color: #99F; }
+div.signature a:visited { color: #99F; }
+div.signature a[href]:hover { background: #F43; }
diff --git a/Master/texmf-dist/doc/latex/textpos/t/Makefile b/Master/texmf-dist/doc/latex/textpos/t/Makefile
deleted file mode 100644
index e369f0f919b..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/t/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-test: ../textpos.sty
-	TEXINPUTS=..: ./runtests
-
-clean:
-	rm -f *~ *.log *.aux *.stderr *.stdout *.tmp *.diff *.dtl
-
-%.dvi: %.tex
-	TEXINPUTS=..: latex $<
-%.pdf: %.tex
-	TEXINPUTS=..: pdflatex $<
-%.dtl: %.dvi
-	dv2dt $< >$@
-%.dvireport: %.dvi
-	dvireport -F -up $< >$@
-%.dtl.diff: %.dtl %.correct.dtl
-	diff ${<:.dtl=.correct.dtl} $< >$@; true
diff --git a/Master/texmf-dist/doc/latex/textpos/t/runtests b/Master/texmf-dist/doc/latex/textpos/t/runtests
deleted file mode 100755
index d7264da52f8..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/t/runtests
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /bin/sh -
-#
-# $Id: runtests,v 1.4 2005/08/30 18:19:12 norman Exp $
-#
-# Run a series of tests on LaTeX files.  The directory contains a collection
-# of documents named `t<number>.tex', and these are processed in turn and their
-# output diffed against `t<number>.correct.dvi'.  Exit status is the
-# number of failures.
-#
-# Run without an argument, and if there is no file runtests.filelist,
-# this runs all the tests in the directory; run with an argument, it
-# runs only the specified tests.
-#
-# If there is no argument, but a file runtests.filelist exists, use
-# that file's contents as the list of tests to run.  This means that
-# we can make it easy to do a subset of the tests repeatedly while
-# testing.
-#
-# The only we we really have of testing whether the binary DVI files
-# differ is by comparing them using cmp, which simply reports the
-# byte-offset where they differ.  This isn't terribly helpful, and
-# even examining the files using dv2dt doesn't help much.  It's also
-# probably rather sensitive to things like the version of hyperref
-# which is being used.  Also, since TeX puts a timestamp in DVI files, 
-# we have to ignore the first 50 bytes or so (see a thread with the
-# subject `diff for dvi files', in comp.text.tex, in May 2001.
-#
-# If the option --keep is present, then it doesn't delete temporary files.
-
-UsageString="$0 [--keep] [filename...]"
-deletetemp=true
-LS=/bin/ls
-
-
-filelist=""
-
-while [ $# -gt 0 ]; do
-    case $1 in
-    --keep) deletetemp=false ;;
-    --*) echo "Usage: $UsageString"
-	 exit 1
-	 ;;
-    *) filelist="$filelist $1"
-	 ;;
-    esac
-    shift
-done
-
-# If filelist is null, and a file runtests.filelist exists, use that
-# file's contents as the value of filelist.
-if [ -z "$filelist" -a -f runtests.filelist ]; then
-    echo "Reading filelist from runtests.filelist"
-    filelist=`cat runtests.filelist`
-fi
-
-# Check filelist is non-null, and make it t* if it is.
-if [ -z "$filelist" ]; then
-    filelist=`$LS | grep '^t[0-9]*\.tex$' | sed 's/\.tex//'`
-fi
-
-
-
-nfailures=0
-
-for name in $filelist
-do
-	echo -n "$name... "
-	# Make sure we run twice, if there's no preexisting aux file.
-	test -f $name.aux || latex $name.tex >$name.stdout 2>$name.stderr
-	latex $name.tex >$name.stdout 2>$name.stderr
-	testval=$?
-	#test -f $name.dvi && mv $name.dvi $name.dvi.tmp
-
-	if [ $testval != 0 ]; then
-	    echo "failed (exited with error status $testval)"
-	    nfailures=`expr $nfailures + 1`
-	    $deletetemp && rm -f $name.stdout $name.stderr $name.dvi $name*.tmp
-	elif [ -r "$name.correct.dvi" ]; then
-	    cmp -i50 $name.dvi $name.correct.dvi >$name.diff
-	    rval=$?
-	    if [ $rval != 0 ]; then
-                make $name.dtl.diff >/dev/null
-		echo "failed (results in $name.dtl.diff)"
-		nfailures=`expr $nfailures + 1`
-	    else
-		echo "ok"
-		$deletetemp && rm -f $name.diff $name.stdout $name.stderr $name.dvi $name*.tmp
-	    fi
-	else
-		echo "apparently OK, but no correct results to compare"
-		mv $name.dvi $name.correct.dvi
-		echo "    (now in $name.correct.dvi)"
-		$deletetemp && rm -f $name*.tmp
-	fi
-done
-
-echo "$nfailures failed tests"
-
-exit $nfailures
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t1.correct.dvi b/Master/texmf-dist/doc/latex/textpos/t/t1.correct.dvi
deleted file mode 100644
index 63e710a428e..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/t/t1.correct.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t2.correct.dvi b/Master/texmf-dist/doc/latex/textpos/t/t2.correct.dvi
deleted file mode 100644
index 1b177c5131b..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/t/t2.correct.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t3.correct.dvi b/Master/texmf-dist/doc/latex/textpos/t/t3.correct.dvi
deleted file mode 100644
index aad273e2070..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/t/t3.correct.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t4.correct.dvi b/Master/texmf-dist/doc/latex/textpos/t/t4.correct.dvi
deleted file mode 100644
index bdde8c690fc..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/t/t4.correct.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t5.correct.dvi b/Master/texmf-dist/doc/latex/textpos/t/t5.correct.dvi
deleted file mode 100644
index 7b5c7edfc27..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/t/t5.correct.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t6.correct.dvi b/Master/texmf-dist/doc/latex/textpos/t/t6.correct.dvi
deleted file mode 100644
index 7cd99d9e1e1..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/t/t6.correct.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t7.correct.dvi b/Master/texmf-dist/doc/latex/textpos/t/t7.correct.dvi
deleted file mode 100644
index c419e299430..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/t/t7.correct.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/textpos/t/t8.correct.dvi b/Master/texmf-dist/doc/latex/textpos/t/t8.correct.dvi
deleted file mode 100644
index 21376d4f818..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/t/t8.correct.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
index a21f23066f6..b765b70b74b 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
+++ b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
@@ -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.7 2005/10/13 19:09:13 norman Exp $
+%%% Source: $Id: textpos.dtx.in,v 1.8 2006/08/10 21:40:56 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 de18cefcf30..4a0761d1b96 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.html
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.html
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-                      "dtd/xhtml1-strict.dtd">
 
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Textpos</title>
-<link href="http://www.astro.gla.ac.uk/users/norman/" rev="author"/>
+<link href="http://nxg.me.uk" rev="author"/>
 <link type="text/css" rel="stylesheet"
-      href="http://www.astro.gla.ac.uk/users/norman/style.css"/>
+      href="style.css"/>
 </head>
 
 <body>
@@ -15,8 +13,9 @@
 <div class="abstract">
 <p>Lay out text and graphics at arbitrary positions on the LaTeX
 page.</p>
-<p>This page is <code>http://purl.org/nxg/dist/textpos</code></p>
-<p>Version 1.6a, 2005 October 13.</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.6b, 2006 August 10.</p>
 </div>
 
 <p>This package facilitates placing boxes at absolute positions on the
@@ -35,26 +34,26 @@ href="textpos.pdf" >manual (pdf)</a>.</p>
 href="http://purl.org/nxg/note/posters" >creating
 conference posters with LaTeX</a>.</p>
 
-<p>Rolf Niepraschk provided me with a wonderful <a
-href="niepraschk-demo.tex" >demo</a> of using Textpos along with his
-<code>eso-pic</code> package, and the <code>calc</code> package.</p>
+
+<h3>History</h3>
 
 <dl>
 
+<dt>1.6b, 2006 August 10</dt>
+<dd>Minor documentation fixes</dd>
+
 <dt>1.6a, 2005 October 13</dt>
 <dd>The overriding of the figure and table environments now also works
 when there is no previous environment to override.</dd>
 
 <dt>1.6, 2005 August 30</dt>
 <dd>
-<ul>
-<li>Made <code>{calc}</code>-style dimensions to the
+<p>Made <code>{calc}</code>-style dimensions to the
 <code>{textblock*}</code> argument work again (so <em>that's</em> what
-regression tests are for...)</li>
-<li>Override the <code>figure</code> and <code>table</code>
+regression tests are for...)</p>
+<p>Override the <code>figure</code> and <code>table</code>
 environments within <code>textblock</code> environments, to avoid their
-surprising and undesirable interaction with <code>textblock</code>.</li>
-</ul>
+surprising and undesirable interaction with <code>textblock</code>.</p>
 </dd>
 
 <dt>1.5b, 2005 June 13</dt>
@@ -104,38 +103,14 @@ expressions in the parameters to the unstarred
 <dd>Rolf Niepraschk <code>niepraschk@ptb.de</code> provided code to
 make textpos compatible with the <code>calc</code> package</dd>
 
-<dt>See README for earlier versions</dt>
+<dt>Version 1.1 was released in 1999</dt>
 
 </dl>
 
-<!--
-<p>At version 1.2, the package became compatible with the calc
-package.
-
-<p>However, version 1.2 had an error, which caused a confusing error
-if you gave any fractional part in the arguments to the
-<code>{textblock}</code> environment.  This was fixed in version 1.2a, 
-which adds a <code>{textblock*}</code> environment (fully compatible
-with <code>calc</code>), and does not attempt to support calc-style
-expressions in the parameters to the unstarred
-<code>{textblock}</code> environment.
-
-<p>Version 1.2b works around a bug present in at least one package,
-which leaves box255 holding an hbox at the wrong moment.
-
-<p>Version 1.3 added the <code>\textblockcolour</code> command, to set
-the background colour of text blocks.
--->
-
-<h3>Download and installation</h3>
+<h3>Installation and further information</h3>
 
 <ol>
 
-<li>Download the file <a href="textpos-1.6a.tar.gz"
-   >textpos-1.6a.tar.gz</a>
-or <a href="textpos-1.6a.zip"
-   >textpos-1.6a.zip</a> and unpack it.</li>
-
 <li>Run LaTeX on the file <code>textpos.ins</code> -- this will
 unpack the style file <code>textpos.sty</code> amongst other files.
 Place this somewhere where TeX can find it.</li>
@@ -144,30 +119,18 @@ Place this somewhere where TeX can find it.</li>
 documentation.</li>
 </ol>
 
-<p>On CTAN:
+<p>The <code>textpos</code> home page is at <a href='http://purl.org/nxg/dist/textpos'
+><code>http://purl.org/nxg/dist/textpos</code></a>, and there may be more
+up-to-date versions available there.</p>
+
+<p><code>Textpos</code> is also available on CTAN:
 <a href='http://www.tex.ac.uk/tex-archive/macros/latex/contrib/textpos/'
 	>/tex-archive/macros/latex/contrib/textpos/</a></p>
 
-<p>To guard against the continual possibility of fixed versions breaking
-old documents, here are some selected older versions:</p>
-<table>
-<tr><th>Version</th><th>Note</th></tr>
-<tr>
-<td><a href='textpos-1.3a.tar.gz' >1.3a</a></td>
-<td>Immediately prior to change in skip handling</td>
-</tr>
-
-<tr>
-<td><a href='textpos-1.1e.tar.gz' >1.1e</a></td>
-<td>Immediately prior to compatibility with <code>calc</code>, and
-introduction of <code>{textblock*}</code></td>
-</tr>
-</table>
 
 <div class="signature">
-<a href="http://www.astro.gla.ac.uk/users/norman/"
-	>Norman Gray</a><br>
-2005 October 13
+<a href="http://nxg.me.uk" >Norman Gray</a><br />
+2006 August 10
 </div>
 
 </body>
@@ -175,7 +138,5 @@ introduction of <code>{textblock*}</code></td>
 
 
 <!-- Local Variables: -->
-<!-- mode: xml -->
-<!-- sgml-indent-step: 0 -->
-<!-- sgml-indent-data: nil -->
+<!-- mode: nxml -->
 <!-- End: -->
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.pdf b/Master/texmf-dist/doc/latex/textpos/textpos.pdf
index c8c35dc7caf..8e329552f79 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.pdf
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.pdf