9 files changed, 98 insertions, 29 deletions
diff --git a/Master/texmf-dist/doc/latex/textpos/README b/Master/texmf-dist/doc/latex/textpos/README
index 78980ec51d3..456a3edd573 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.7f
+Version 1.7g
 
 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.7f b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7f
deleted file mode 100644
index 0ea16352345..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7f
+++ /dev/null
@@ -1 +0,0 @@
-textpos-1.7f, released 2009 May 28
diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7g b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7g
new file mode 100644
index 00000000000..fca4c08356f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7g
@@ -0,0 +1 @@
+textpos-1.7g, released 2010 September 30
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 c4ee691524f..96359fa64e8 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/niepraschk-eso-pic.tex b/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.tex
index 775941b990a..10be9ec8af9 100644
--- a/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.tex
+++ b/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.tex
@@ -1,11 +1,11 @@
 
-% Rolf Niepraschk <Rolf.Niepraschk@gmx.de>, 2009-10-10
+% Rolf Niepraschk, nieprasck@ptb.de, 2002-11-24
 % A funny demo for `textpos' with a backgroundgrid from `eso-pic'.
 \documentclass[a4paper,draft]{article}
 
-\usepackage[colorgrid,texcoord]{eso-pic}[2002/11/16]
 %\usepackage[absolute,showboxes]{textpos}
 \usepackage[absolute]{textpos}
+\usepackage[colorgrid,texcoord]{eso-pic}[2002/11/16]
 \usepackage{calc}
 
 \newcommand\StartX{25mm} \newcommand\StartY{40mm}
@@ -20,28 +20,28 @@
 
 \begin{textblock*}{\Wi}(\StartX,\StartY)%
   \noindent\colorbox[rgb]{0,0,1}{%
-    \begin{minipage}[c][\Hi-2\fboxsep][c]{\linewidth-2\fboxsep}%
+    \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}%
       \centering\Huge\textbf{FOO}%
     \end{minipage}}% 
 \end{textblock*}
 
-\begin{textblock*}{\Wii}(\StartX,\StartY+20mm)%
+\begin{textblock*}{\Wii}(\StartX,\StartY + 20mm)%
   \noindent\colorbox[rgb]{0,1,0}{%
-    \begin{minipage}[c][\Hii-2\fboxsep][c]{\linewidth-2\fboxsep}%
+    \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)%
+\begin{textblock*}{\Wii}(\StartX + \Wi - \Wii,\StartY + 20mm)%
   \noindent\colorbox[rgb]{1,1,0}{%
-    \begin{minipage}[c][\Hii-2\fboxsep][c]{\linewidth-2\fboxsep}%
+    \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}%
+    \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}%
       \centering\Huge\textbf{FOO}%
     \end{minipage}}% 
 \end{textblock*}
@@ -49,7 +49,7 @@
 \begin{textblock*}{\Wiii}(75mm,70mm)%
   \setlength\fboxrule{2pt}%
   \noindent\fbox{%
-    \begin{minipage}{\linewidth-2\fboxsep-2\fboxrule}%
+    \begin{minipage}{\linewidth - 2\fboxsep - 2\fboxrule}%
       \Large\itshape
       Text Text Text Text Text  
       Text Text Text Text Text 
@@ -64,22 +64,22 @@
 \begin{textblock*}{\Wiii}(75mm,130mm)%
   \setlength\fboxrule{2pt}%
   \noindent\fbox{%
-    \begin{minipage}[c][\Hi-2\fboxsep-2\fboxrule]%
-      {\linewidth-2\fboxsep-2\fboxrule}%
+    \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)%
+\begin{textblock*}{\Wi}(\StartX,\StartY + 160mm)%
   \noindent\colorbox[rgb]{0,1,1}{%
-    \begin{minipage}[c][\Hi-2\fboxsep][c]{\linewidth-2\fboxsep}%
+    \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}%
       \centering\Huge\textbf{FOOBAR}%
     \end{minipage}}% 
 \end{textblock*}
 
-\begin{textblock*}{\Wi}(\StartX,\StartY+200mm)%
+\begin{textblock*}{\Wi}(\StartX,\StartY + 200mm)%
   \noindent\colorbox[rgb]{1,0,0}{%
-    \begin{minipage}[c][\Hi-2\fboxsep][c]{\linewidth-2\fboxsep}%
+    \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}%
       \centering\Huge\textbf{BAZ}%
     \end{minipage}}% 
 \end{textblock*}
