diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/README | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/VERSION-1.7h | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/VERSION-1.7i | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.pdf | bin | 37286 -> 37275 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/style.css | 260 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/textpos-example.tex | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/textpos.html | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/textpos.pdf | bin | 237159 -> 238053 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/textpos/textpos.drv | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/textpos/textpos.dtx | 96 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/textpos/textpos.sty | 64 |
11 files changed, 102 insertions, 361 deletions
diff --git a/Master/texmf-dist/doc/latex/textpos/README b/Master/texmf-dist/doc/latex/textpos/README index a29983e0155..bb659757be3 100644 --- a/Master/texmf-dist/doc/latex/textpos/README +++ b/Master/texmf-dist/doc/latex/textpos/README @@ -2,7 +2,7 @@ Textpos: absolute positioning of text on the LaTeX page ------------------------------------------------------- -Version 1.7h, 2012 June 1 +Version 1.7i, 2012 November 13 This package facilitates placing boxes at absolute positions on the LaTeX page. There are several reasons why this might be useful, but @@ -25,14 +25,8 @@ and there is an issues list there, for bug reports. Installation ------------ -Download the files textpos.dtx and textpos.ins. Run LaTeX on the file -textpos.ins -- this will create the files - - textpos.sty - textpos.drv - -Install textpos.sty somewhere TeX will find it. Run LaTeX on file -textpos.drv to produce instructions and documentation. +Download or find the file textpos.sty. Install textpos.sty somewhere +LaTeX will find it (see <http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf>). This package requires the services of Martin Schroeder's package everyshi. You will need to download this package from CTAN first. See @@ -42,7 +36,7 @@ or one of the other CTAN hosts. Licence ------- -This software is copyright, 1999, 2001--2003, 2005-7, 2009-10, Norman Gray. It +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 textpos.dtx, and the file LICENCE for the licence conditions. diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7h b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7h deleted file mode 100644 index 90912ddee75..00000000000 --- a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7h +++ /dev/null @@ -1 +0,0 @@ -textpos-1.7h, released 2012 June 1 diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7i b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7i new file mode 100644 index 00000000000..91013e1bce0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7i @@ -0,0 +1 @@ +textpos-1.7i, released 2012 November 13 diff --git a/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.pdf b/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.pdf Binary files differindex 75c9a91c371..89125b31550 100644 --- a/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.pdf +++ b/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.pdf diff --git a/Master/texmf-dist/doc/latex/textpos/style.css b/Master/texmf-dist/doc/latex/textpos/style.css deleted file mode 100644 index 946d11a6a55..00000000000 --- a/Master/texmf-dist/doc/latex/textpos/style.css +++ /dev/null @@ -1,260 +0,0 @@ -body { - color: #333; - background: white; - margin-left: +30%; - width: 50%; /* body is 50% of screen width */ - padding: 0.5em; /* this will make a difference if I decide to - have the background a different colour */ - /* I can't decide on font: Optima's always nice, but Gill looks - agreeably intense. Helvetica's a decent fallback. */ - font-family: "Helvetica Neue", Helvetica, "Gill Sans", gill, sans-serif; - /* font-family: Optima, "Gill Sans", gill, Helvetica, sans-serif; */ - /* font-family: "Gill Sans", gill, Helvetica, sans-serif; */ - /* I seem to have used 11pt at some point in the past, but this - is far too big -- did I ever have a reason for that, or is it - just due to browser changes? */ - font-size: 10pt; - line-height: 150%; -} - -/* adapt to wider screens */ -@media screen and (min-width: 700pt) { - body { - margin-left: 210pt; - width: 350pt; - } -} - -/* The following appears not to work in Safari or Chrome - -- don't know why, yet. -@media print { - @page :right { - size: auto; - body { - margin-top: 2cm; - margin-bottom: 3cm; - margin-left: 10%; - width: 60%; - margin-right: 30%; - color: #d33; - } - } - @page :left { - size: auto; - body { - margin-top: 2cm; - margin-bottom: 3cm; - margin-left: 30%; - width: 60%; - margin-right: 10%; - color: #33d; - } - } -} -*/ - -div.topsidebar { - float: right; - width: 50%; /* ...of the body width (ie, 50% x 50% of screen) */ - font-size: smaller; - margin-left: 1em; - padding-left: 1em; - border-left: solid thin #AAA; -} - -/* On wider screens, move the sidebar out to the right hand side */ -/* This uses CSS3 media queries: http://www.w3.org/TR/css3-mediaqueries/ */ -@media screen and (min-width: 700pt) and (max-width: 850pt) { - body { - margin-left: 210pt; - width: 350pt; /* 50% of 700pt */ - margin-right: auto; - } - div.topsidebar { - position: absolute; - /* I feel this size should be 595pt (350 + 210 + 0.05*700), - but that's clearly not right -- I don't think I understand what the -5% - in the h1 spec below is actually 5% of! */ - left: 570pt; - width: auto; - margin-left: 0pt; - padding-left: 0pt; - border: none; - } -} -/* On still-wider screens, expand the left-margin, keeping the sidebar attached to the right-hand edge. - When the screen is 850pt wide (expanding from the @media case above), - the left margin will be 210pt, the width 350pt, and the right margin therefore 290pt.*/ -@media screen and (min-width: 850pt) { - body { - margin-right: 290pt; /* 290 = 850-(210+350) */ - width: 350pt; - margin-left: auto; /* ...takes up the slack */ - } - div.topsidebar { - position: absolute; - width: 290pt; /* same 290pt as above */ - left: auto; - right: 0%; - padding-left: 0pt; - border: none; - } -} - - -code, pre { - font-family: Monaco, fixed; - font-size: 9pt; -} - -a { text-decoration: none; } -a:link { color: #66C; } -a:visited { color: #669; } -a[href]:hover { background: #EEE; } - -div.abstract { - font-style: oblique; - text-align: left; -} -div.abstract em { font-style: normal; } -div.abstract code { - font-style: normal; - font-size: 80%; -} - -h1, h2, h3, h4, h5, h6 { - color: #822; - font-weight: 100; /* few fonts have ultra-light weights */ - line-height: 100%; /* no need to spread out titles */ -} -h1 { - margin-left: -40%; - margin-right: -5%; - padding: 0.5em; - border: solid thin #666; - text-align: right; -} -h2 { - margin-left: -40%; - margin-right: -5%; - padding: 0.2em; - border-top: solid thin #666; - clear: both; -} - -h2.appendices { - margin-top: 10ex; - border-top: double medium #666; -} -h3 { - margin-left: -30%; - float: left; - width: 25%; - display: block; - text-align: right; - vertical-align: bottom; - padding-top: 0pt; - padding-right: 0.5em; - margin-top: 0pt; - line-height: 120%; -} - -/* -h4 { - color: #C66; -} -*/ - -pre, table { background: #dde; } - -pre { - padding: 1em; - line-height: 130%; -} - -table { - font-size: smaller; -} -td { - padding: 0.5ex; -} - -Q:before { content: "“"; } -Q:after { content: "”"; } - -img.smallimage { - float: right; - margin: 24pt; - margin-right: -30%; -} - -div.signature { - margin-left: -40%; - margin-right: -5%; - margin-top: 4ex; - text-align: right; - border: solid thin #666; - padding: 0.3em; - clear: both; -} - -/* ============================================================ - * Some other curiosities of my one-time formatting for web pages - */ -.doc-history { - font-size: xx-small; - background: #eee; - line-height: 100%; -} - -div.subtoc, div.subsubtoc { display: none; } - -/* ============================================================ - * Special formatting for ToC - */ - -/* - If there's significant amount of text in front of the first subsection, - then the following are good to put in the per-document stylesheet: - width: 25%; - float: right; -*/ -div#toc { - color: #888; - padding: 0; - font-size: smaller; - text-align: right; -} -div#toc a:link { color: #888; } -div#toc > ul { - padding: 0pt; - margin: 0pt; - list-style: none; -} -div#toc li { - padding: 0pt; - display: inline-block; -} -div#toc li:before { - content: "§ "; - margin-left: 1em; -} -/* the following elements aren't currently generated by structure.lx */ -div#toc li ul { - padding-left: 1em; - margin-left: 0; - font-style: italic; - display: inline; -} -div#toc li ul:before { - content: "( "; -} -div#toc li ul:after { - content: " ) "; -} -div#toc li li { - padding-left: 0pt; -} -div#toc li li:after { - content: "; "; -} diff --git a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex index ee02bd10eb6..f695d749fbf 100644 --- a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex +++ b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex @@ -6,7 +6,7 @@ %% %% textpos.dtx (with options: `example') %% 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,7 +28,7 @@ %% 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{article} @@ -61,6 +61,7 @@ located at that point, rather than the top-left corner. \end{textblock} \end{document} + \endinput %% %% End of file `textpos-example.tex'. diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.html b/Master/texmf-dist/doc/latex/textpos/textpos.html index 6cdf0d2e0af..22594e62547 100644 --- a/Master/texmf-dist/doc/latex/textpos/textpos.html +++ b/Master/texmf-dist/doc/latex/textpos/textpos.html @@ -20,7 +20,7 @@ <p>The textpos home page is at <a href='http://purl.org/nxg/dist/textpos' ><code>http://purl.org/nxg/dist/textpos</code></a>; please quote this URL rather than the URL it resolves to.</p> -<p>Version 1.7h, 2012 June 1.</p> +<p>Version 1.7i, 2012 November 13.</p> </div> <p>This package facilitates placing boxes at absolute positions on the @@ -53,12 +53,17 @@ of using Textpos along with his <code>eso-pic</code> package, and the <code>calc</code> package, to produce a grid which can help lay out material on the page.</p> -<p>The source is held at <a href='https://bitbucket.org/nxg/textpos'>bitbucket</a>, +<p>The source is held at +<a href='https://bitbucket.org/nxg/textpos'>bitbucket</a>, and there is an issues list there, for bug reports.</p> <h3>History</h3> <dl> +<dt>1.7i, 2012 November 10</dt> +<dd>Bugfix: further change to the way the {color} package is loaded +(fixes issue 2); now finally fixed?</dd> + <dt>1.7h, 2012 June 1</dt> <dd>Bugfix: further change to the way the {color} package is loaded. Some documentation tweaks. @@ -204,7 +209,7 @@ up-to-date versions available there.</p> <div class="signature"> <a href="http://nxg.me.uk" >Norman Gray</a><br /> -2012 June 1 +2012 November 13 </div> </body> diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.pdf b/Master/texmf-dist/doc/latex/textpos/textpos.pdf Binary files differindex 76194d96ebb..1c6ebadcaea 100644 --- a/Master/texmf-dist/doc/latex/textpos/textpos.pdf +++ b/Master/texmf-dist/doc/latex/textpos/textpos.pdf 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 diff --git a/Master/texmf-dist/tex/latex/textpos/textpos.sty b/Master/texmf-dist/tex/latex/textpos/textpos.sty index cf59f923cdb..c931d423642 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--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,11 +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 %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{textpos}[2012/06/01 v1.7h] -\typeout{Package: textpos 2012/06/01 1.7h, absolute positioning of text on the page} +\ProvidesPackage{textpos}[2012/11/13 v1.7i] +\typeout{Package: textpos 2012/11/13 1.7i, absolute positioning of text on the page} + \newif\ifTPshowboxes \TPshowboxesfalse \DeclareOption{showboxes}{\TPshowboxestrue} @@ -141,42 +142,35 @@ \def\textblocklabel#1{\gdef\TP@textblocklabel{#1}} \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 \let\textblockcolor\textblockcolour \let\tekstblokkulur\textblockcolour \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} \let\textblockrulecolor\textblockrulecolour \let\tekstblokroolkulur\textblockrulecolour -\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 +} \def\textblock#1{% \@tempdima=#1\TPHorizModule \ifvmode\else @@ -212,6 +206,7 @@ \let\@xympar\TP@xympar \setbox\TP@textbox=\vbox\bgroup \ifTPshowboxes + \TP@checkdummycolorpackage {\color{\TP@rulecolour}\hrule height0pt depth \TPboxrulesize }% \vskip-\TPboxrulesize \fi @@ -288,10 +283,9 @@ \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 |