summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/textpos
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-15 00:18:33 +0000
committerKarl Berry <karl@freefriends.org>2012-11-15 00:18:33 +0000
commitfb9b612c3d1d6ac4d7201bf7a95ebe3fe8a844d1 (patch)
tree4fa003a8bb171436e719ae5b9968969aea52b3bc /Master/texmf-dist/source/latex/textpos
parenteafc90360cb16a334a31f04e761f7ba4de4d5529 (diff)
textpos 1.7i (14nov12)
git-svn-id: svn://tug.org/texlive/trunk@28261 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/textpos')
-rw-r--r--Master/texmf-dist/source/latex/textpos/textpos.drv11
-rw-r--r--Master/texmf-dist/source/latex/textpos/textpos.dtx96
2 files changed, 57 insertions, 50 deletions
diff --git a/Master/texmf-dist/source/latex/textpos/textpos.drv b/Master/texmf-dist/source/latex/textpos/textpos.drv
index 6abbce3a213..6ec53f17fdd 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--10 Norman Gray.
+%% This software is copyright, 1999, 2001--2003, 2005-7, 2009-12 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,12 +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
+%% Mercurial ident: 67a1f060e5fa, 2012-11-13 15:31 +0000
%%
\documentclass{ltxdoc}
\title{Textpos: absolute positioning of text on the page}
\author{Norman Gray\\(\texttt{http://nxg.me.uk})}
-\date{Version 1.7h, 2012 June 1\footnote{Mercurial ident: 9c8abea513c2, 2012-06-01 16:23 +0100}}
+\date{Version 1.7i, 2012 November 13\footnote{Mercurial ident: 67a1f060e5fa, 2012-11-13 15:31 +0000}}
\newcommand\Lopt[1]{\textsf {\small [#1]}}
\newcommand\file[1]{\texttt {#1}}
\newcommand\Lcount[1]{\textsl {\small#1}}
@@ -69,11 +69,12 @@
\begin{document}
\maketitle
\tableofcontents
-\medskip
+\bigskip
\hrule
-\medskip
+\bigskip
\DocInput{textpos.dtx}
\end{document}
+
\endinput
%%
%% End of file `textpos.drv'.
diff --git a/Master/texmf-dist/source/latex/textpos/textpos.dtx b/Master/texmf-dist/source/latex/textpos/textpos.dtx
index 66ceada7c77..ab5cb7adb54 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--10 Norman Gray.
+%% This software is copyright, 1999, 2001--2003, 2005-7, 2009-12 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,17 +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
+%% Mercurial ident: 67a1f060e5fa, 2012-11-13 15:31 +0000
%%
%<+package>\NeedsTeXFormat{LaTeX2e}
-%<+package>\ProvidesPackage{textpos}[2012/06/01 v1.7h]
-%<+package>\typeout{Package: textpos 2012/06/01 1.7h, absolute positioning of text on the page}
+%<+package>\ProvidesPackage{textpos}[2012/11/13 v1.7i]
+%<+package>\typeout{Package: textpos 2012/11/13 1.7i, 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 1.7h, 2012 June 1\footnote{Mercurial ident: 9c8abea513c2, 2012-06-01 16:23 +0100}}
+\date{Version 1.7i, 2012 November 13\footnote{Mercurial ident: 67a1f060e5fa, 2012-11-13 15:31 +0000}}
\newcommand\Lopt[1]{\textsf {\small [#1]}}
\newcommand\file[1]{\texttt {#1}}
\newcommand\Lcount[1]{\textsl {\small#1}}
@@ -72,9 +72,9 @@
\begin{document}
\maketitle
\tableofcontents
-\medskip
+\bigskip
\hrule
-\medskip
+\bigskip
\DocInput{textpos.dtx}
\end{document}
%</driver>
@@ -92,6 +92,7 @@
% \changes{v1.3?}{2003/06/??}{Finally removed bloody useless checksum and character table}
%
%
+% \noindent
% This package facilitates placing boxes at absolute positions on the
% \LaTeX\ page. There are several reasons why this might be useful, but
% the reason which originally motivated this package is to help produce a
@@ -113,7 +114,7 @@
% \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--2010 Norman Gray.
+% This software is copyright, 1999, 2001--2003, 2005-7, 2009-12 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.
@@ -121,7 +122,12 @@
%
% 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.
+% and there is an issues list there, for bug reports. Code
+% contributions or fixes are welcome, but note that I feel that
+% Textpos is pretty mature now, and I'm reluctant to extend its
+% functionality beyond its natural boundaries, so it would be wise to
+% chat to me about any new features before spending a lot of time
+% drafting them in code.
%
% An article describing Textpos appeared in TUGboat in 2002:
% Norman Gray, `Absolute Positioning with
@@ -547,6 +553,7 @@
% |\newline| commands in a row do not produce a blank page.
%
% \subsection{Interactions}
+% \label{s:interactions}
%
% Textpos does not appear to get on terribly well with
% Prosper\marginpar{textpos \& prosper} (a
@@ -563,13 +570,13 @@
% first thing on the slide.
% \marginpar{\dots \& beamer}
% The same appears to be true with the beamer package in some circumstances,
-% though Marius Raven reports that Textpos works OK with beamer,
+% though Marius Arenz 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.
+% with respect to anything else which plays games here.
%
% There's also an unfortunate interaction with the \texttt{color}
% package\marginpar{textpos \& color}. Textpos in absolute mode, and
@@ -638,13 +645,19 @@
% Axel Sommerfeldt provided elegant code to fix incorrect
% behaviour of |\caption| within the \Lenv{figure} environment.
%
+% Section~\ref{s:interactions}, above, lists numerous people who have
+% provided problem reports about the interactions between Textpos and
+% other packages, and provided suggestions for workarounds and fixes.
+%
% Thanks also for bugreports and other suggestions to
% Jozef Bednarcik,
% Daniel Richard G,
% Wolfgang Fleischer,
+% Greg Petriccione,
% Giovanni Radilla,
-% Robert Whittaker
-% and Joseph Wright.
+% Robert Whittaker,
+% Joseph Wright,
+% and Joachim Wuttke,
%
% 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.
@@ -689,7 +702,7 @@ located at that point, rather than the top-left corner.
% \end{macrocode}
%
% \StopEventually{}
-%
+
% \section{Implementation}
%
%
@@ -973,16 +986,13 @@ located at that point, rather than the top-left corner.
% \begin{macrocode}
\def\textblockcolour#1{%
\@ifundefined{color}%
- {%
- \gdef\TP@blockcolour{}% ignore argument, switch off colour blocking below
- \TP@dummycolorpackage
- }
- {%
- \def\@tempa{#1}
- \gdef\TP@blockcolour{#1}
- \ifx\TP@defaultblockcolour\@undefined
- \gdef\TP@defaultblockcolour{#1}
- \fi
+ {\PackageWarning{textpos}{command textblockcolour used,\MessageBreak
+ but {color} package not loaded.\MessageBreak
+ Colour changes ignored.}}
+ {\gdef\TP@blockcolour{#1}
+ \ifx\TP@defaultblockcolour\@undefined
+ \gdef\TP@defaultblockcolour{#1}
+ \fi
}}
\def\TP@blockcolour{} % safe initial default
% \end{macrocode}
@@ -1010,14 +1020,10 @@ located at that point, rather than the top-left corner.
% \begin{macrocode}
\def\textblockrulecolour#1{%
\@ifundefined{color}%
- {%
- \gdef\TP@rulecolour{}% ignore argument, switch off colour blocking below
- \TP@dummycolorpackage
- }
- {%
- \def\@tempa{#1}
- \gdef\TP@rulecolour{#1}%
- }}
+ {\PackageWarning{textpos}{command textblockrulecolour used,\MessageBreak
+ but {color} package not loaded.\MessageBreak
+ Colour changes ignored.}}
+ {\gdef\TP@rulecolour{#1}}}
\def\TP@rulecolour{black}
% \end{macrocode}
% Plus spelling-reform variants:
@@ -1034,15 +1040,15 @@ located at that point, rather than the top-left corner.
% just before we invoke any of the color package's commands (see above
% for usage).
% \begin{macrocode}
-\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{}%
- }
+\gdef\TP@color[#1]#2{}
+\def\TP@checkdummycolorpackage{%
+ \@ifundefined{color}%
+ {\globaldefs=1
+ \DeclareRobustCommand\color[2][]{}%
+ \def\color@block##1##2##3{}%
+ \globaldefs=0 }{}%
+ \global\let\TP@checkdummycolorpackage\relax % don't come here again
+}
% \end{macrocode}
%
% \begin{macro}{\textblock}
@@ -1126,6 +1132,7 @@ located at that point, rather than the top-left corner.
% If we're showing boxes, then draw a rule here
% \begin{macrocode}
\ifTPshowboxes
+ \TP@checkdummycolorpackage
{\color{\TP@rulecolour}\hrule height0pt depth \TPboxrulesize }%
\vskip-\TPboxrulesize
\fi
@@ -1297,10 +1304,9 @@ located at that point, rather than the top-left corner.
\setbox0=\vbox to 0pt{\vskip\@tempdimb
\hbox to 0pt{\hskip\@tempdima
\ifx\TP@blockcolour\@empty \else
- {% defaults for TP@blockcolour mean we should never get here if
- % the {color} package is not loaded
- \color{\TP@blockcolour}%
- \color@block{\wd\TP@textbox}{\ht\TP@textbox}{\dp\TP@textbox}%
+ {\TP@checkdummycolorpackage
+ \color{\TP@blockcolour}%
+ \color@block{\wd\TP@textbox}{\ht\TP@textbox}{\dp\TP@textbox}%
}%
\fi
\ifx\TP@defaultblockcolour\@undefined \else