diff --git a/Master/texmf-dist/doc/latex/textpos/style.css b/Master/texmf-dist/doc/latex/textpos/style.css
index 922fb17dc57..b6ba3d05f1c 100644
--- a/Master/texmf-dist/doc/latex/textpos/style.css
+++ b/Master/texmf-dist/doc/latex/textpos/style.css
@@ -2,17 +2,76 @@ body {
   color: #333;
   background: white;
   margin-left: +30%;
-  margin-right: +20%;
-  padding: 0.5em;               /* this will make a difference if I decide to
-     				   have the background a different colour */
+  width: 50%;            /* body is 50% of screen width */
+  margin-right: auto;    /* ie, 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: "Helvetica Neue", Helvetica, "Gill Sans", gill, sans-serif;
   /* font-family: Optima, "Gill Sans", gill, Helvetica, sans-serif; */
-  font-family: "Gill Sans", gill, Helvetica, sans-serif;
-  font-size: 11pt;
+  /* font-family: "Gill Sans", gill, Helvetica, sans-serif; */
+  /* I seem to have used 11pt at some point in the past, but this
+     is far too big -- did I ever have a reason for that, or is it
+     just due to browser changes? */
+  font-size: 10pt;
   line-height: 150%;
 }
 
+div.topsidebar {
+    float: right;
+    width: 50%;                 /* ...of the body width (ie, 50% x 50% of screen) */
+    font-size: smaller;
+    margin-left: 1em;
+    padding-left: 1em;
+    border-left: solid thin #AAA;
+}
+
+/* On wider screens, move the sidebar out to the right hand side */
+@media screen and (min-width: 700pt) and (max-width: 850pt) {
+    body {
+        margin-left: 210pt;
+        width: 350pt;           /* 50% of 700pt */
+        margin-right: auto;
+    }
+    div.topsidebar {
+        position: absolute;
+        /* I feel this size should be 595pt (350 + 210 + 0.05*700),
+           but that's clearly not right -- I don't think I understand what the -5%
+           in the h1 spec below is actually 5% of! */
+        left: 570pt;
+        width: auto;
+        margin-left: 0pt;
+        padding-left: 0pt;
+        border: none;
+    }
+}
+/* On still-wider screens, expand the left-margin, keeping the sidebar attached to the right-hand edge.
+   When the screen is 850pt wide (expanding from the @media case above),
+   the left margin will be 210pt, the width 350pt, and the right margin therefore 290pt.*/
+@media screen and (min-width: 850pt) {
+    body {
+        margin-right: 290pt;    /* 290 = 850-(210+350) */
+        width: 350pt;
+        margin-left: auto;      /* ...takes up the slack */
+    }
+    div.topsidebar {
+        position: absolute;
+        width: 290pt;           /* same 290pt as above */
+        left: auto;
+        right: 0%;
+        padding-left: 0pt;
+        border: none;
+    }
+}
+
+
+code, pre {
+  font-family: Monaco, fixed;
+  font-size: 9pt;
+}
+
+a { text-decoration: none; }
 a:link { color: #66C; }
 a:visited { color: #669; }
 a[href]:hover { background: #EEE; }
@@ -36,7 +95,7 @@ h1 {
   margin-left: -40%;
   margin-right: -5%;
   padding: 0.5em;
-  border: solid #666;
+  border: solid thin #666;
   text-align: right;
 }
 h2 {
@@ -46,6 +105,11 @@ h2 {
   border-top: solid thin #666;
   clear: both;
 }
+
+h2.appendices {
+  margin-top: 10ex;
+  border-top: double medium #666;
+}
 h3 {
   margin-left: -30%;
   float: left;
@@ -91,8 +155,9 @@ img.smallimage {
 div.signature {
   margin-left: -40%;
   margin-right: -5%;
+  margin-top: 4ex;
   text-align: right;
-  border: solid #666;
+  border: solid thin #666;
   padding: 0.3em;
   clear: both;
 }
@@ -100,9 +165,9 @@ div.signature {
 /* ============================================================
  * Some other curiosities of my one-time formatting for web pages
  */
-pre.doc-history {
+.doc-history {
   font-size: xx-small;
-  background #eee;
+  background: #eee;
   line-height: 100%;
 }
 
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
index 91d3ff1b1df..3f81cf9c4af 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
+++ b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
@@ -28,7 +28,6 @@
 %% 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: @HGIDENT@
 %%
 \documentclass{article}
 
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.html b/Master/texmf-dist/doc/latex/textpos/textpos.html
index 8f056c5d212..487c526a367 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.html
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.html
@@ -20,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.7f, 2009 May 28.</p>
+<p>Version 1.7g, 2010 September 30.</p>
 </div>
 
 <p>This package facilitates placing boxes at absolute positions on the
@@ -51,6 +51,11 @@ material on the page.</p>
 <h3>History</h3>
 
 <dl>
+<dt>1.7g, 2010 September 30</dt>
+<dd>Bugfix: change the way we handle the {color} package not being
+loaded -- replacement <code>\color</code> command is now robust.  Also
+adjusted documentation of reference points.</dd>
+
 <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
@@ -185,7 +190,7 @@ up-to-date versions available there.</p>
 
 <div class="signature">
 <a href="http://nxg.me.uk" >Norman Gray</a><br />
-2009 May 28
+2010 September 30
 </div>
 
 </body>
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.pdf b/Master/texmf-dist/doc/latex/textpos/textpos.pdf
index 41b16f14df5..d48ca9de3f7 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.pdf
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.pdf