textpos (1jun12)

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

11 files changed, 149 insertions, 74 deletions

diff --git a/Master/texmf-dist/doc/latex/textpos/README b/Master/texmf-dist/doc/latex/textpos/README
index 456a3edd573..a29983e0155 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.7g
+Version 1.7h, 2012 June 1
 
 This package facilitates placing boxes at absolute positions on the
 LaTeX page.  There are several reasons why this might be useful, but
@@ -17,6 +17,10 @@ commands.
 
 For the change history, see textpos.html.
 
+Textpos has a home page at <http://purl.org/nxg/dist/textpos>.
+The source is hosted at bitbucket: <https://bitbucket.org/nxg/textpos>,
+and there is an issues list there, for bug reports.
+
 
 Installation
 ------------
@@ -30,15 +34,15 @@ textpos.ins -- this will create the files
 Install textpos.sty somewhere TeX will find it.  Run LaTeX on file
 textpos.drv to produce instructions and documentation.
 
-This package requires the services of Martin Schr\"oder's package
+This package requires the services of Martin Schroeder's package
 everyshi.  You will need to download this package from CTAN first.  See
-\url{http://www.tex.ac.uk/tex-archive/macros/latex/contrib/supported/ms/} 
+<http://www.tex.ac.uk/tex-archive/macros/latex/contrib/supported/ms/>
 or one of the other CTAN hosts.
 
 Licence
 -------
 
-This software is copyright, 1999, 2001--2003, 2005-7, 2009, Norman Gray.  It
+This software is copyright, 1999, 2001--2003, 2005-7, 2009-10, 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.7g b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7g
deleted file mode 100644
index fca4c08356f..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7g
+++ /dev/null
@@ -1 +0,0 @@
-textpos-1.7g, released 2010 September 30
diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7h b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7h
new file mode 100644
index 00000000000..90912ddee75
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7h
@@ -0,0 +1 @@
+textpos-1.7h, released 2012 June 1
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 96359fa64e8..75c9a91c371 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 b6ba3d05f1c..946d11a6a55 100644
--- a/Master/texmf-dist/doc/latex/textpos/style.css
+++ b/Master/texmf-dist/doc/latex/textpos/style.css
@@ -3,9 +3,8 @@ body {
   background: white;
   margin-left: +30%;
   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 */
+  			    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;
@@ -18,6 +17,42 @@ body {
   line-height: 150%;
 }
 
+/* adapt to wider screens */
+@media screen and (min-width: 700pt) {
+    body {
+        margin-left: 210pt;
+        width: 350pt;
+    }
+}
+
+/* The following appears not to work in Safari or Chrome
+   -- don't know why, yet.
+@media print {
+    @page :right {
+        size: auto;
+        body {
+            margin-top: 2cm;
+            margin-bottom: 3cm;
+            margin-left: 10%;
+            width: 60%;
+            margin-right: 30%;
+            color: #d33;
+        }
+    }
+    @page :left {
+        size: auto;
+        body {
+            margin-top: 2cm;
+            margin-bottom: 3cm;
+            margin-left: 30%;
+            width: 60%;
+            margin-right: 10%;
+            color: #33d;
+        }
+    }
+}
+*/
+
 div.topsidebar {
     float: right;
     width: 50%;                 /* ...of the body width (ie, 50% x 50% of screen) */
@@ -28,6 +63,7 @@ div.topsidebar {
 }
 
 /* On wider screens, move the sidebar out to the right hand side */
+/* This uses CSS3 media queries: http://www.w3.org/TR/css3-mediaqueries/ */
 @media screen and (min-width: 700pt) and (max-width: 850pt) {
     body {
         margin-left: 210pt;
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
index 3f81cf9c4af..ee02bd10eb6 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, 2009 Norman Gray.
+%% This software is copyright, 1999, 2001--2003, 2005--7, 2009--10 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,6 +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 .
 %%
+%% Mercurial ident: 9c8abea513c2, 2012-06-01 16:23 +0100
 %%
 \documentclass{article}
 
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.html b/Master/texmf-dist/doc/latex/textpos/textpos.html
index 487c526a367..6cdf0d2e0af 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.html
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.html
@@ -16,11 +16,11 @@
 <body>
 <h1>Textpos</h1>
 <div class="abstract">
-<p>Lay out text and graphics at arbitrary positions on the LaTeX
-page.</p>
+<p>Lay out text and graphics at arbitrary positions on the LaTeX 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.7g, 2010 September 30.</p>
+  ><code>http://purl.org/nxg/dist/textpos</code></a>;
+please quote this URL rather than the URL it resolves to.</p>
+<p>Version 1.7h, 2012 June 1.</p>
 </div>
 
 <p>This package facilitates placing boxes at absolute positions on the
@@ -37,6 +37,11 @@ page, and which specifies where it is to be placed.  The environment
 is accompanied by various configuration commands.  See the <a
 href="textpos.pdf" >manual (pdf)</a>.</p>
 
+<p>An article describing Textpos appeared in TUGboat in 2002:
+<a href='http://www.tug.org/TUGboat/tb23-3-4/tb75gray.pdf'
+>Norman Gray, <em>Absolute Positioning with Textpos</em>,
+TUGboat <strong>23</strong> (3/4), pp341–4, 2002.</a></p>
+
 <p>I have a collection of general advice about <a
 href="http://purl.org/nxg/note/posters" >creating
 conference posters with LaTeX</a>.</p>
@@ -48,13 +53,22 @@ 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>
 
+<p>The source is held at <a href='https://bitbucket.org/nxg/textpos'>bitbucket</a>,
+and there is an issues list there, for bug reports.</p>
+
 <h3>History</h3>
 
 <dl>
+<dt>1.7h, 2012 June 1</dt>
+<dd>Bugfix: further change to the way the {color} package is loaded.
+Some documentation tweaks.
+Pointers to bitbucket repository.</dd>
+
 <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>
+loaded -- replacement <code>\color</code> command is now robust.
+Thanks to Joseph Wright for the bugreport.
+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
@@ -190,7 +204,7 @@ up-to-date versions available there.</p>
 
 <div class="signature">
 <a href="http://nxg.me.uk" >Norman Gray</a><br />
-2010 September 30
+2012 June 1
 </div>
 
 </body>
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.pdf b/Master/texmf-dist/doc/latex/textpos/textpos.pdf
index d48ca9de3f7..76194d96ebb 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 d7469f6cbe1..6abbce3a213 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--7, 2009 Norman Gray.
+%% This software is copyright, 1999, 2001--2003, 2005--7, 2009--10 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,15 +28,12 @@
 %% 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 .
 %%
+%% Mercurial ident: 9c8abea513c2, 2012-06-01 16:23 +0100
 %%
-\def\filename{textpos}
-\def\fileversion{1.7g}
-\def\filedate{2010/09/30}
-\def\docdate{2010 September 30}
 \documentclass{ltxdoc}
 \title{Textpos: absolute positioning of text on the page}
 \author{Norman Gray\\(\texttt{http://nxg.me.uk})}
-\date{Version \fileversion, \filedate}
+\date{Version 1.7h, 2012 June 1\footnote{Mercurial ident: 9c8abea513c2, 2012-06-01 16:23 +0100}}
 \newcommand\Lopt[1]{\textsf {\small [#1]}}
 \newcommand\file[1]{\texttt {#1}}
 \newcommand\Lcount[1]{\textsl {\small#1}}
@@ -71,6 +68,10 @@
 \OnlyDescription
 \begin{document}
 \maketitle
+\tableofcontents
+\medskip
+\hrule
+\medskip
 \DocInput{textpos.dtx}
 \end{document}
 \endinput
diff --git a/Master/texmf-dist/source/latex/textpos/textpos.dtx b/Master/texmf-dist/source/latex/textpos/textpos.dtx
index 4f31405e049..66ceada7c77 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--7, 2009 Norman Gray. 
+%% This software is copyright, 1999, 2001--2003, 2005--7, 2009--10 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,22 +24,17 @@
 %% 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 .
 %%
+%% Mercurial ident: 9c8abea513c2, 2012-06-01 16:23 +0100
 %%
-%<*package|driver>
-\def\filename{textpos}
-\def\fileversion{1.7g}
-\def\filedate{2010/09/30}
-\def\docdate{2010 September 30}
-%</package|driver>
 %<+package>\NeedsTeXFormat{LaTeX2e}
-%<+package>\ProvidesPackage{textpos}[\filedate\space v\fileversion]
-%<+package>\typeout{Package: `textpos' \fileversion\space<\docdate>}
+%<+package>\ProvidesPackage{textpos}[2012/06/01 v1.7h]
+%<+package>\typeout{Package: textpos 2012/06/01 1.7h, absolute positioning of text on the page}
 %
 %<*driver>
 \documentclass{ltxdoc}
 \title{Textpos: absolute positioning of text on the page}
 \author{Norman Gray\\(\texttt{http://nxg.me.uk})}
-\date{Version \fileversion, \filedate}
+\date{Version 1.7h, 2012 June 1\footnote{Mercurial ident: 9c8abea513c2, 2012-06-01 16:23 +0100}}
 \newcommand\Lopt[1]{\textsf {\small [#1]}}
 \newcommand\file[1]{\texttt {#1}}
 \newcommand\Lcount[1]{\textsl {\small#1}}
@@ -76,6 +71,10 @@
 \OnlyDescription
 \begin{document}
 \maketitle
+\tableofcontents
+\medskip
+\hrule
+\medskip
 \DocInput{textpos.dtx}
 \end{document}
 %</driver>
@@ -114,19 +113,20 @@
 % \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--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 \texttt{textpos.dtx}, and the file
-% \texttt{LICENCE} for the licence conditions.  You can find an
-% online copy of the GPL at \url{http://www.gnu.org/copyleft/gpl.html}.
+% This software is copyright, 1999, 2001--03, 2005--7, 2009--2010 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 \texttt{LICENCE} for the licence conditions.
+% You can find an online copy of the GPL at \url{http://www.gnu.org/copyleft/gpl.html}.
 %
-% An article describing Textpos appeared in TUGboat in 2004
-% (Norman Gray, `Absolute Positioning with  
+% Textpos has a home page at \url{http://purl.org/nxg/dist/textpos}.
+% The source is held at bitbucket: \url{https://bitbucket.org/nxg/textpos},
+% and there is an issues list there, for bug reports.
+%
+% An article describing Textpos appeared in TUGboat in 2002:
+% Norman Gray, `Absolute Positioning with  
 % Textpos', TUGboat \textbf{23} (3/4), pp341--4, 2002, available at
-% \url{http://www.tug.org/TUGboat/Contents/contents23-3-4.html}). 
-% Textpos has a home page at
-% \url{http://purl.org/nxg/dist/textpos}.
+% \url{http://www.tug.org/TUGboat/tb23-3-4/tb75gray.pdf}. 
 %
 % \section{Description}
 %
@@ -562,9 +562,13 @@
 % relative mode as long as the \Lenv{textblock} environment is the
 % first thing on the slide.
 % \marginpar{\dots \& beamer}
-% The same appears to be true with the beamer package.  Indeed
-% \emph{anything} doing things at |\shipout| time (which includes
-% Textpos in absolute mode) is going to be in a precarious position
+% The same appears to be true with the beamer package in some circumstances,
+% though Marius Raven reports that Textpos works OK with beamer,
+% as long as you supply the \Lopt{overlay} and \Lopt{absolute} options.
+%
+% In general, however, \emph{anything} doing things at |\shipout| time
+% (which includes Textpos in absolute mode)
+% is going to be in a slightly precarious position
 % with respect ot anything else which plays games here.
 %
 % There's also an unfortunate interaction with the \texttt{color}
@@ -601,7 +605,8 @@
 % with the \texttt{texdraw} package\marginpar{textpos \& texdraw}, with
 % |\move(0,0)| apparently 
 % making a difference when it should be a no-op.  I haven't worked out
-% what's going on here.
+% what's going on here, and further reports of this, ideally with a
+% minimal example, would be most welcome.
 %
 % \section{Credits}
 %
@@ -633,8 +638,13 @@
 % Axel Sommerfeldt provided elegant code to fix incorrect
 % behaviour of |\caption| within the \Lenv{figure} environment.
 %
-% Thanks also for bugreports and other suggestions to Jozef Bednarcik,
-% Daniel Richard G, Wolfgang Fleischer, Giovanni Radilla and Robert Whittaker.
+% Thanks also for bugreports and other suggestions to
+% Jozef Bednarcik,
+% Daniel Richard G,
+% Wolfgang Fleischer,
+% Giovanni Radilla,
+% Robert Whittaker
+% and Joseph Wright.
 %
 % If you've reported a bug or made a suggestion and I haven't credited
 % you here, please do accept my apologies, and please let me know.
@@ -965,8 +975,7 @@ located at that point, rather than the top-left corner.
   \@ifundefined{color}%
     {%
       \gdef\TP@blockcolour{}% ignore argument, switch off colour blocking below
-      \PackageWarning{textpos}{command textblockcolour used, but
-        {color} package not loaded.\MessageBreak Colour changes ignored.}%
+      \TP@dummycolorpackage
     }
     {%
       \def\@tempa{#1}
@@ -1003,8 +1012,8 @@ located at that point, rather than the top-left corner.
   \@ifundefined{color}%
     {%
       \gdef\TP@rulecolour{}% ignore argument, switch off colour blocking below
-      \PackageWarning{textpos}{command textblockrulecolour used, but
-        {color} package not loaded.\MessageBreak Colour changes ignored.}}%
+      \TP@dummycolorpackage
+    }
     {%
       \def\@tempa{#1}
       \gdef\TP@rulecolour{#1}%
@@ -1018,14 +1027,23 @@ located at that point, rather than the top-left corner.
 %    \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.
+% so we shouldn't fail if that package isn't loaded.  Don't check that
+% here, since the document, or another package, may load the color
+% package later.  Instead, define a command which will create dummy
+% no-op definitions for the package commands we use, and invoke this
+% just before we invoke any of the color package's commands (see above
+% for usage).
 %    \begin{macrocode}
-\@ifundefined{color}%
-  {\DeclareRobustCommand\color[2][]{}% Replace \color{foo} and \color[x]{foo}
-   \gdef\color@block#1#2#3{}% I think this 2nd one is redundant, given the TP@colourblock code below
-  }{}
+\def\TP@dummycolorpackage{%
+  \PackageWarning{textpos}{command textblockrulecolour used,\MessageBreak
+    but {color} package not loaded.\MessageBreak
+    Colour changes ignored.}%
+  \DeclareRobustCommand\color[2][]{}% Replace \color{foo} and \color[x]{foo}
+  % The following line may be redundant, given the TP@blockcolour code
+  % below, but it does no harm.
+  \gdef\color@block##1##2##3{}%
+  }
+%    \end{macrocode}
 %
 % \begin{macro}{\textblock}
 % Now define the start of the textblock environment.  Read the first
diff --git a/Master/texmf-dist/tex/latex/textpos/textpos.sty b/Master/texmf-dist/tex/latex/textpos/textpos.sty
index 20d6a6d4288..cf59f923cdb 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--7, 2009 Norman Gray.
+%% This software is copyright, 1999, 2001--2003, 2005--7, 2009--10 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,11 @@
 %% 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 .
 %%
+%% Mercurial ident: 9c8abea513c2, 2012-06-01 16:23 +0100
 %%
-\def\filename{textpos}
-\def\fileversion{1.7g}
-\def\filedate{2010/09/30}
-\def\docdate{2010 September 30}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{textpos}[\filedate\space v\fileversion]
-\typeout{Package: `textpos' \fileversion\space<\docdate>}
+\ProvidesPackage{textpos}[2012/06/01 v1.7h]
+\typeout{Package: textpos 2012/06/01 1.7h, absolute positioning of text on the page}
 \newif\ifTPshowboxes
 \TPshowboxesfalse
 \DeclareOption{showboxes}{\TPshowboxestrue}
@@ -146,8 +143,7 @@
   \@ifundefined{color}%
     {%
       \gdef\TP@blockcolour{}% ignore argument, switch off colour blocking below
-      \PackageWarning{textpos}{command textblockcolour used, but
-        {color} package not loaded.\MessageBreak Colour changes ignored.}%
+      \TP@dummycolorpackage
     }
     {%
       \def\@tempa{#1}
@@ -163,8 +159,8 @@
   \@ifundefined{color}%
     {%
       \gdef\TP@rulecolour{}% ignore argument, switch off colour blocking below
-      \PackageWarning{textpos}{command textblockrulecolour used, but
-        {color} package not loaded.\MessageBreak Colour changes ignored.}}%
+      \TP@dummycolorpackage
+    }
     {%
       \def\@tempa{#1}
       \gdef\TP@rulecolour{#1}%
@@ -172,10 +168,15 @@
 \def\TP@rulecolour{black}
 \let\textblockrulecolor\textblockrulecolour
 \let\tekstblokroolkulur\textblockrulecolour
-\@ifundefined{color}%
-  {\DeclareRobustCommand\color[2][]{}% Replace \color{foo} and \color[x]{foo}
-   \gdef\color@block#1#2#3{}% I think this 2nd one is redundant, given the TP@colourblock code below
-  }{}
+\def\TP@dummycolorpackage{%
+  \PackageWarning{textpos}{command textblockrulecolour used,\MessageBreak
+    but {color} package not loaded.\MessageBreak
+    Colour changes ignored.}%
+  \DeclareRobustCommand\color[2][]{}% Replace \color{foo} and \color[x]{foo}
+  % The following line may be redundant, given the TP@blockcolour code
+  % below, but it does no harm.
+  \gdef\color@block##1##2##3{}%
+  }
 \def\textblock#1{%
   \@tempdima=#1\TPHorizModule
   \ifvmode\else