diff options
author | Karl Berry <karl@freefriends.org> | 2012-06-01 22:13:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-06-01 22:13:12 +0000 |
commit | f7d4279a3dc8c1c5b76d3a06a525f7bf0cf7f537 (patch) | |
tree | 77caabb296e9283581679b4a09046b440241cc38 /Master/texmf-dist/source/latex | |
parent | 5cc69ea6e2773435574a4d4f3cc67ef8833fd62b (diff) |
textpos (1jun12)
git-svn-id: svn://tug.org/texlive/trunk@26792 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/textpos/textpos.drv | 13 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/textpos/textpos.dtx | 94 |
2 files changed, 63 insertions, 44 deletions
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 |