diff options
Diffstat (limited to 'Master/texmf-dist/source/latex')
| -rw-r--r-- | Master/texmf-dist/source/latex/textpos/textpos.drv | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/textpos/textpos.dtx | 42 |
2 files changed, 38 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/latex/textpos/textpos.drv b/Master/texmf-dist/source/latex/textpos/textpos.drv index afc9b558934..246f3b2a66f 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, 2006 Norman Gray. +%% This software is copyright, 1999, 2001--2003, 2005-6 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,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.9 2006/08/24 13:59:21 norman Exp $ +%%% Source: $Id: textpos.dtx.in,v 1.11 2006/09/04 10:13:51 norman Exp $ %% %%\def\ParseRCSDate$#1: #2 #3 ${\def\TP@Date{#2}} -%%\ParseRCSDate$Date: 2006/08/24 13:59:21 $ +%%\ParseRCSDate$Date: 2006/09/04 10:13:51 $ \def\filename{textpos} -\def\fileversion{1.7} -\def\filedate{2006/08/24} -\def\docdate{2006 August 24} +\def\fileversion{1.7a} +\def\filedate{2006/09/02} +\def\docdate{2006 September 2} \documentclass{ltxdoc} \title{Textpos: absolute positioning of text on the page} \author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})} diff --git a/Master/texmf-dist/source/latex/textpos/textpos.dtx b/Master/texmf-dist/source/latex/textpos/textpos.dtx index 9e29d4df826..475a7ab62a3 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, 2006 Norman Gray. +%% This software is copyright, 1999, 2001--2003, 2005-6 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,15 +24,15 @@ %% 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 . %% -%<+package|driver|example>%%% Source: $Id: textpos.dtx.in,v 1.9 2006/08/24 13:59:21 norman Exp $ +%<+package|driver|example>%%% Source: $Id: textpos.dtx.in,v 1.11 2006/09/04 10:13:51 norman Exp $ %% %<*package|driver> %%\def\ParseRCSDate$#1: #2 #3 ${\def\TP@Date{#2}} -%%\ParseRCSDate$Date: 2006/08/24 13:59:21 $ +%%\ParseRCSDate$Date: 2006/09/04 10:13:51 $ \def\filename{textpos} -\def\fileversion{1.7} -\def\filedate{2006/08/24} -\def\docdate{2006 August 24} +\def\fileversion{1.7a} +\def\filedate{2006/09/02} +\def\docdate{2006 September 2} %</package|driver> %<+package>\NeedsTeXFormat{LaTeX2e} %<+package>\ProvidesPackage{textpos}[\filedate\space v\fileversion] @@ -112,7 +112,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, Norman Gray. It +% This software is copyright, 1999, 2001--03, 2005-6, 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 @@ -867,7 +867,11 @@ 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 + {% + \gdef\TP@blockcolour{}% ignore argument, switch off colour blocking below + \PackageWarning{textpos}{command textblockcolour used, but + {color} package not loaded.\MessageBreak Colour changes ignored.}% + } {% \def\@tempa{#1} \gdef\TP@blockcolour{#1} @@ -892,11 +896,19 @@ located at that point, rather than the top-left corner. % \end{macro} % % \begin{macro}{\textblockrulecolour} +% We select the colour of the box rules using |\color| (since v1.7). +% However we don't want to depend on the `color' package, so if we're +% showing box rules, and so would be selecting box colours, then give +% a warning but do not fail. Note the faking of that package's +% commands below. % \changes{v1.7}{2006/08/24}{Add textblockrulecolour} % \begin{macrocode} \def\textblockrulecolour#1{% \@ifundefined{color}% - {\gdef\TP@rulecolour{}}% ignore argument, switch off colour blocking below + {% + \gdef\TP@rulecolour{}% ignore argument, switch off colour blocking below + \PackageWarning{textpos}{command textblockrulecolour used, but + {color} package not loaded.\MessageBreak Colour changes ignored.}}% {% \def\@tempa{#1} \gdef\TP@rulecolour{#1}% @@ -909,6 +921,16 @@ located at that point, rather than the top-left corner. \let\tekstblokroolkulur\textblockrulecolour % \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. +% \begin{macrocode} +\@ifundefined{color}% + {\gdef\color#1{}% + \gdef\color@block#1#2#3{}% + }{} +% % \begin{macro}{\textblock} % Now define the start of the textblock environment. Read the first % argument, and save it for the moment as |\@tempdima|. If we are @@ -991,7 +1013,7 @@ located at that point, rather than the top-left corner. % If we're showing boxes, then draw a rule here % \begin{macrocode} \ifTPshowboxes - {\color{\TP@rulecolour} \hrule height0pt depth \TPboxrulesize }% + {\color{\TP@rulecolour}\hrule height0pt depth \TPboxrulesize }% \vskip-\TPboxrulesize \fi % \end{macrocode} |