9 files changed, 150 insertions, 224 deletions
diff --git a/Master/texmf-dist/doc/latex/textpos/README b/Master/texmf-dist/doc/latex/textpos/README
index 35582c812f9..78980ec51d3 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.7d
+Version 1.7f
 
 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-6, Norman Gray.  It
+This software is copyright, 1999, 2001--2003, 2005-7, 2009, 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.7d b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7d
deleted file mode 100644
index 46597ad4e9a..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7d
+++ /dev/null
@@ -1 +0,0 @@
-textpos-1.7d, released 2007 March 30
diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7f b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7f
new file mode 100644
index 00000000000..0ea16352345
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7f
@@ -0,0 +1 @@
+textpos-1.7f, released 2009 May 28
diff --git a/Master/texmf-dist/doc/latex/textpos/examples/t8.tex b/Master/texmf-dist/doc/latex/textpos/examples/t8.tex
index c86083410a9..aa0d74e5d3e 100644
--- a/Master/texmf-dist/doc/latex/textpos/examples/t8.tex
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t8.tex
@@ -12,18 +12,25 @@
 Here is some text.
 \marginpar{\dots with a marginal note}
 
+\begin{figure}
+Hello, this is a normal figure
+\caption[short normal 1]{\label{normal1}long normal 1}
+\end{figure}
+
 \begin{textblock}{5}(0,5)
 In this document we have figures~\ref{figa} and~\ref{figb}.
 \end{textblock}
 
+\tracingcommands=2 \tracingmacros=2
 \begin{textblock}{5}(1,6)
   Here is a figure.
   \begin{figure}
   Text
-  \caption[this is figure 1]{This is the first figure}
+  \caption[short textblock caption]{This is the first textblock figure (with short)}
   \label{figa}
   \end{figure}
 \end{textblock}
+\tracingcommands=0 \tracingmacros=0
 
 \begin{textblock}{5}(2,7)
   Here is another figure.%error: \marginpar{\dots and a marginpar in block}
@@ -31,7 +38,7 @@ In this document we have figures~\ref{figa} and~\ref{figb}.
   %\begin{minipage}{4cm} Hello minipage\marginpar{ping!}\end{minipage}
   \begin{figure}
   More text
-  \caption{\label{figb}This is the second figure}
+  \caption{\label{figb}This is the second textblock figure (no short)}
   \end{figure}
 \end{textblock}
 
@@ -42,9 +49,9 @@ In this document we have figures~\ref{figa} and~\ref{figb}.
 Here is text, just before the outer figure.
 \begin{figure}
 \hrule
-Figure Text
+This is another normal figure
 \hrule
