From 5fc3f93a355634a0c215e3f163aa8ebde2033ba0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 3 Apr 2007 00:15:52 +0000 Subject: textpos update (22mar07) git-svn-id: svn://tug.org/texlive/trunk@4105 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/textpos/README | 2 +- Master/texmf-dist/doc/latex/textpos/VERSION-1.7a | 1 - Master/texmf-dist/doc/latex/textpos/VERSION-1.7b | 1 + .../texmf-dist/doc/latex/textpos/examples/t6.tex | 72 ++++++++++------- .../doc/latex/textpos/textpos-example.tex | 4 +- Master/texmf-dist/doc/latex/textpos/textpos.html | 11 ++- Master/texmf-dist/doc/latex/textpos/textpos.pdf | Bin 88406 -> 90173 bytes Master/texmf-dist/source/latex/textpos/textpos.drv | 19 +++-- Master/texmf-dist/source/latex/textpos/textpos.dtx | 89 ++++++++++++++++----- Master/texmf-dist/tex/latex/textpos/textpos.sty | 43 ++++++---- Master/texmf-dist/tpm/textpos.tpm | 10 +-- Master/texmf/lists/textpos | 2 +- 12 files changed, 169 insertions(+), 85 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/textpos/VERSION-1.7a create mode 100644 Master/texmf-dist/doc/latex/textpos/VERSION-1.7b diff --git a/Master/texmf-dist/doc/latex/textpos/README b/Master/texmf-dist/doc/latex/textpos/README index e53a0473ca3..9aa4812b538 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.7a +Version 1.7b This package facilitates placing boxes at absolute positions on the LaTeX page. There are several reasons why this might be useful, but diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7a b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7a deleted file mode 100644 index 7b56e0a95b5..00000000000 --- a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7a +++ /dev/null @@ -1 +0,0 @@ -textpos-1.7a, released 2006 September 2 diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7b b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7b new file mode 100644 index 00000000000..f15d65c91f7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7b @@ -0,0 +1 @@ +textpos-1.7b, released 2007 March 21 diff --git a/Master/texmf-dist/doc/latex/textpos/examples/t6.tex b/Master/texmf-dist/doc/latex/textpos/examples/t6.tex index 171a77fba4d..93e3cefaeb9 100644 --- a/Master/texmf-dist/doc/latex/textpos/examples/t6.tex +++ b/Master/texmf-dist/doc/latex/textpos/examples/t6.tex @@ -20,7 +20,7 @@ Blue \end{textblock} -\begin{textblock}{8}(14,6) +\begin{textblock}{8}(14,0) \hrule width 8\TPHorizModule \vskip1\TPVertModule \hrule width 4\TPHorizModule @@ -30,56 +30,66 @@ \hrule width 1\TPHorizModule \end{textblock} -\begin{textblock}{8}(4,2) - This package facilitates placing boxes at absolute positions on the - \LaTeX\ page. There are several reasons why this might be useful, but - the main one (or at least my motivating one) is to help produce a - large-format conference poster. +\begin{textblock}{12}(4,4) + This text is inside a box with a blue background. The text is flush + with the edge of the box, and the whole thing is twelve units wide. - This package provides a single environment, which contains the text - (or graphics, or table, or whatever) which is to be placed on the - page, and which specifies where it is to be placed. + There's a second paragraph in here. + \begin{itemize} + \item Here is a list item. It should be appropriately narrower than + the text around it, and specifically not abut the border. + \item Here is a second item. + \end{itemize} \end{textblock} \TPshowboxestrue \textblockrulecolour{red} \setlength\TPboxrulesize{0.25\TPHorizModule} -\TPMargin{0.5\TPHorizModule} +\TPMargin{1\TPHorizModule} -\begin{textblock}{4}(0,8) +\begin{textblock}{4}(0,7) \textblockcolour{Blue} Blue \end{textblock} -\begin{textblock}{8}(4,10) - This package facilitates placing boxes at absolute positions on the - \LaTeX\ page. There are several reasons why this might be useful, but - the main one (or at least my motivating one) is to help produce a - large-format conference poster. - - This package provides a single environment, which contains the text - which is to be placed on the - page, and which specifies where it is to be placed. +\begin{textblock}{12}(4,11) + This text is also inside a box with a blue background. However, + this time, there's a red border and a margin. The box as a whole is + twelve units wide, and the text is correspondingly narrower. + \begin{itemize} + \item Here is a list item. It should be appropriately narrower than + the text around it, and specifically not abut the border. + \item Here is a second item. + \end{itemize} \end{textblock} -\TPMargin*{0.5\TPHorizModule} +\TPMargin*{1\TPHorizModule} -\begin{textblock}{4}(0,20) +\begin{textblock}{4}(0,19) \textblockcolour{Blue} Blue \end{textblock} \tekstblokroolkulur{Borders} -\begin{textblock}{8}(4,22) - This package facilitates placing boxes at absolute positions on the - \LaTeX\ page. There are several reasons why this might be useful, but - the main one (or at least my motivating one) is to help produce a - large-format conference poster. - - This package provides a single environment, which contains the text - (or graphics, or table, or whatever) which is to be placed on the - page, and which specifies where it is to be placed. +\begin{textblock}{12}(4,21) + Finally, here is some text on a blue background with an + unattractive green border. This time, the text is twelve units wide, + and the box, and its border, is consequently wider than that. + \begin{itemize} + \item Here is a list item. It should be appropriately narrower than + the text around it, and specifically not abut the border. + \item Here is a second item. + \end{itemize} + Here's some final text, and a quotation: + \begin{quotation} + \noindent + You shall see them on a beautiful quarto page, where a neat rivulet + of text shall meander through a meadow of + margin. + \hfil\penalty50\hskip2em\hbox{}\nobreak\hfil + \emph{--- Sheridan, The School for Scandal}\parfillskip=0pt + \end{quotation} \end{textblock} diff --git a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex index 4e80331da49..9ae78c096c8 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-6 Norman Gray. +%% This software is copyright, 1999, 2001--2003, 2005--7 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 . %% -%%% Source: $Id: textpos.dtx.in,v 1.11 2006/09/04 10:13:51 norman Exp $ +%%% Source: $Id: textpos.dtx.in,v 1.13 2007/03/21 20:37:33 norman Exp $ %% \documentclass{article} diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.html b/Master/texmf-dist/doc/latex/textpos/textpos.html index edf4e38897b..71c31d826a7 100644 --- a/Master/texmf-dist/doc/latex/textpos/textpos.html +++ b/Master/texmf-dist/doc/latex/textpos/textpos.html @@ -15,7 +15,7 @@ page.

