diff options
| author | Norbert Preining <preining@logic.at> | 2008-01-17 07:37:48 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2008-01-17 07:37:48 +0000 |
| commit | f68c780d6454f39b2b65fd74df409817b7c2fe8b (patch) | |
| tree | 251ae19c12f7a2cc2da35b008f9559f499ca58d2 /Master/texmf-dist/tex/latex/textpos | |
| parent | 3ad540de17823d46730b0ded939b821a7ed0918a (diff) | |
update textpos from ctan
git-svn-id: svn://tug.org/texlive/trunk@6283 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/textpos')
| -rw-r--r-- | Master/texmf-dist/tex/latex/textpos/textpos.sty | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/textpos/textpos.sty b/Master/texmf-dist/tex/latex/textpos/textpos.sty index 67de86e0372..e01a3c7a551 100644 --- a/Master/texmf-dist/tex/latex/textpos/textpos.sty +++ b/Master/texmf-dist/tex/latex/textpos/textpos.sty @@ -28,14 +28,14 @@ %% 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: $Id: textpos.dtx.in,v 1.13 2007/03/21 20:37:33 norman Exp $ +%%% Source: $Id: textpos.dtx.in,v 1.18 2007/04/04 13:22:51 norman Exp $ %% %%\def\ParseRCSDate$#1: #2 #3 ${\def\TP@Date{#2}} -%%\ParseRCSDate$Date: 2007/03/21 20:37:33 $ +%%\ParseRCSDate$Date: 2007/04/04 13:22:51 $ \def\filename{textpos} -\def\fileversion{1.7b} -\def\filedate{2007/03/21} -\def\docdate{2007 March 21} +\def\fileversion{1.7d} +\def\filedate{2007/03/30} +\def\docdate{2007 March 30} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{textpos}[\filedate\space v\fileversion] \typeout{Package: `textpos' \fileversion\space<\docdate>} @@ -59,11 +59,18 @@ \ifTP@abspos \RequirePackage{everyshi} \fi -\@ifundefined{figure}{}{ - \newcommand\TP@caption[2]{\refstepcounter{#1}\@caption{#1}[]{#2}} - \newcommand\TP@figure{\par \def\caption##1{\TP@caption{figure}{##1}}} - \newcommand\TP@table {\par \def\caption##1{\TP@caption{table}{##1}}} +\def\TP@xfloat#1[#2]{ + \par\def\@captype{#1}% + \@floatpenalty\z@ + \color@vbox + \normalcolor + \vbox\bgroup } +\def\TP@xympar{ + \PackageError{textpos} + {You can't use \protect\marginpar\space within a textblock} + {You're using textpos because you _don't_ want things to float + around, yes?}} \newbox\TP@textbox \ifTP@abspos \newbox\TP@holdbox % starts off void @@ -204,12 +211,8 @@ \newtoks\TP@tbargs \def\TP@textblock[#1,#2](#3,#4){% \TP@tbargs={{#1}{#2}{#3}{#4}}% - \@ifundefined{figure}{}{ - \let\figure\TP@figure - \let\table\TP@table - \let\endfigure\relax - \let\endtable\relax - } + \let\@xfloat\TP@xfloat + \let\@xympar\TP@xympar \setbox\TP@textbox=\vbox\bgroup \ifTPshowboxes {\color{\TP@rulecolour}\hrule height0pt depth \TPboxrulesize }% |