9 files changed, 136 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/textpos/README b/Master/texmf-dist/doc/latex/textpos/README
index 9aa4812b538..35582c812f9 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.7b
+Version 1.7d
 
 This package facilitates placing boxes at absolute positions on the
 LaTeX page.  There are several reasons why this might be useful, but
diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7b b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7b
deleted file mode 100644
index f15d65c91f7..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7b
+++ /dev/null
@@ -1 +0,0 @@
-textpos-1.7b, released 2007 March 21
diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7d b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7d
new file mode 100644
index 00000000000..46597ad4e9a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7d
@@ -0,0 +1 @@
+textpos-1.7d, released 2007 March 30
diff --git a/Master/texmf-dist/doc/latex/textpos/examples/t8.tex b/Master/texmf-dist/doc/latex/textpos/examples/t8.tex
index 25d05d8da94..c86083410a9 100644
--- a/Master/texmf-dist/doc/latex/textpos/examples/t8.tex
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t8.tex
@@ -1,3 +1,5 @@
+%%% Testing: floats
+
 \documentclass{article}
 
 \usepackage[showboxes]{textpos}
@@ -5,29 +7,44 @@
 
 \begin{document}
 
-\begin{textblock}{5}(0,0)
+\listoffigures
+
+Here is some text.
+\marginpar{\dots with a marginal note}
+
+\begin{textblock}{5}(0,5)
 In this document we have figures~\ref{figa} and~\ref{figb}.
 \end{textblock}
 
-\begin{textblock}{5}(1,1)
+\begin{textblock}{5}(1,6)
   Here is a figure.
   \begin{figure}
   Text
-  \caption{This is the first figure}
+  \caption[this is figure 1]{This is the first figure}
   \label{figa}
   \end{figure}
 \end{textblock}
 
-\begin{textblock}{5}(2,2)
-  Here is another figure.
+\begin{textblock}{5}(2,7)
+  Here is another figure.%error: \marginpar{\dots and a marginpar in block}
+  % perhaps the following ought to be OK
+  %\begin{minipage}{4cm} Hello minipage\marginpar{ping!}\end{minipage}
   \begin{figure}
   More text
   \caption{\label{figb}This is the second figure}
   \end{figure}
 \end{textblock}
 
-\begin{textblock}{5}(3,3)
+\begin{textblock}{5}(3,8)
   We can still refer to figures~\ref{figb} and~\ref{figa}.
 \end{textblock}
 