The textpos home page is at http://purl.org/nxg/dist/textpos

-

Version 1.7a, 2006 September 2.

+

Version 1.7b, 2007 March 21.

This package facilitates placing boxes at absolute positions on the @@ -39,6 +39,13 @@ conference posters with LaTeX.

+
1.7b, 2007 March 21
+
Robert Whittaker reported a problem with \TPmargin, +which meant that lists and quotations (and other things which +manipulated \leftskip and \rightskip) were +not decreasing in size when you set \TPmargin non-zero. +Fixed.
+
1.7a, 2006 September 2
Version 1.7 created an inadvertant dependency on the {color} package. Now, if you do not load that package, @@ -142,7 +149,7 @@ up-to-date versions available there.

Norman Gray
-2006 September 2 +2007 March 21
diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.pdf b/Master/texmf-dist/doc/latex/textpos/textpos.pdf index 480ef1395e1..1784dbe3b2d 100644 Binary files a/Master/texmf-dist/doc/latex/textpos/textpos.pdf and b/Master/texmf-dist/doc/latex/textpos/textpos.pdf differ diff --git a/Master/texmf-dist/source/latex/textpos/textpos.drv b/Master/texmf-dist/source/latex/textpos/textpos.drv index 246f3b2a66f..40f151eb618 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-6 Norman Gray. +%% This software is copyright, 1999, 2001--2003, 2005--7 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,23 +28,28 @@ %% 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.11 2006/09/04 10:13:51 norman Exp $ +%%% Source: $Id: textpos.dtx.in,v 1.13 2007/03/21 20:37:33 norman Exp $ %% %%\def\ParseRCSDate$#1: #2 #3 ${\def\TP@Date{#2}} -%%\ParseRCSDate$Date: 2006/09/04 10:13:51 $ +%%\ParseRCSDate$Date: 2007/03/21 20:37:33 $ \def\filename{textpos} -\def\fileversion{1.7a} -\def\filedate{2006/09/02} -\def\docdate{2006 September 2} +\def\fileversion{1.7b} +\def\filedate{2007/03/21} +\def\docdate{2007 March 21} \documentclass{ltxdoc} \title{Textpos: absolute positioning of text on the page} \author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})} \date{Version \fileversion, \filedate} -\newcommand\Lopt[1]{\textsf {#1}} +\newcommand\Lopt[1]{\textsf {\small [#1]}} \newcommand\file[1]{\texttt {#1}} \newcommand\Lcount[1]{\textsl {\small#1}} \newcommand\Lenv[1]{\texttt{\{#1\}}} \newcommand\pstyle[1]{\textsl {#1}} +\makeatletter % make the ttfamily font less overbearingly large +\renewcommand\ttfamily{\not@math@alphabet\ttfamily\mathtt + \fontfamily\ttdefault + \fontsize{9}{\f@baselineskip}\selectfont} +\makeatother \def\activemeta#1>{\meta{#1}} {\catcode`\<=\active \gdef\cmd{\begingroup diff --git a/Master/texmf-dist/source/latex/textpos/textpos.dtx b/Master/texmf-dist/source/latex/textpos/textpos.dtx index 475a7ab62a3..b13c43e782e 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-6 Norman Gray. +%% This software is copyright, 1999, 2001--2003, 2005--7 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.11 2006/09/04 10:13:51 norman Exp $ +%<+package|driver|example>%%% Source: $Id: textpos.dtx.in,v 1.13 2007/03/21 20:37:33 norman Exp $ %% %<*package|driver> %%\def\ParseRCSDate$#1: #2 #3 ${\def\TP@Date{#2}} -%%\ParseRCSDate$Date: 2006/09/04 10:13:51 $ +%%\ParseRCSDate$Date: 2007/03/21 20:37:33 $ \def\filename{textpos} -\def\fileversion{1.7a} -\def\filedate{2006/09/02} -\def\docdate{2006 September 2} +\def\fileversion{1.7b} +\def\filedate{2007/03/21} +\def\docdate{2007 March 21} % %<+package>\NeedsTeXFormat{LaTeX2e} %<+package>\ProvidesPackage{textpos}[\filedate\space v\fileversion] @@ -43,11 +43,16 @@ \title{Textpos: absolute positioning of text on the page} \author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})} \date{Version \fileversion, \filedate} -\newcommand\Lopt[1]{\textsf {#1}} +\newcommand\Lopt[1]{\textsf {\small [#1]}} \newcommand\file[1]{\texttt {#1}} \newcommand\Lcount[1]{\textsl {\small#1}} \newcommand\Lenv[1]{\texttt{\{#1\}}} \newcommand\pstyle[1]{\textsl {#1}} +\makeatletter % make the ttfamily font less overbearingly large +\renewcommand\ttfamily{\not@math@alphabet\ttfamily\mathtt + \fontfamily\ttdefault + \fontsize{9}{\f@baselineskip}\selectfont} +\makeatother % Make command strings easier to write \def\activemeta#1>{\meta{#1}} {\catcode`\<=\active @@ -319,11 +324,11 @@ % % \pstyle{Textpos} overrides any \Lenv{figure} and \Lenv{table} % \marginpar{Figure and table environments} -% environments within instances of the \Lenv{textblock} environment -% (it does not, however, do so outside the environment, so you are +% environments \emph{within} instances of the \Lenv{textblock} environment. +% It does not, however, do so outside the environment, so you are % still able to use \pstyle{textblock} within figures, as described % above; also it avoids doing so unless the documentclass already -% defined a \Lenv{figure} environment). This is because the normal +% defined a \Lenv{figure} environment. This is because the normal % behaviour of these environments -- which is to float their contents % away from the point of definition -- obviously interacts very badly % with the \Lenv{textblock} environment, since @@ -338,8 +343,30 @@ % example -- but many people automatically use them to surround % graphics or tables, and also expect to use these environments to % number figures and tables within \Lenv{textblock} environments; they -% are therefore here on a principle of least surprise. This feature -% is still somewhat provisional, and may still be a little buggy. +% are therefore here on a principle of least surprise. +% +% Since both \LaTeX's floats mechanism (that is, \Lenv{figure} and +% \Lenv{table}) and the \Lopt{absolute} mode are designed to move +% content around, we can't expect them to play together nicely. With +% \Lopt{absolute} mode on, the contents of a \Lenv{textblock} inside a +% floating \Lenv{figure} probably isn't going to end up where you +% expect it to. The only case I can think of where this would +% inconvenience you, is if you wanted some absolutely-positioned +% material to appear on the `next' page. You might at first try to use +% a |\begin{figure}[p]| -- that won't work, but the following will, if +% you first load the \pstyle{afterpage} package: +% \begin{verbatim} +% \afterpage{% +% \newpage% +% \begin{textblock*}{297mm}(0mm,0mm)% +% \includegraphics{picture.png}% a full-page picture? +% \end{textblock*}% +% \null% +% \newpage} +% \end{verbatim} +% This inserts a complete page, with some graphic on it, immediately +% after the end of the current page (thanks to Matthias Gloede for +% this technique). % % \DescribeMacro{\textblockcolour} % The text blocks can be coloured in. If you load the \pstyle{color} @@ -558,7 +585,11 @@ % borders, and that it would be useful to turn the bordering feature % on and off within the file. % -% Thanks also for bugreports to Jozef Bednarcik and Wolfgang Fleischer. +% Thanks also for bugreports to Jozef Bednarcik, Wolfgang Fleischer +% and Robert Whittaker. +% +% 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. % % \section{Example} % @@ -1027,15 +1058,24 @@ located at that point, rather than the top-left corner. % of the margin, to set the text in a block which is that much smaller % than the enclosing box, and (b) include the same amount of vertical % skip before and after the text block. +% \changes{v1.7b}{2007/03/21}{Fixed lists inside boxes with non-zero margins} % \begin{macrocode} - \hsize=\@tempdima - \ifdim\TP@margin < 0pt - \advance\hsize by 2\TP@absmargin % bigger box + \ifdim\TP@margin = 0pt + \hsize=\@tempdima + \textwidth\hsize \columnwidth\hsize \linewidth\hsize + \else + \vskip\TP@absmargin + \@tempdimb=\@tempdima % \@tempdimb is outer box width + \hsize=\@tempdima % \hsize is inner box width + \ifdim\TP@margin < 0pt + \advance\@tempdimb by 2\TP@absmargin % bigger box + \else + \advance\hsize by -2\TP@absmargin % narrower content + \fi + \hbox to \@tempdimb\bgroup + \hskip\TP@absmargin\vbox\bgroup + \textwidth\hsize \columnwidth\hsize \linewidth\hsize \fi - \leftskip=\TP@absmargin - \rightskip=\TP@absmargin - \vskip \TP@absmargin - \textwidth\hsize \columnwidth\hsize \linewidth\hsize } % \end{macrocode} % \end{macro} @@ -1071,7 +1111,14 @@ located at that point, rather than the top-left corner. % value of this margin. % \begin{macrocode} \def\TP@commonendtextblock{% - \vskip \TP@absmargin + \ifdim\TP@margin = 0pt + \relax + \else + \egroup % end of inner vbox + \hskip\TP@absmargin + \egroup % end of inner hbox + \vskip \TP@absmargin + \fi \ifTPshowboxes \vskip-\TPboxrulesize {\color{\TP@rulecolour}\hrule depth 0pt height \TPboxrulesize}% diff --git a/Master/texmf-dist/tex/latex/textpos/textpos.sty b/Master/texmf-dist/tex/latex/textpos/textpos.sty index 559932ffc10..67de86e0372 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-6 Norman Gray. +%% This software is copyright, 1999, 2001--2003, 2005--7 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.11 2006/09/04 10:13:51 norman Exp $ +%%% Source: $Id: textpos.dtx.in,v 1.13 2007/03/21 20:37:33 norman Exp $ %% %%\def\ParseRCSDate$#1: #2 #3 ${\def\TP@Date{#2}} -%%\ParseRCSDate$Date: 2006/09/04 10:13:51 $ +%%\ParseRCSDate$Date: 2007/03/21 20:37:33 $ \def\filename{textpos} -\def\fileversion{1.7a} -\def\filedate{2006/09/02} -\def\docdate{2006 September 2} +\def\fileversion{1.7b} +\def\filedate{2007/03/21} +\def\docdate{2007 March 21} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{textpos}[\filedate\space v\fileversion] \typeout{Package: `textpos' \fileversion\space<\docdate>} @@ -215,20 +215,35 @@ {\color{\TP@rulecolour}\hrule height0pt depth \TPboxrulesize }% \vskip-\TPboxrulesize \fi - \hsize=\@tempdima - \ifdim\TP@margin < 0pt - \advance\hsize by 2\TP@absmargin % bigger box + \ifdim\TP@margin = 0pt + \hsize=\@tempdima + \textwidth\hsize \columnwidth\hsize \linewidth\hsize + \else + \vskip\TP@absmargin + \@tempdimb=\@tempdima % \@tempdimb is outer box width + \hsize=\@tempdima % \hsize is inner box width + \ifdim\TP@margin < 0pt + \advance\@tempdimb by 2\TP@absmargin % bigger box + \else + \advance\hsize by -2\TP@absmargin % narrower content + \fi + \hbox to \@tempdimb\bgroup + \hskip\TP@absmargin\vbox\bgroup + \textwidth\hsize \columnwidth\hsize \linewidth\hsize \fi - \leftskip=\TP@absmargin - \rightskip=\TP@absmargin - \vskip \TP@absmargin - \textwidth\hsize \columnwidth\hsize \linewidth\hsize } \def\endtextblock{\global\@tempswatrue\TP@commonendtextblock} \@namedef{endtextblock*}{\global\@tempswafalse\TP@commonendtextblock} \newdimen\TP@prevdepth \def\TP@commonendtextblock{% - \vskip \TP@absmargin + \ifdim\TP@margin = 0pt + \relax + \else + \egroup % end of inner vbox + \hskip\TP@absmargin + \egroup % end of inner hbox + \vskip \TP@absmargin + \fi \ifTPshowboxes \vskip-\TPboxrulesize {\color{\TP@rulecolour}\hrule depth 0pt height \TPboxrulesize}% diff --git a/Master/texmf-dist/tpm/textpos.tpm b/Master/texmf-dist/tpm/textpos.tpm index 184802f6380..cc78ca4bc89 100644 --- a/Master/texmf-dist/tpm/textpos.tpm +++ b/Master/texmf-dist/tpm/textpos.tpm @@ -3,7 +3,7 @@ textpos Package - 2006/09/04 23:14:57 + 2007/04/03 00:15:44 1.5b rahtz Place boxes at absolute positions. @@ -17,14 +17,14 @@ conference posters, for example. 198494 - + texmf-dist/tex/latex/textpos/textpos.sty texmf-dist/tpm/textpos.tpm - + texmf-dist/doc/latex/textpos/LICENCE texmf-dist/doc/latex/textpos/README -texmf-dist/doc/latex/textpos/VERSION-1.7a +texmf-dist/doc/latex/textpos/VERSION-1.7b texmf-dist/doc/latex/textpos/examples/README texmf-dist/doc/latex/textpos/examples/t1.tex texmf-dist/doc/latex/textpos/examples/t2.tex @@ -39,7 +39,7 @@ texmf-dist/doc/latex/textpos/textpos-example.tex texmf-dist/doc/latex/textpos/textpos.html texmf-dist/doc/latex/textpos/textpos.pdf - + texmf-dist/source/latex/textpos/textpos.drv texmf-dist/source/latex/textpos/textpos.dtx texmf-dist/source/latex/textpos/textpos.ins diff --git a/Master/texmf/lists/textpos b/Master/texmf/lists/textpos index 548494b718b..6e39b26d770 100644 --- a/Master/texmf/lists/textpos +++ b/Master/texmf/lists/textpos @@ -1,6 +1,6 @@ texmf-dist/doc/latex/textpos/LICENCE texmf-dist/doc/latex/textpos/README -texmf-dist/doc/latex/textpos/VERSION-1.7a +texmf-dist/doc/latex/textpos/VERSION-1.7b texmf-dist/doc/latex/textpos/examples/README texmf-dist/doc/latex/textpos/examples/t1.tex texmf-dist/doc/latex/textpos/examples/t2.tex -- cgit v1.2.3