textpos (26sep20)

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

9 files changed, 178 insertions, 53 deletions

diff --git a/Master/texmf-dist/doc/latex/textpos/README b/Master/texmf-dist/doc/latex/textpos/README
index 47e5085aadc..c5a09cef8a2 100644
--- a/Master/texmf-dist/doc/latex/textpos/README
+++ b/Master/texmf-dist/doc/latex/textpos/README
@@ -1,8 +1,7 @@
-
 Textpos: absolute positioning of text on the LaTeX page
--------------------------------------------------------
+=======================================================
 
-Version 1.9.1, 2019 April 15
+Version 1.10, 2020 September 26
 
 This package facilitates placing boxes at absolute positions on the
 LaTeX page.  There are several reasons why this might be useful, but
@@ -15,34 +14,33 @@ to be placed on the page, and which specifies where it is to be
 placed.  The environment is accompanied by various configuration
 commands.
 
-For the change history, see textpos.html.
+Textpos has a canonical home page at <http://purl.org/nxg/dist/textpos>.
+The CTAN URL for Textpos is <https://ctan.org/pkg/textpos>.
+The source is hosted at [code.nxg.name](https://code.nxg.name/nxg/tex/textpos).
 
-The canonical CTAN URL for Textpos is <https://ctan.org/pkg/textpos>.
-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.
+For the change history, see textpos.html.
 
 
 Installation
 ------------
 
-Download or find the file textpos.sty.  Install textpos.sty somewhere
-LaTeX will find it (see <http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf>).
+Download or find the file `textpos.sty`.  Install `textpos.sty` somewhere
+LaTeX will find it (see [the TeX FAQ](http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf)).
 
 This package requires the services of Martin Schroeder's package
-everyshi.  You will need to download this package from CTAN first.  See
-<https://www.ctan.org/pkg/everyshi>.
+[everyshi][everyshi].  You will need to download this package from CTAN first.
 
 Licence
 -------
 
-This software is copyright, 1999-2019, Norman Gray.
+This software is copyright, 1999-2020, Norman Gray.
 It is released under the terms of the [LaTeX Project Public License][lppl],
 which is included in the file LICENCE.
 
 
 
 Norman Gray  
-http://nxg.me.uk
+<https://nxg.me.uk>
 
 [lppl]: http://www.latex-project.org/lppl.txt
+[everyshi]: https://www.ctan.org/pkg/everyshi
diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.10 b/Master/texmf-dist/doc/latex/textpos/VERSION-1.10
new file mode 100644
index 00000000000..8414910cfad
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/VERSION-1.10
@@ -0,0 +1 @@
+textpos-1.10, released 2020 September 26
diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.9.1 b/Master/texmf-dist/doc/latex/textpos/VERSION-1.9.1
deleted file mode 100644
index 8c18834dd52..00000000000
--- a/Master/texmf-dist/doc/latex/textpos/VERSION-1.9.1
+++ /dev/null
@@ -1 +0,0 @@
-textpos-1.9.1, released 2019 April 15
diff --git a/Master/texmf-dist/doc/latex/textpos/examples/t1.tex b/Master/texmf-dist/doc/latex/textpos/examples/t1.tex
index 8cb8bfc45ff..9ec75f092d7 100644
--- a/Master/texmf-dist/doc/latex/textpos/examples/t1.tex
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t1.tex
@@ -14,16 +14,7 @@
 
 \begin{document}
 
-\begin{textblock}{4}(0,0)
-  % make a grid on the page
-  \lineskip=0pt  % abut boxes directly
-  \setbox1=\hbox to \TPHorizModule{\hfill \vrule height \TPVertModule}
-  \setbox0=\vbox to \TPVertModule{\noindent\copy1\copy1 \copy1 \vss\hrule}
-  \copy0
-  \copy0
-  \copy0
-  \copy0
-\end{textblock}
+\TPShowGrid{4}{4}
 
 \begin{textblock}{3}(0,0)
 \{3\}(0,0)
@@ -38,6 +29,19 @@
 \{3\}[0.5,0.5](3,3)
 \end{textblock}
 
+\begin{textblock}{1}[0,0](4,2)
+[0,0]
+\end{textblock}
+\begin{textblock}{1}[0,1](4,2)
+[0,1]
+\end{textblock}
+\begin{textblock}{1}[1,0](4,2)
+[1,0]
+\end{textblock}
+\begin{textblock}{1}[1,1](4,2)
+\hfill [1,1]  % push this to the right of the box
+\end{textblock}
+
 \begin{textblock}{2.5}(3,3)
 \{2.5\}(3,3)
 \end{textblock}
diff --git a/Master/texmf-dist/doc/latex/textpos/examples/t11.tex b/Master/texmf-dist/doc/latex/textpos/examples/t11.tex
new file mode 100644
index 00000000000..e07c3572b06
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/textpos/examples/t11.tex
@@ -0,0 +1,90 @@
+%%% Testing: textblock in horizontal mode
+%
+% In textpos up to 1.9.1, a textblock in horizontal mode, with the
+% [absolute] option, worked, in the sense of not failing, but produced
+% ugly spacing, because in generating a `\par` it messed up
+% inter-paragraph spacing.  This had the result that the text either
+% side of the textblock appeared as separate paragraphs with no space
+% between them.  The appearance in [relative] mode was OK, but with
+% the `\par` visible.  This isn't a _bug_, since the documentation
+% didn't say anything other than that a `\par` is inserted at this
+% point, but it's not pretty.
+
+\documentclass{article}
+
+\parindent=0pt
+\baselineskip=12pt
+
+\usepackage[absolute]{textpos}
+\usepackage{color}
+
+\definecolor{Blue}{rgb}{0.9,0.9,1.0}
+\definecolor{Red}{rgb}{1.0,0.5,0.5}
+\textblockcolour{Blue}
+
+% Make the textblock contents, and size, stand out
+\def\content#1{\noindent
+  \textcolor{Red}{\hbox to 1em{%
+      \vrule height 9pt depth 3pt width 2pt %12 pt total
+      \hss
+      \vrule width 2pt }\relax
+    #1}}
+
+\begin{document}
+
+\TPoptions{absolute=false}
+
+Line 1.  Line 1a.               % no descenders on this line
+% The sentence space between these should be the same as between these
+% and 1bis
+\begin{textblock}{5}(0,0)
+\content{Relative, hmode}
+\end{textblock}
+Line \smash{1bis, preceded by sentence space}. % \smash, to ensure line has zero depth
+
+Line 2 should be the usual baseline from 1.
+
+\vskip 1cm
+
+Line 3.
+
+\begin{textblock}{5}(0,0)
+\content{Relative, vmode}
+\end{textblock}
+
+Line 4.
+
+Line 5 should be separated from line 4 by the same baseline as 4 from~3.
+
+Line 6. Line 6a.
+\begin{textblock*}{10cm}(0mm,0mm)
+\content{Relative, hmode, star.}
+\end{textblock*}
+Line \smash{6bis, preceded by sentence space.}
+
+Line 7. With second sentence.
+
+\begin{textblock*}{10cm}(0mm,0mm)
+\content{Relative, vmode, star.}
+\end{textblock*}
+
+Line 8 should be separated from 7 by the usual baseline.
+
+\newpage
+\TPoptions{absolute=true}
+
+Line 9. Line 9a.
+\begin{textblock}{5}(0,0)
+\content{Absolute 1}
+\end{textblock}
+Line 9bis, preceded by sentence space.  % the smash doesn't matter in absolute mode
+
+Line 10.
+
+\begin{textblock*}{5cm}(0mm,10mm)
+\content{Absolute 2}
+\end{textblock*}
+
+Line 11 should be separated from 10 by the usual baseline.
+
+\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 791fa57b849..64b976a71df 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/textpos-example.tex b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
index 2e8cb70547f..212238b5849 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
+++ b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex
@@ -7,7 +7,7 @@
 %% textpos.dtx  (with options: `example')
 %% Textpos: absolute positioning of text on the page
 %%%% File: textpos.dtx
-%%%% Copyright 1999-2019, Norman Gray
+%%%% Copyright 1999-2020, Norman Gray
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,17 +19,17 @@
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
-%% The Current Maintainer of this work is Norman Gray <http://nxg.me.uk>
+%% The Current Maintainer of this work is Norman Gray <https://nxg.me.uk>
 %%
 %% This work consists of the files textpos.dtx and textpos.ins,
 %% and the derived file textpos.sty.
 %%
-%% Author: Norman Gray, norman@astro.gla.ac.uk.
+%% Author: Norman Gray, gray@nxg.name
 %% Department of Physics and Astronomy, University of Glasgow, UK
 %%
 %% See the file LICENCE for a copy of the LPPL.
 %%
-%% Mercurial ident: 09ee0efc21ac (1.9.1+0), 2019-04-15 22:14 +0100
+%% Mercurial ident: c834991c867a (1.10+1), 2020-09-26 17:44 +0100
 %%
 \documentclass{article}
 
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.html b/Master/texmf-dist/doc/latex/textpos/textpos.html
index eec9629d6b5..9688d6417e5 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.html
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.html
@@ -1,26 +1,25 @@
-<?xml version="1.0"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head profile="http://dublincore.org/documents/dcq-html/">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:dcterms="http://purl.org/dc/terms/">
+<head>
 <title>Textpos</title>
-<meta name="DC.subject" content="latex, textpos, absolute positioning"/>
-<meta name="DC.title" content="Textpos"/>
-<meta name="DC.date" content="2019-04-15"/> 
-<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"/>
-<link href="https://nxg.me.uk/norman" rev="author"/>
-<link type="text/css" rel="stylesheet" href="style.css"/>
+<meta property="dcterms:subject" content="latex, textpos, absolute positioning"/>
+
+<meta property="dcterms:date" content="2020-09-26"/> 
+<link href="https://nxg.me.uk/norman" rev="author" rel="dcterms:creator"/>
+
 </head>
 
 <body>
-<h1>Textpos</h1>
+<h1 property="dcterms:title">Textpos</h1>
 <div class="abstract">
-<p>Lay out text and graphics at arbitrary positions on the LaTeX page.</p>
+<p property="dcterms:description">Lay out text and graphics at arbitrary positions on the LaTeX page.</p>
 
-<p>
 
-<span class="distpage">The textpos home page is at
-<a href="http://purl.org/nxg/dist/textpos"><code>http://purl.org/nxg/dist/textpos</code></a>;</span>
+<p class="distpage">The textpos home page is at
+<a href="http://purl.org/nxg/dist/textpos"><code>https://purl.org/nxg/dist/textpos</code></a>;
 please quote this URL rather than the URL it resolves to.</p>
-<p>Version 1.9.1, 2019 April 15.</p>
+<p>Version 1.10, 2020 September 26.</p>
 </div>
 
 <p>This package facilitates placing boxes at absolute positions on the
@@ -49,14 +48,15 @@ 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>
+<p class="distpage">The source is held
+<a href="https://code.nxg.name/nxg/tex/textpos">online</a></p>
+
+
 
 
-<div class="distpage">
-  <h2>Installation and further information</h2>
-</div>
+
+
+<h2 class="distpage">Installation and further information</h2>
 
 <ol>
 
@@ -80,7 +80,40 @@ documentation.</li>
 <h2>History</h2>
 
 <dl>
-<dt><strong>1.9.1, 2019 April 15</strong></dt>
+<dt><strong>1.10, 2020 September 26</strong></dt>
+<dd>
+<ul>
+<li>Use the <em>ltshipout</em> package to place boxes in absolute mode.
+Therefore the package should now be compatible with LaTeX3.
+Many thanks to Ulrike Fischer for guidance on the changes which were required here.</li>
+<li>The code has moved from bitbucket.org to
+<a href="https://code.nxg.name/nxg/tex/textpos/">code.nxg.name</a>,
+since bitbucket have closed down support for Mercurial.  The
+outstanding issues have been preserved, but have not (yet) been
+migrated to a new system, so may become inaccessible.</li>
+</ul>
+</dd>
+
+<dt>1.10b1, 2020 January 26</dt>
+<dd>
+<ul>
+<li>Add the <code>\TPShowGrid</code> macro.</li>
+<li>Become invisible in horizontal mode.
+<em>Note: this is a change in behaviour:</em>
+Before this the behaviour of the package in horizontal
+mode was deliberately somewhat underspecified (with an intended
+implication of ‘don't do this’), and the package, for want of anything
+more imaginative to do, simply threw in a paragraph break, which
+produced ugly spacing in some circumstances.  As a result of
+<a href="https://tex.stackexchange.com/questions/525453/">user
+feedback</a>, from version 1.10 it seemed reasonable to try a little
+harder to be invisible in the horizontal case
+(see <a href="https://bitbucket.org/nxg/textpos/issues/16/">issue 16</a>).</li>
+<li>Various documentation improvements.</li>
+</ul>
+</dd>
+
+<dt>1.9.1, 2019 April 15</dt>
 <dd>
 <ul>
 <li>Added the <code>\TPReferencePosition</code> command, to change the
@@ -246,8 +279,8 @@ make textpos compatible with the <code>calc</code> package</dd>
 
 
 <div class="signature">
-<a href="http://nxg.me.uk">Norman Gray</a><br/>
-2019 April 15
+<a href="https://nxg.me.uk">Norman Gray</a><br/>
+2020 September 26
 </div>
 
 </body>
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.pdf b/Master/texmf-dist/doc/latex/textpos/textpos.pdf
index 88e65fbcea3..ea21daab343 100644
--- a/Master/texmf-dist/doc/latex/textpos/textpos.pdf
+++ b/Master/texmf-dist/doc/latex/textpos/textpos.pdf