+Here is text, just before the outer figure.
+\begin{figure}
+\hrule
+Figure Text
+\hrule
+\caption[final figure]{\label{figc}This is the final figure}
+\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
new file mode 100644
index 00000000000..b1c6635b9c1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.pdf
diff --git a/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.tex b/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.tex
new file mode 100644
index 00000000000..10be9ec8af9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.tex
@@ -0,0 +1,87 @@
+
+% Rolf Niepraschk, nieprasck@ptb.de, 2002-11-24
+% A funny demo for `textpos' with a backgroundgrid from `eso-pic'.
+\documentclass[a4paper,draft]{article}
+
+%\usepackage[absolute,showboxes]{textpos}
+\usepackage[absolute]{textpos}
+\usepackage[colorgrid,texcoord]{eso-pic}[2002/11/16]
+\usepackage{calc}
+
+\newcommand\StartX{25mm} \newcommand\StartY{40mm}
+\newcommand\Wi{160mm} \newcommand\Wii{40mm} \newcommand\Wiii{60mm}
+\newcommand\Hi{20mm}  \newcommand\Hii{100mm}
+
+\pagestyle{empty}
+
+\begin{document}
+
+\textblockorigin{0cm}{0cm}
+
+\begin{textblock*}{\Wi}(\StartX,\StartY)%
+  \noindent\colorbox[rgb]{0,0,1}{%
+    \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}%
+      \centering\Huge\textbf{FOO}%
+    \end{minipage}}% 
+\end{textblock*}
+
+\begin{textblock*}{\Wii}(\StartX,\StartY + 20mm)%
+  \noindent\colorbox[rgb]{0,1,0}{%
+    \begin{minipage}[c][\Hii - 2\fboxsep][c]{\linewidth - 2\fboxsep}%
+      \centering\Huge\textbf{BAR}%
+    \end{minipage}}% 
+\end{textblock*}
+
+\begin{textblock*}{\Wii}(\StartX + \Wi - \Wii,\StartY + 20mm)%
+  \noindent\colorbox[rgb]{1,1,0}{%
+    \begin{minipage}[c][\Hii - 2\fboxsep][c]{\linewidth - 2\fboxsep}%
+      \centering\Huge\textbf{BAR}%
+    \end{minipage}}% 
+\end{textblock*}
+
+\begin{textblock*}{\Wi}(\StartX,\Wi)%
+  \noindent\colorbox[rgb]{1,0,1}{%
+    \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}%
+      \centering\Huge\textbf{FOO}%
+    \end{minipage}}% 
+\end{textblock*}
+
+\begin{textblock*}{\Wiii}(75mm,70mm)%
+  \setlength\fboxrule{2pt}%
+  \noindent\fbox{%
+    \begin{minipage}{\linewidth - 2\fboxsep - 2\fboxrule}%
+      \Large\itshape
+      Text Text Text Text Text  
+      Text Text Text Text Text 
+      Text Text Text Text Text 
+      Text Text Text Text Text 
+      Text Text Text Text Text 
+      Text Text Text Text Text 
+      Text Text Text Text Text   
+    \end{minipage}}% 
+\end{textblock*}
+
+\begin{textblock*}{\Wiii}(75mm,130mm)%
+  \setlength\fboxrule{2pt}%
+  \noindent\fbox{%
+    \begin{minipage}[c][\Hi - 2\fboxsep - 2\fboxrule]%
+      {\linewidth - 2\fboxsep - 2\fboxrule}%
+      \centering\Huge\textbf{\LaTeX}   
+    \end{minipage}}% 
+\end{textblock*}
+
+\begin{textblock*}{\Wi}(\StartX,\StartY + 160mm)%
+  \noindent\colorbox[rgb]{0,1,1}{%
+    \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}%
+      \centering\Huge\textbf{FOOBAR}%
+    \end{minipage}}% 
+\end{textblock*}
+
+\begin{textblock*}{\Wi}(\StartX,\StartY + 200mm)%
+  \noindent\colorbox[rgb]{1,0,0}{%
+    \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}%
+      \centering\Huge\textbf{BAZ}%
+    \end{minipage}}% 
+\end{textblock*}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
index 9ae78c096c8..0d280eee76a 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.13 2007/03/21 20:37:33 norman Exp $
+%%% Source: $Id: textpos.dtx.in,v 1.18 2007/04/04 13:22: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 71c31d826a7..4ded91ab1f9 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.html
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.html
@@ -1,8 +1,13 @@
 <?xml version="1.0"?>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
+<head profile="http://dublincore.org/documents/dcq-html/">
 <title>Textpos</title>
+<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 $'/>
+<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"
       href="style.css"/>
@@ -15,7 +20,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.7b, 2007 March 21.</p>
+<p>Version 1.7d, 2007 March 30.</p>
 </div>
 
 <p>This package facilitates placing boxes at absolute positions on the
@@ -34,10 +39,25 @@ 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 demo
+(<a href="niepraschk-eso-pic.tex" >tex</a>,
+<a href="niepraschk-eso-pic.pdf" >pdf</a>)
+of using Textpos along with his <code>eso-pic</code> package,
+and the <code>calc</code> package, to produce a grid which can help lay out
+material on the page.</p>
 
 <h3>History</h3>
 
 <dl>
+<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>
+
+<dt>1.7c, 2007 March 29</dt>
+<dd>Giovanni Radilla reported a problem with captions, which meant that the
+captions weren't appearing properly in the list of figures.  Dan
+Luecking and Axel Sommerfeldt analysed the problem precisely, and the
+latter provided code which I've incorporated in this fix.</dd>
 
 <dt>1.7b, 2007 March 21</dt>
 <dd>Robert Whittaker reported a problem with <code>\TPmargin</code>,
@@ -149,7 +169,7 @@ up-to-date versions available there.</p>
 
 <div class="signature">
 <a href="http://nxg.me.uk" >Norman Gray</a><br />
-2007 March 21
+2007 March 30
 </div>
 
 </body>
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.pdf b/Master/texmf-dist/doc/latex/textpos/textpos.pdf
index 1784dbe3b2d..fc40602ab7d 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.pdf
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.pdf