From f7d4279a3dc8c1c5b76d3a06a525f7bf0cf7f537 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 1 Jun 2012 22:13:12 +0000 Subject: textpos (1jun12) git-svn-id: svn://tug.org/texlive/trunk@26792 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/textpos/textpos.sty | 31 +++++++++++++------------ 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex') 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 -- cgit v1.2.3