diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/VERSION-1.7f | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/VERSION-1.7g | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.pdf | bin | 15600 -> 38940 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.tex | 30 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/style.css | 83 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/textpos-example.tex | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/textpos.html | 9 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/textpos/textpos.pdf | bin | 165057 -> 230858 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/textpos/textpos.drv | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/textpos/textpos.dtx | 76 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/textpos/textpos.sty | 14 |
12 files changed, 148 insertions, 76 deletions
diff --git a/Master/texmf-dist/doc/latex/textpos/README b/Master/texmf-dist/doc/latex/textpos/README index 78980ec51d3..456a3edd573 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.7f +Version 1.7g 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.7f b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7f deleted file mode 100644 index 0ea16352345..00000000000 --- a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7f +++ /dev/null @@ -1 +0,0 @@ -textpos-1.7f, released 2009 May 28 diff --git a/Master/texmf-dist/doc/latex/textpos/VERSION-1.7g b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7g new file mode 100644 index 00000000000..fca4c08356f --- /dev/null +++ b/Master/texmf-dist/doc/latex/textpos/VERSION-1.7g @@ -0,0 +1 @@ +textpos-1.7g, released 2010 September 30 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 c4ee691524f..96359fa64e8 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/niepraschk-eso-pic.tex b/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.tex index 775941b990a..10be9ec8af9 100644 --- a/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.tex +++ b/Master/texmf-dist/doc/latex/textpos/niepraschk-eso-pic.tex @@ -1,11 +1,11 @@ -% Rolf Niepraschk <Rolf.Niepraschk@gmx.de>, 2009-10-10 +% Rolf Niepraschk, nieprasck@ptb.de, 2002-11-24 % A funny demo for `textpos' with a backgroundgrid from `eso-pic'. \documentclass[a4paper,draft]{article} -\usepackage[colorgrid,texcoord]{eso-pic}[2002/11/16] %\usepackage[absolute,showboxes]{textpos} \usepackage[absolute]{textpos} +\usepackage[colorgrid,texcoord]{eso-pic}[2002/11/16] \usepackage{calc} \newcommand\StartX{25mm} \newcommand\StartY{40mm} @@ -20,28 +20,28 @@ \begin{textblock*}{\Wi}(\StartX,\StartY)% \noindent\colorbox[rgb]{0,0,1}{% - \begin{minipage}[c][\Hi-2\fboxsep][c]{\linewidth-2\fboxsep}% + \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}% \centering\Huge\textbf{FOO}% \end{minipage}}% \end{textblock*} -\begin{textblock*}{\Wii}(\StartX,\StartY+20mm)% +\begin{textblock*}{\Wii}(\StartX,\StartY + 20mm)% \noindent\colorbox[rgb]{0,1,0}{% - \begin{minipage}[c][\Hii-2\fboxsep][c]{\linewidth-2\fboxsep}% + \begin{minipage}[c][\Hii - 2\fboxsep][c]{\linewidth - 2\fboxsep}% \centering\Huge\textbf{BAR}% \end{minipage}}% \end{textblock*} -\begin{textblock*}{\Wii}(\StartX+\Wi-\Wii,\StartY+20mm)% +\begin{textblock*}{\Wii}(\StartX + \Wi - \Wii,\StartY + 20mm)% \noindent\colorbox[rgb]{1,1,0}{% - \begin{minipage}[c][\Hii-2\fboxsep][c]{\linewidth-2\fboxsep}% + \begin{minipage}[c][\Hii - 2\fboxsep][c]{\linewidth - 2\fboxsep}% \centering\Huge\textbf{BAR}% \end{minipage}}% \end{textblock*} \begin{textblock*}{\Wi}(\StartX,\Wi)% \noindent\colorbox[rgb]{1,0,1}{% - \begin{minipage}[c][\Hi-2\fboxsep][c]{\linewidth-2\fboxsep}% + \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}% \centering\Huge\textbf{FOO}% \end{minipage}}% \end{textblock*} @@ -49,7 +49,7 @@ \begin{textblock*}{\Wiii}(75mm,70mm)% \setlength\fboxrule{2pt}% \noindent\fbox{% - \begin{minipage}{\linewidth-2\fboxsep-2\fboxrule}% + \begin{minipage}{\linewidth - 2\fboxsep - 2\fboxrule}% \Large\itshape Text Text Text Text Text Text Text Text Text Text @@ -64,22 +64,22 @@ \begin{textblock*}{\Wiii}(75mm,130mm)% \setlength\fboxrule{2pt}% \noindent\fbox{% - \begin{minipage}[c][\Hi-2\fboxsep-2\fboxrule]% - {\linewidth-2\fboxsep-2\fboxrule}% + \begin{minipage}[c][\Hi - 2\fboxsep - 2\fboxrule]% + {\linewidth - 2\fboxsep - 2\fboxrule}% \centering\Huge\textbf{\LaTeX} \end{minipage}}% \end{textblock*} -\begin{textblock*}{\Wi}(\StartX,\StartY+160mm)% +\begin{textblock*}{\Wi}(\StartX,\StartY + 160mm)% \noindent\colorbox[rgb]{0,1,1}{% - \begin{minipage}[c][\Hi-2\fboxsep][c]{\linewidth-2\fboxsep}% + \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}% \centering\Huge\textbf{FOOBAR}% \end{minipage}}% \end{textblock*} -\begin{textblock*}{\Wi}(\StartX,\StartY+200mm)% +\begin{textblock*}{\Wi}(\StartX,\StartY + 200mm)% \noindent\colorbox[rgb]{1,0,0}{% - \begin{minipage}[c][\Hi-2\fboxsep][c]{\linewidth-2\fboxsep}% + \begin{minipage}[c][\Hi - 2\fboxsep][c]{\linewidth - 2\fboxsep}% \centering\Huge\textbf{BAZ}% \end{minipage}}% \end{textblock*} diff --git a/Master/texmf-dist/doc/latex/textpos/style.css b/Master/texmf-dist/doc/latex/textpos/style.css index 922fb17dc57..b6ba3d05f1c 100644 --- a/Master/texmf-dist/doc/latex/textpos/style.css +++ b/Master/texmf-dist/doc/latex/textpos/style.css @@ -2,17 +2,76 @@ body { color: #333; background: white; margin-left: +30%; - margin-right: +20%; - padding: 0.5em; /* this will make a difference if I decide to - have the background a different colour */ + width: 50%; /* body is 50% of screen width */ + margin-right: auto; /* ie, 20% */ + 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; - font-size: 11pt; + /* 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%; } +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 */ +@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; } @@ -36,7 +95,7 @@ h1 { margin-left: -40%; margin-right: -5%; padding: 0.5em; - border: solid #666; + border: solid thin #666; text-align: right; } h2 { @@ -46,6 +105,11 @@ h2 { border-top: solid thin #666; clear: both; } + +h2.appendices { + margin-top: 10ex; + border-top: double medium #666; +} h3 { margin-left: -30%; float: left; @@ -91,8 +155,9 @@ img.smallimage { div.signature { margin-left: -40%; margin-right: -5%; + margin-top: 4ex; text-align: right; - border: solid #666; + border: solid thin #666; padding: 0.3em; clear: both; } @@ -100,9 +165,9 @@ div.signature { /* ============================================================ * Some other curiosities of my one-time formatting for web pages */ -pre.doc-history { +.doc-history { font-size: xx-small; - background #eee; + background: #eee; line-height: 100%; } diff --git a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex index 91d3ff1b1df..3f81cf9c4af 100644 --- a/Master/texmf-dist/doc/latex/textpos/textpos-example.tex +++ b/Master/texmf-dist/doc/latex/textpos/textpos-example.tex @@ -28,7 +28,6 @@ %% 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: @HGIDENT@ %% \documentclass{article} diff --git a/Master/texmf-dist/doc/latex/textpos/textpos.html b/Master/texmf-dist/doc/latex/textpos/textpos.html index 8f056c5d212..487c526a367 100644 --- a/Master/texmf-dist/doc/latex/textpos/textpos.html +++ b/Master/texmf-dist/doc/latex/textpos/textpos.html @@ -20,7 +20,7 @@ page.</p> <p>The textpos home page is at <a href='http://purl.org/nxg/dist/textpos' ><code>http://purl.org/nxg/dist/textpos</code></a></p> -<p>Version 1.7f, 2009 May 28.</p> +<p>Version 1.7g, 2010 September 30.</p> </div> <p>This package facilitates placing boxes at absolute positions on the @@ -51,6 +51,11 @@ material on the page.</p> <h3>History</h3> <dl> +<dt>1.7g, 2010 September 30</dt> +<dd>Bugfix: change the way we handle the {color} package not being +loaded -- replacement <code>\color</code> command is now robust. Also +adjusted documentation of reference points.</dd> + <dt>1.7f, 2009 May 28</dt> <dd>The change in behaviour introduced in v1.7e is now documented (it was unspecified before, and 1.7e didn't commit itself one way or the @@ -185,7 +190,7 @@ up-to-date versions available there.</p> <div class="signature"> <a href="http://nxg.me.uk" >Norman Gray</a><br /> -2009 May 28 +2010 September 30 </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 41b16f14df5..d48ca9de3f7 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 b4e38eaf756..d7469f6cbe1 100644 --- a/Master/texmf-dist/source/latex/textpos/textpos.drv +++ b/Master/texmf-dist/source/latex/textpos/textpos.drv @@ -28,12 +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 . %% -%%% Source: @HGIDENT@ %% \def\filename{textpos} -\def\fileversion{1.7f} -\def\filedate{2009/05/28} -\def\docdate{2009 May 28} +\def\fileversion{1.7g} +\def\filedate{2010/09/30} +\def\docdate{2010 September 30} \documentclass{ltxdoc} \title{Textpos: absolute positioning of text on the page} \author{Norman Gray\\(\texttt{http://nxg.me.uk})} diff --git a/Master/texmf-dist/source/latex/textpos/textpos.dtx b/Master/texmf-dist/source/latex/textpos/textpos.dtx index b2faedc0d2e..4f31405e049 100644 --- a/Master/texmf-dist/source/latex/textpos/textpos.dtx +++ b/Master/texmf-dist/source/latex/textpos/textpos.dtx @@ -24,13 +24,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 . %% -%<+package|driver|example>%%% Source: @HGIDENT@ %% %<*package|driver> \def\filename{textpos} -\def\fileversion{1.7f} -\def\filedate{2009/05/28} -\def\docdate{2009 May 28} +\def\fileversion{1.7g} +\def\filedate{2010/09/30} +\def\docdate{2010 September 30} %</package|driver> %<+package>\NeedsTeXFormat{LaTeX2e} %<+package>\ProvidesPackage{textpos}[\filedate\space v\fileversion] @@ -96,7 +95,7 @@ % % This package facilitates placing boxes at absolute positions on the % \LaTeX\ page. There are several reasons why this might be useful, but -% the reaason which originally motivated this package is to help produce a +% the reason which originally motivated this package is to help produce a % large-format conference poster. However the facility is also useful % for filling in forms or other special purpose layout. % @@ -158,7 +157,7 @@ % box \meta{hsize} modules wide, and placed on the page with its % upper left corner at the position (\textit{hpos,vpos}). As is % natural in \TeX, the \meta{vpos} parameter indicates distance -% \emph{down} from the reference point. +% \emph{down} from the `anchor point' (see below). % % The \Lenv{textblock} parameters may be whole numbers or % fractional. If you want or need to give explicit sizes here, see @@ -171,6 +170,33 @@ % environment, and whether or not this is sensible, it's not going to % change now. % +% This package works in two modes, relative and absolute. +% \marginpar{relative \& absolute mode} +% In the first one, the default, the block-positioning parameters in the +% \Lenv{textblock} envirionment are taken to be relative to an `anchor +% point' which is the current position on the page, that is, the place +% where (the bottom left of) a character would appear if it were typed +% at this point. This will be appropriate if you are +% laying out text within a \texttt{figure} environment or the like. +% In this mode, you will typically give several \Lenv{textblock} +% environments one after the other, so that they are all relative to +% the same point. +% +% If, however, your entire +% document is to be laid out piece by piece (which is the case in the +% canonical use of the package, to lay out a poster), then you might +% want to be more sure of where the origin is. In this case, you make +% the package work in its absolute mode, by invoking it with +% the \Lopt{absolute} option: |\usepackage[absolute]{textpos}|. +% In this mode, all the block-positioning parameters are given +% relative to a single origin on the page. By default, this `anchor point' is the +% top-left corner of the page, but you may change it with the +% command \cmd|\textblockorigin{<hpos>}{<vpos>}|. +% Here \meta{hpos} and \meta{vpos} are dimensions such as `10mm', +% relative to the top-left corner of the paper. You may use this +% command only if the package was invoked with the \Lopt{absolute} +% option. See also section~\ref{absolute-newpage}. +% % The textblocks are placed on the page in the order in which they % appear in the file. This means that later textblocks will be placed % on top of earlier ones, which may matter if one or other contains, @@ -219,7 +245,7 @@ % \end{quote} % The coordinates \meta{ho} and \meta{vo} are fractions of the % width and height of the text box, respectively, and state that the -% box is to be placed so that the +% box is to be placed so that the reference % point (\meta{ho},\meta{vo}) within the box is to be placed at the point % (\meta{hpos},\meta{vpos}) on the page. The default specification is % [0,0], the top left of the box: [0,1] would be the bottom left, and @@ -285,30 +311,6 @@ % being overprinted), so you can (and typically will) use several of % the environments in a row to scatter text all over the page. % -% This package works in two modes, relative and absolute. In the -% first one, the default, the block-positioning parameters in the -% \Lenv{textblock} envirionment are taken to be relative to the -% current position on the page. This will be appropriate if you are -% laying out text within a \texttt{figure} environment or the like. -% In this mode, you will typically give several \Lenv{textblock} -% environments one after the other, so that they are all relative to -% the same point. -% -% If, however, your entire -% document is to be laid out piece by piece (which is the case in the -% canonical use of the package, to lay out a poster), then you might -% want to be more sure of where the origin is. In this case, you make -% the package work in its absolute mode, by invoking it with -% the \Lopt{absolute} option: |\usepackage[absolute]{textpos}|. -% In this mode, all the block-positioning parameters are given -% relative to a single origin on the page. By default, this is the -% top-left corner of the page, but you may change it with the -% command \cmd|\textblockorigin{<hpos>}{<vpos>}|. -% Here \meta{hpos} and \meta{vpos} are dimensions such as `10mm', -% relative to the top-left corner of the paper. You may use this -% command only if the package was invoked with the \Lopt{absolute} -% option. See also section~\ref{absolute-newpage}. -% % The package is compatible with the \pstyle{calc} package, so that % you may use calc-style expressions when specifying lengths. Thus % \begin{quote} @@ -559,6 +561,11 @@ % slides start at a consistent point, you can fairly happily use Textpos in % relative mode as long as the \Lenv{textblock} environment is the % first thing on the slide. +% \marginpar{\dots \& beamer} +% The same appears to be true with the beamer package. Indeed +% \emph{anything} doing things at |\shipout| time (which includes +% Textpos in absolute mode) is going to be in a precarious position +% with respect ot 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 @@ -773,8 +780,7 @@ located at that point, rather than the top-left corner. \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?}} + {You're using textpos because you _don't_ want things to float around, yes?}} % \end{macrocode} % % \subsection{The box handling starts here} @@ -1017,8 +1023,8 @@ located at that point, rather than the top-left corner. % we use. % \begin{macrocode} \@ifundefined{color}% - {\gdef\color#1{}% - \gdef\color@block#1#2#3{}% + {\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 }{} % % \begin{macro}{\textblock} diff --git a/Master/texmf-dist/tex/latex/textpos/textpos.sty b/Master/texmf-dist/tex/latex/textpos/textpos.sty index e8c0f34d251..20d6a6d4288 100644 --- a/Master/texmf-dist/tex/latex/textpos/textpos.sty +++ b/Master/texmf-dist/tex/latex/textpos/textpos.sty @@ -28,12 +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 . %% -%%% Source: @HGIDENT@ %% \def\filename{textpos} -\def\fileversion{1.7f} -\def\filedate{2009/05/28} -\def\docdate{2009 May 28} +\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>} @@ -67,8 +66,7 @@ \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?}} + {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 @@ -175,8 +173,8 @@ \let\textblockrulecolor\textblockrulecolour \let\tekstblokroolkulur\textblockrulecolour \@ifundefined{color}% - {\gdef\color#1{}% - \gdef\color@block#1#2#3{}% + {\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\textblock#1{% \@tempdima=#1\TPHorizModule |