-\caption[final figure]{\label{figc}This is the final figure}
+\caption[short normal 2]{\label{figc}This is the final figure, with short}
 \end{figure}
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.pdf b/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.pdf
index b1c6635b9c1..c4ee691524f 100644
--- a/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.pdf
+++ b/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.pdf
diff --git a/Master/texmf-dist/doc/latex/textpos/style.css b/Master/texmf-dist/doc/latex/textpos/style.css
index 8a6b4650b71..922fb17dc57 100644
--- a/Master/texmf-dist/doc/latex/textpos/style.css
+++ b/Master/texmf-dist/doc/latex/textpos/style.css
@@ -1,256 +1,159 @@
 body {
-  color: #000;
+  color: #333;
   background: white;
-  margin-left: 10%;
-  margin-right: 10%;
-}
+  margin-left: +30%;
+  margin-right: +20%;
+  padding: 0.5em;               /* this will make a difference if I decide to
+     				   have the background a different colour */
+  /* I can't decide on font: Optima's always nice, but Gill looks
+     agreeably intense.  Helvetica's a decent fallback. */
+  /* font-family: Optima, "Gill Sans", gill, Helvetica, sans-serif; */
+  font-family: "Gill Sans", gill, Helvetica, sans-serif;
+  font-size: 11pt;
+  line-height: 150%;
+}
+
+a:link { color: #66C; }
+a:visited { color: #669; }
+a[href]:hover { background: #EEE; }
 
-/* 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 */
+div.abstract {
+  font-style: oblique;
+  text-align: left;
+}
+div.abstract em { font-style: normal; }
+div.abstract code {
+  font-style: normal;
+  font-size: 80%;
+}
 
 h1, h2, h3, h4, h5, h6 {
-  font-family: Optima, "Gill Sans", gill, sans-serif;
+  color: #822;
+  font-weight: 100;             /* few fonts have ultra-light weights */
+  line-height: 100%;            /* no need to spread out titles */
 }
 h1 {
-  background: rgb(175,43,43);
-  /* background: #C33; */
-  padding: 1em;
-  border-style: none;
-  margin-left: -10%;
-  margin-right: -10%;
-  color: #FFF;
+  margin-left: -40%;
+  margin-right: -5%;
+  padding: 0.5em;
+  border: solid #666;
   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 */
+  margin-left: -40%;
+  margin-right: -5%;
+  padding: 0.2em;
+  border-top: solid thin #666;
+  clear: both;
 }
-
-p.figure {
-  text-align: center;
+h3 {
+  margin-left: -30%;
+  float: left;
+  width: 25%;
+  display: block;
+  text-align: right;
+  vertical-align: bottom;
+  padding-top: 0pt;
+  padding-right: 0.5em;
+  margin-top: 0pt;
+  line-height: 120%;
 }
 
-p.copyright {
-  font-size: x-small;
+/*
+h4 {
+  color: #C66;
 }
+*/
 
-dt {
-  margin-left: +5%;
-  font-style: italic;
-  margin-top: 0.5ex;
-}
-dd {
-  margin-bottom: 0.5ex;
+pre, table { background: #dde; }
+
+pre {
+  padding: 1em;
+  line-height: 130%;
 }
 
-li {
-  margin-top: 0.5ex;
-  margin-bottom: 0.5ex;
+table {
+  font-size: smaller;
 }
-li.current {
-  font-weight: bold;
+td {
+  padding: 0.5ex;
 }
 
+Q:before { content: "“"; }
+Q:after  { content: "”"; }
+
 img.smallimage {
   float: right;
   margin: 24pt;
+  margin-right: -30%;
 }
 
-img.smallimageleft {
-  float: left;
-  margin: 24pt;
-}
-
-pre {
-  margin: +5%;
-  background: #FF9;
+div.signature {
+  margin-left: -40%;
+  margin-right: -5%;
+  text-align: right;
+  border: solid #666;
+  padding: 0.3em;
   clear: both;
 }
 
+/* ============================================================
+ * Some other curiosities of my one-time formatting for web pages
+ */
 pre.doc-history {
-  margin-left: 30%;
-  font-family: Optima, Arial, sans-serif;
-  font-size: x-small;
-  background: #EEE;
+  font-size: xx-small;
+  background #eee;
+  line-height: 100%;
 }
 
-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;
-}
+div.subtoc, div.subsubtoc { display: none; }
+
+/* ============================================================
+ * Special formatting for ToC
+ */
 
-q:before { content: "`"; }
-q:after { content: "\'"; }
 /*
-q:before { content: open-quote; }
-q:after { content: close-quote; }
+  If there's significant amount of text in front of the first subsection,
+  then the following are good to put in the per-document stylesheet:
+  width: 25%;
+  float: right;
 */
-
-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%;
+  color: #888;
   padding: 0;
   font-size: smaller;
-  text-align: left;
+  text-align: right;
 }
-
+div#toc a:link { color: #888; }
 div#toc > ul {
-  padding: 0.5em 0.5em 0.5em 0pt;
+  padding: 0pt;
   margin: 0pt;
-  list-style: decimal inside;
+  list-style: none;
 }
 div#toc li {
   padding: 0pt;
-  padding-left: 1em;
+  display: inline-block;
+}
+div#toc li:before {
+  content: "§ ";
+  margin-left: 1em;
 }
+/* the following elements aren't currently generated by structure.lx */
 div#toc li ul {
   padding-left: 1em;
   margin-left: 0;
   font-style: italic;
+  display: inline;
 }
 div#toc li ul:before {
-    content: "[ ";
+  content: "( ";
 }
 div#toc li ul:after {
-   content: " ]";
+  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/textpos-example.tex b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
index 0d280eee76a..91d3ff1b1df 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--7 Norman Gray.
+%% This software is copyright, 1999, 2001--2003, 2005--7, 2009 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.18 2007/04/04 13:22:51 norman Exp $
+%%% Source: @HGIDENT@
 %%
 \documentclass{article}
 
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.html b/Master/texmf-dist/doc/latex/textpos/textpos.html
index 4ded91ab1f9..8f056c5d212 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.html
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.html
@@ -6,7 +6,7 @@
 <meta name='DC.subject' content='latex, textpos, absolute positioning'/>
 <meta name='DC.title' content='Textpos'/>
 <meta name='DC.date' content='2006-8-24'/> <!-- 1.7 release date -->
-<meta name='rcsdate' content='$Date: 2007/10/15 17:08:07 $'/>
+<meta name='rcsdate' content='$Date$'/>
 <link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" />
 <link href="http://nxg.me.uk" rev="author"/>
 <link type="text/css" rel="stylesheet"
@@ -20,14 +20,16 @@
 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.7d, 2007 March 30.</p>
+<p>Version 1.7f, 2009 May 28.</p>
 </div>
 
 <p>This package facilitates placing boxes at absolute positions on the
 LaTeX page.  There are several reasons why this might be useful, but
 the main one (or at least my motivating one) is to help produce a
 large-format conference poster.  Other applications include placing
-material within, say, figures.</p>
+material within, say, figures.  Textpos is also discussed in the <a
+href='http://www.tex.ac.uk/cgi-bin/texfaq2html?label=abspos'>TeX FAQ
+entry on absolute positioning</a>.</p>
 
 <p>This package provides a single environment, which contains the text
 (or graphics, or table, or whatever) which is to be placed on the
@@ -49,6 +51,19 @@ material on the page.</p>
 <h3>History</h3>
 
 <dl>
+<dt>1.7f, 2009 May 28</dt>
+<dd>The change in behaviour introduced in v1.7e is now documented (it
+was unspecified before, and 1.7e didn't commit itself one way or the
+other).</dd>
+
+<dt>1.7e, 2009 March 29</dt>
+<dd>Daniel Richard G noted that the order in which textblock contents
+was laid down on the page was counter-intuitive, since one would
+expect that later environments go 'on top of' earlier ones.  This
+order was unspecified before this version, but I've changed this,
+satisfying a principle of least surprise (later ones now go 'on
+top').</dd>
+
 <dt>1.7d, 2007 March 30</dt>
 <dd>Axel Sommerfeldt suggested a further alternative approach, even more
 lightweight, and I incorporated a version of that.</dd>
@@ -73,7 +88,7 @@ Fixed.</dd>
 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>
+<dt><strong>1.7, 2006 August 24</strong></dt>
 <dd>Added the <code>\textblockrulecolour</code> and
 <code>\TPshowboxes{true,false}</code> commands, to further control the
 display of the rules around the text blocks.</dd>
@@ -85,15 +100,13 @@ display of the rules around the text blocks.</dd>
 <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>
-<p>Made <code>{calc}</code>-style dimensions to the
+<dt><strong>1.6, 2005 August 30</strong></dt>
+<dd>Made <code>{calc}</code>-style dimensions to the
 <code>{textblock*}</code> argument work again (so <em>that's</em> what
-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>.</p>
-</dd>
+regression tests are for...).  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>.</dd>
 
 <dt>1.5b, 2005 June 13</dt>
 <dd>The 1.5 release broke the textblock environment's optional
@@ -105,7 +118,7 @@ block.  Fixed.</dd>
 interaction between absolute mode and LaTeX's <code>\newpage</code>
 command.</dd>
 
-<dt>1.5, 2005 March 23</dt>
+<dt><strong>1.5, 2005 March 23</strong></dt>
 <dd>Implement <code>\TPMargin</code> 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
@@ -113,7 +126,7 @@ 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 <code>showboxes</code> package option.</dd>
 
-<dt>1.4, 2003 September 7</dt>
+<dt><strong>1.4, 2003 September 7</strong></dt>
 <dd>Changes in the handling of vertical spacing; inconsistent in some
 circumstances before.  Slight (consequent) change to the algorithm
 which ensures that material is output in absolute mode even when the
@@ -122,8 +135,11 @@ remain available for some time in case these fixes break things.</dd>
 
 <dt>1.3a, 2003 June 24</dt>
 <dd>Added the <code>\textblockcolour</code> command, to set
-the background colour of text blocks (there was a release 1.3, but it
-was broken, and withdrawn)</dd>
+the background colour of text blocks</dd>
+
+<dt><strong>1.3, 2003 June 24</strong></dt>
+<dd>(there was a release 1.3, but it was broken, and immediately
+replaced by 1.3a)</dd>
 
 <dt>1.2b, 2002 July 1</dt>
 <dd>Works around a bug present in at least one package,
@@ -138,7 +154,7 @@ with <code>calc</code>), and does not attempt to support calc-style
 expressions in the parameters to the unstarred
 <code>{textblock}</code> environment.</dd>
 
-<dt>1.2, 2002 April 21</dt>
+<dt><strong>1.2, 2002 April 21</strong></dt>
 <dd>Rolf Niepraschk <code>niepraschk@ptb.de</code> provided code to
 make textpos compatible with the <code>calc</code> package</dd>
 
@@ -169,7 +185,7 @@ up-to-date versions available there.</p>
 
 <div class="signature">
 <a href="http://nxg.me.uk" >Norman Gray</a><br />
-2007 March 30
+2009 May 28
 </div>
 
 </body>
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.pdf b/Master/texmf-dist/doc/latex/textpos/textpos.pdf
index fc40602ab7d..41b16f14df5 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.pdf
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.pdf