diff options
| author | Karl Berry <karl@freefriends.org> | 2014-11-13 23:57:15 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2014-11-13 23:57:15 +0000 |
| commit | 3e547f01cff20101db9b8b4b211fcf7adfe7191f (patch) | |
| tree | 7862f83e052a0d1a178eaf30a08678eb901c39e3 | |
| parent | e0056016e425d97e79d80fdee01acf4cd84c1d8d (diff) | |
latex2e (13nov14)
git-svn-id: svn://tug.org/texlive/trunk@35577 c570f23f-e606-0410-a88d-b1316a301751
43 files changed, 153 insertions, 99 deletions
diff --git a/Master/texmf-dist/doc/latex/base/00readme.txt b/Master/texmf-dist/doc/latex/base/README index ebd0c29c6cf..ebd0c29c6cf 100644 --- a/Master/texmf-dist/doc/latex/base/00readme.txt +++ b/Master/texmf-dist/doc/latex/base/README diff --git a/Master/texmf-dist/doc/latex/cyrillic/00readme.txt b/Master/texmf-dist/doc/latex/cyrillic/README index 10cb13ad94d..10cb13ad94d 100644 --- a/Master/texmf-dist/doc/latex/cyrillic/00readme.txt +++ b/Master/texmf-dist/doc/latex/cyrillic/README diff --git a/Master/texmf-dist/doc/latex/graphics/00readme.txt b/Master/texmf-dist/doc/latex/graphics/README index 749201fe743..1902f86a75c 100644 --- a/Master/texmf-dist/doc/latex/graphics/00readme.txt +++ b/Master/texmf-dist/doc/latex/graphics/README @@ -1,4 +1,6 @@ %% +%% Copyright 1993-2014 LaTeX Project +%% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% %% This file, and all the other files in this bundle as listed below, @@ -16,7 +18,7 @@ The LaTeX Colour and Graphics Packages ======================================== - 2005/12/01 + This is a collection of LaTeX packages for: * producing colour @@ -99,7 +101,7 @@ NOTE (docstrip version) **** docstrip.tex. It must be at least version 2.4. **** **** A suitable docstrip.tex may be found from `CTAN' archives such as -**** ftp.dante.de tex-archive/macros/latex/unpacked/docstrip.tex +**** http://www.ctan.org/tex-archive/macros/latex/unpacked/docstrip.tex **** **** Docstrip is part of the base LaTeX distribution, so if you have **** an old docstrip then your LaTeX is out of date and you may consider @@ -124,15 +126,6 @@ latex grfguide.tex. ============================================== -MAIN CHANGES IN THIS RELEASE -============================ - -dvipdfmx and XeTeX support added. -Not all driver support files are included in since often more current -versions are available from their developers. -Removed pstcol.sty (now part of the pstricks distribution). - -============================================== diff --git a/Master/texmf-dist/doc/latex/graphics/changes.txt b/Master/texmf-dist/doc/latex/graphics/changes.txt index c8d0a38c728..0269bcffe8d 100644 --- a/Master/texmf-dist/doc/latex/graphics/changes.txt +++ b/Master/texmf-dist/doc/latex/graphics/changes.txt @@ -4,6 +4,20 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +2014-11-07 Joseph Wright <latex-bugs@latex-project.org> + + * Rename 00readme.txt to README (named README.txt in the development + repository) + +2014-10-28 <Frank.Mittelbach@latex-project.org> + + * drivers.dtx, graphics.dtx, graphicx.dtx, keyval.dtx, trig.dtx: + Fixed typos in documentation found by Karl Berry. + +2014-10-14 <Frank.Mittelbach@latex-project.org> + + * graphics.dtx: Fixed typo in error message. + 2014-05-08 David Carlisle <david.carlisle@latex-project.org> * keyval.dtx: Revert change to {} parsing. diff --git a/Master/texmf-dist/doc/latex/graphics/color.pdf b/Master/texmf-dist/doc/latex/graphics/color.pdf Binary files differindex b80b5f347af..40258d255e3 100644 --- a/Master/texmf-dist/doc/latex/graphics/color.pdf +++ b/Master/texmf-dist/doc/latex/graphics/color.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/drivers.pdf b/Master/texmf-dist/doc/latex/graphics/drivers.pdf Binary files differindex 503a8281817..bb0d40345e0 100644 --- a/Master/texmf-dist/doc/latex/graphics/drivers.pdf +++ b/Master/texmf-dist/doc/latex/graphics/drivers.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/epsfig.pdf b/Master/texmf-dist/doc/latex/graphics/epsfig.pdf Binary files differindex 727d6f69834..25d28102d76 100644 --- a/Master/texmf-dist/doc/latex/graphics/epsfig.pdf +++ b/Master/texmf-dist/doc/latex/graphics/epsfig.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/graphics.pdf b/Master/texmf-dist/doc/latex/graphics/graphics.pdf Binary files differindex 47fe183e5c6..9e8408e6643 100644 --- a/Master/texmf-dist/doc/latex/graphics/graphics.pdf +++ b/Master/texmf-dist/doc/latex/graphics/graphics.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/graphicx.pdf b/Master/texmf-dist/doc/latex/graphics/graphicx.pdf Binary files differindex a1726b35dbf..956bd2e7086 100644 --- a/Master/texmf-dist/doc/latex/graphics/graphicx.pdf +++ b/Master/texmf-dist/doc/latex/graphics/graphicx.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/grfguide.pdf b/Master/texmf-dist/doc/latex/graphics/grfguide.pdf Binary files differindex d97f6ade00e..765ed3f1e45 100644 --- a/Master/texmf-dist/doc/latex/graphics/grfguide.pdf +++ b/Master/texmf-dist/doc/latex/graphics/grfguide.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/keyval.pdf b/Master/texmf-dist/doc/latex/graphics/keyval.pdf Binary files differindex 7dc3d7267e3..5bda4aa9cec 100644 --- a/Master/texmf-dist/doc/latex/graphics/keyval.pdf +++ b/Master/texmf-dist/doc/latex/graphics/keyval.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/lscape.pdf b/Master/texmf-dist/doc/latex/graphics/lscape.pdf Binary files differindex c9e5056e10e..5726fe8eb22 100644 --- a/Master/texmf-dist/doc/latex/graphics/lscape.pdf +++ b/Master/texmf-dist/doc/latex/graphics/lscape.pdf diff --git a/Master/texmf-dist/doc/latex/graphics/trig.pdf b/Master/texmf-dist/doc/latex/graphics/trig.pdf Binary files differindex 9235790a2db..99efe928c28 100644 --- a/Master/texmf-dist/doc/latex/graphics/trig.pdf +++ b/Master/texmf-dist/doc/latex/graphics/trig.pdf diff --git a/Master/texmf-dist/doc/latex/latex-tds/README b/Master/texmf-dist/doc/latex/latex-tds/README index 542251bcdf1..e44f39c4bbf 100644 --- a/Master/texmf-dist/doc/latex/latex-tds/README +++ b/Master/texmf-dist/doc/latex/latex-tds/README @@ -3,7 +3,7 @@ README for project latex-tds ============================ Heiko Oberdiek -2014/11/03 +2014/11/12 Table of Contents @@ -46,7 +46,7 @@ navigation support using bookmarks and links). Version: - 2014/11/03 + 2014/11/12 Author: @@ -125,7 +125,7 @@ amslatex ftp://ftp.ams.org/pub/tex/amsrefs/amsrefs.zip ftp://ftp.ams.org/pub/tex/amscls.zip ftp://ftp.ams.org/pub/tex/amsmath.zip - http://tug.org/~karl/amsbooka.zip + patch/amsbooka.zip amsfonts @@ -394,6 +394,8 @@ tex/tools.tex master file for tools overview, generated by the Diff/patch file Patched file +patch/amsbooka.zip amslatex/amsbooka.* + patch/amsclass.dtx.diff amslatex/amsclass.dtx patch/amsfndoc.def.diff amsfonts/amsfndoc.def @@ -932,5 +934,14 @@ wants to build the modules himself: □ Module tools: Update (2014-10-28). +2014/11/12 + □ Module graphics: Update (2014-11-07). + + □ Modules base, cyrillic, graphics, tools: 00readme.txt renamed to + README. + + □ Module amslatex: Missing amsbooka.zip added to directory patch (until + it is resolved at the AMS side). + ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -Last updated 2014-11-03 18:10:45 EST +Last updated 2014-11-11 22:53:51 CET diff --git a/Master/texmf-dist/doc/latex/latex-tds/README.html b/Master/texmf-dist/doc/latex/latex-tds/README.html index 9495b1434c0..2241a1950fa 100644 --- a/Master/texmf-dist/doc/latex/latex-tds/README.html +++ b/Master/texmf-dist/doc/latex/latex-tds/README.html @@ -736,13 +736,13 @@ asciidoc.install(2); /*]]>*/ </script> <meta name="author" content="Heiko Oberdiek" /> -<meta name="date" content="2014-11-03" /> +<meta name="date" content="2014-11-11" /> </head> <body class="article"> <div id="header"> <h1>README for project latex-tds</h1> <span id="author">Heiko Oberdiek</span><br /> -<span id="revdate">2014/11/03</span> +<span id="revdate">2014/11/12</span> <div id="toc"> <div id="toctitle">Table of Contents</div> <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript> @@ -764,7 +764,7 @@ Version: </dt> <dd> <p> - 2014/11/03 + 2014/11/12 </p> </dd> <dt class="hdlist1"> @@ -885,7 +885,7 @@ In the following I will use the term ‘module’ for a package bundle.< <a href="ftp://ftp.ams.org/pub/tex/amsrefs/amsrefs.zip">ftp://ftp.ams.org/pub/tex/amsrefs/amsrefs.zip</a><br /> <a href="ftp://ftp.ams.org/pub/tex/amscls.zip">ftp://ftp.ams.org/pub/tex/amscls.zip</a><br /> <a href="ftp://ftp.ams.org/pub/tex/amsmath.zip">ftp://ftp.ams.org/pub/tex/amsmath.zip</a><br /> - <a href="http://tug.org/~karl/amsbooka.zip">http://tug.org/~karl/amsbooka.zip</a> + patch/amsbooka.zip </p> </dd> <dt class="hdlist1"> @@ -1391,6 +1391,10 @@ cellspacing="0" cellpadding="4"> </thead> <tbody> <tr> +<td align="left" valign="top"><div class="literal"><pre><tt>patch/amsbooka.zip </tt></pre></div></td> +<td align="left" valign="top"><div class="literal"><pre><tt>amslatex/amsbooka.*</tt></pre></div></td> +</tr> +<tr> <td align="left" valign="top"><div class="literal"><pre><tt>patch/amsclass.dtx.diff </tt></pre></div></td> <td align="left" valign="top"><div class="literal"><pre><tt>amslatex/amsclass.dtx</tt></pre></div></td> </tr> @@ -2855,6 +2859,30 @@ Module tools: Update (2014-10-28). </li> </ul></div> </dd> +<dt class="hdlist1"> +2014/11/12 +</dt> +<dd> +<div class="ulist"><ul> +<li> +<p> +Module graphics: Update (2014-11-07). +</p> +</li> +<li> +<p> +Modules base, cyrillic, graphics, tools: + <tt>00readme.txt</tt> renamed to <tt>README</tt>. +</p> +</li> +<li> +<p> +Module amslatex: Missing <tt>amsbooka.zip</tt> added to directory <tt>patch</tt> + (until it is resolved at the AMS side). +</p> +</li> +</ul></div> +</dd> </dl></div> </div> </div> @@ -2862,7 +2890,7 @@ Module tools: Update (2014-10-28). <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-11-03 18:10:45 EST +Last updated 2014-11-11 22:53:51 CET </div> </div> </body> diff --git a/Master/texmf-dist/doc/latex/latex-tds/README.pdf b/Master/texmf-dist/doc/latex/latex-tds/README.pdf Binary files differindex fc271ff4ac4..f0d1e773450 100644 --- a/Master/texmf-dist/doc/latex/latex-tds/README.pdf +++ b/Master/texmf-dist/doc/latex/latex-tds/README.pdf diff --git a/Master/texmf-dist/doc/latex/tools/00readme.txt b/Master/texmf-dist/doc/latex/tools/README index 791bf798154..791bf798154 100644 --- a/Master/texmf-dist/doc/latex/tools/00readme.txt +++ b/Master/texmf-dist/doc/latex/tools/README diff --git a/Master/texmf-dist/source/latex/graphics/color.dtx b/Master/texmf-dist/source/latex/graphics/color.dtx index 7a545b98fd5..3bda58eba4f 100644 --- a/Master/texmf-dist/source/latex/graphics/color.dtx +++ b/Master/texmf-dist/source/latex/graphics/color.dtx @@ -2,7 +2,7 @@ % \iffalse % %% color.dtx Copyright (C) 1994--1999 David Carlisle -%% Copyright (C) 2005 David Carlisle, LaTeX3 Project +%% Copyright (C) 2005--2014 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -19,7 +19,7 @@ %<driver> \ProvidesFile{color.drv} % \fi % \ProvidesFile{color.dtx} - [2014/04/23 v1.1a Standard LaTeX Color (DPC)] + [2014/10/28 v1.1a Standard LaTeX Color (DPC)] % % \iffalse %<*driver> @@ -91,7 +91,7 @@ % \end{macrocode} % % \begin{macro}{\Gin@driver} -% Initalise the macro to hold the driver file name. +% Initialize the macro to hold the driver file name. % \begin{macrocode} \providecommand\Gin@driver{} % \end{macrocode} @@ -146,7 +146,7 @@ % % \begin{option}{dvips} % \begin{option}{xdvi} -% Tom Rokicki's dvips driver, and the X Windows previer, xdvi which uses +% Tom Rokicki's dvips driver, and the X Windows previewer, xdvi which uses % (a subset of) the same |\specials|. % \begin{macrocode} \DeclareOption{dvips}{\def\Gin@driver{dvips.def}% @@ -331,7 +331,7 @@ % The |usenames| option modifies the behaviour of |\DefineNamedColor| % So that it declares the same name as a ```user's colour'' for use in % a |\color| command, as well as a name in the |named| colour model. -% The normal behaviour is just to decalare the name in the named colour +% The normal behaviour is just to declare the name in the named colour % model. % \begin{macrocode} \let\c@lor@usename\@gobble @@ -682,7 +682,7 @@ % \section{Higher Level Commands} % % With the basic colour primitives specified above we may define a few -% higer level commands for coloured boxes etc. This is still quite a low +% higher level commands for coloured boxes etc. This is still quite a low % level and presumably packages and classes making use of colour will % define more appropriate document-level commands. % @@ -771,7 +771,7 @@ % % \section{Extra Groups} % Turning on extra groups in the standard \LaTeX\ commands, so that -% colour commands are scoped corectly. +% colour commands are scoped correctly. % % Like |\normalcolor|, the following five commands are defined in the % kernel, with empty definitions (|\relax|). This means that they can @@ -813,7 +813,7 @@ % of groups of text in vertical `par' mode, but doesn't do any harm in % horizontal `LR' contexts. % \changes{v0.2d}{1994/05/13} -% {New definition, was previously just \cs{endroup}} +% {New definition, was previously just \cs{endgroup}} % \begin{macrocode} \def\color@endgroup{\endgraf\endgroup} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/graphics/drivers.dtx b/Master/texmf-dist/source/latex/graphics/drivers.dtx index 095e06920b1..31ed1284962 100644 --- a/Master/texmf-dist/source/latex/graphics/drivers.dtx +++ b/Master/texmf-dist/source/latex/graphics/drivers.dtx @@ -36,7 +36,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{drivers.dtx} %</driver> - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] % %<*driver> \documentclass{ltxdoc} @@ -84,8 +84,8 @@ % \item color1: `dvips' style colour specials. % \item color2: `textures' style colour specials. % \item color3: Colour implemented via literal PostScript specials. -% \item color4: Colour implemented by specials that only support RGB -% ie Red Green Blue specified as integers in the range +% \item color4: Colour implemented by specials that only support RGB, +% i.e., Red Green Blue specified as integers in the range % 0--255. Other models converted to this within \TeX. % \end{itemize} % Some drivers do not use any of these modules and have their own code. @@ -1347,7 +1347,7 @@ please rename the file to .eps file extension.^^J% %</ln> % \end{macrocode} % -% \section{trutex} +% \section{truetex} % A \LaTeXe\ graphics driver file for Kinch `truetex' driver. % \begin{macrocode} %<*truetex> @@ -1533,7 +1533,7 @@ please rename the file to .eps file extension.^^J% % % .ps .PS .eps .EPS are (E)PS % rest are `bmp' which is a catch all type for anything -% that the inport filter can handle. +% that the import filter can handle. % \begin{macrocode} \@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}} \@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}} diff --git a/Master/texmf-dist/source/latex/graphics/graphics.dtx b/Master/texmf-dist/source/latex/graphics/graphics.dtx index ab2f34066f1..39d0d4575f1 100644 --- a/Master/texmf-dist/source/latex/graphics/graphics.dtx +++ b/Master/texmf-dist/source/latex/graphics/graphics.dtx @@ -4,7 +4,7 @@ %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995--1999 2001 David Carlisle %% Copyright (C) 2005--2006 David Carlisle, LaTeX3 Project -%% Copyright (C) 2009 LaTeX3 Project +%% Copyright (C) 2009-2014 LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -21,7 +21,7 @@ %<driver> \ProvidesFile{graphics.drv} % \fi % \ProvidesFile{graphics.dtx} - [2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR)] + [2014/10/28 v1.0p Standard LaTeX Graphics (DPC,SPQR)] % % \iffalse %<*driver> @@ -142,10 +142,10 @@ % will be determined by reading an external file as described below. % If \oarg{urx,ury} is present, then it should specify the coordinates % of the top right corner of the image, as a pair of \TeX\ dimensions. -% If the units are ommited they default to |bp|. So |[1in,1in]| and +% If the units are omitted they default to |bp|. So |[1in,1in]| and % |[72,72]| are equivalent. If only one optional argument appears, the % lower left corner of the image is assumed to be at |[0,0]|. Otherwise -% \oarg{llx,lly} may be used to specify the cordinates of this point. +% \oarg{llx,lly} may be used to specify the coordinates of this point. % % \DescribeMacro % \graphicspath\marg{dir-list}\\ @@ -211,7 +211,7 @@ % info, and the size must be specified in the arguments of % |\includegraphics|. As a special case |*| may be used to denote the % same extension as the graphic file. This is mainly of use in -% conjuction with using |*| as the extension, as in that case the +% conjunction with using |*| as the extension, as in that case the % particular graphic extension is not known. For example %\begin{verbatim} % \DeclareGraphicsRule{*}{eps}{*}{} @@ -525,7 +525,7 @@ % \changes{v0.3g}{1994/03/15} % {Use dvips def file not development version} % \begin{option}{xdvi} -% Tomas Rockiki's PostScript driver (unix, MSDOS, VMS\ldots). +% Tomas Rockicki's PostScript driver (unix, MSDOS, VMS\ldots). % The |X11| previewer |xdvi| supports basically the same set of % |\specials|. % \begin{macrocode} @@ -857,9 +857,9 @@ % \end{macro} % % \begin{macro}{\Gin@iii} -% Set the cordinates of the {\bfseries l}lower {\bfseries l}eft corner, -% and the cordinates of the {\bfseries u}pper {\bfseries r}ight -% corner. The cordinates may be any \TeX\ dimension, defaulting to |bp|. +% Set the coordinates of the {\bfseries l}lower {\bfseries l}eft corner, +% and the coordinates of the {\bfseries u}pper {\bfseries r}ight +% corner. The coordinates may be any \TeX\ dimension, defaulting to |bp|. % \changes{v0.6c}{1994/12/15} % {(Denis Roegel) Extra group to keep bb settings local} % \begin{macrocode} @@ -883,7 +883,7 @@ % and if a unit is supplied, converts to `bp' and stores the value in % |#1|. If a unit is not supplied `bp' is assumed, and |#2| is directly % stored in |#1|. Note that supplying `bp' is not quite the same as -% supplying no units, as in the former case a convertion via `pt' and +% supplying no units, as in the former case a conversion via `pt' and % back to `bp' takes place which can introduce rounding error. The error % is invisibly small but files conforming to Adobe DSC should have % \emph{integer} Bounding Box Coordinates, and conceivably some drivers @@ -1098,7 +1098,7 @@ % \begin{macrocode} \Gin@viewport@code % \end{macrocode} -% Save the natural size, and then call |\Gin@req@sizes| whic (in the +% Save the natural size, and then call |\Gin@req@sizes| which (in the % key-val interface) will calculate the required size from the natural % size, and any scaling info. % \begin{macrocode} @@ -1195,6 +1195,7 @@ % \end{macro} % % \begin{macro}{\Gin@nosize} +% \changes{v1.0p}{2014/10/14}{Fixed typo in error message} % \changes{v0.7f}{1995/11/10} % {Macro added} % This command is called in the case that the graphics type @@ -1203,7 +1204,7 @@ % \begin{macrocode} \def\Gin@nosize#1{% \@latex@error - {Cannot determine size of graphic in #1 (no size specifed)}% + {Cannot determine size of graphic in #1 (no size specified)}% \@ehc} % \end{macrocode} % \end{macro} @@ -1443,7 +1444,7 @@ % box. % We define two formulae (as \TeX\ macros) to work out the $x$ and $y$ % coordinates of vertices of the rotated box -% in relation to its original coordinates (ie its width, height +% in relation to its original coordinates (i.e., its width, height % and depth). The box we visualize with vertices $B$, $C$, % $D$ and $E$ is illustrated below. The vertex % $S$ is the reference point on the baseline. $O$ is the centre of diff --git a/Master/texmf-dist/source/latex/graphics/graphics.ins b/Master/texmf-dist/source/latex/graphics/graphics.ins index 00c5fcded17..07ec8df03dc 100644 --- a/Master/texmf-dist/source/latex/graphics/graphics.ins +++ b/Master/texmf-dist/source/latex/graphics/graphics.ins @@ -6,12 +6,8 @@ %% %% This file has the LPPL maintenance status "maintained". -% This file requires docstrip version 2.4 available from -% ftp.dante.de tex-archive/macros/latex/unpacked/docstrip.tex - \input docstrip - \preamble \endpreamble diff --git a/Master/texmf-dist/source/latex/graphics/graphicx.dtx b/Master/texmf-dist/source/latex/graphics/graphicx.dtx index e611eb6ceb5..94aceb4691e 100644 --- a/Master/texmf-dist/source/latex/graphics/graphicx.dtx +++ b/Master/texmf-dist/source/latex/graphics/graphicx.dtx @@ -17,7 +17,7 @@ %<driver> \ProvidesFile{graphicx.drv} % \fi % \ProvidesFile{graphicx.dtx} - [2014/04/25 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)] + [2014/10/28 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)] % % \iffalse %<*driver> @@ -141,7 +141,7 @@ % \item[width] Required width, a dimension (default units |bp|). The % graphic will be scaled to make the width the specified dimension. % \item[height] Required height. a dimension (default units |bp|). -% \item[totalheight] Required totalheight (ie height $+$ depth). a +% \item[totalheight] Required totalheight (i.e., height $+$ depth). a % dimension (default units |bp|). Most useful after a rotation (when the % height might be zero). % \item[keepaspectratio] Boolean valued key (like |clip|). If it is set @@ -194,7 +194,7 @@ % |origin|. |x=|\meta{dimen}|,y=|\meta{dimen} The $x,y$ coordinate of % the centre of rotation. As usual |\height| etc may be used. % \item[units] Specify the units used in the main argument. eg -% |units=-360| would mean that the argument refered to degrees +% |units=-360| would mean that the argument referred to degrees % \emph{clockwise} instead of the default anti-clockwise rotation. % \end{description} % @@ -339,7 +339,7 @@ % % \begin{macro}{\Gin@viewport} % \changes{v1.0c}{1996/10/31}{Original bb saved} -% If a viewport is specified, reset the bounding box cordinates +% If a viewport is specified, reset the bounding box coordinates % by adding the original origin, |\Gin@llx|, |\Gin@lly| to the new % values specified as the viewport. The original Bounding box % coordinates are saved in |\Gin@ollx|\ldots\ some drivers @@ -363,7 +363,7 @@ % % \begin{macro}{\Gin@trim} % \changes{v1.0c}{1996/10/31}{Original bb saved} -% If a trim is specified, reset the bounding box cordinates +% If a trim is specified, reset the bounding box coordinates % by trimming the four specified values off each side of the % graphic. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/graphics/keyval.dtx b/Master/texmf-dist/source/latex/graphics/keyval.dtx index 864e2c08380..ca7275ef13c 100644 --- a/Master/texmf-dist/source/latex/graphics/keyval.dtx +++ b/Master/texmf-dist/source/latex/graphics/keyval.dtx @@ -17,7 +17,7 @@ %<driver> \ProvidesFile{keyval.drv} % \fi % \ProvidesFile{keyval.dtx} - [2014/05/08 v1.15 key=value parser (DPC)] + [2014/10/28 v1.15 key=value parser (DPC)] % % \iffalse %</!plain> @@ -133,7 +133,7 @@ % and |clip|. Except for the last, they must all be given a value if % used. % -% Note how in the following, any white space arround |=| or |,| is +% Note how in the following, any white space around |=| or |,| is % ignored, as are the `empty' arguments caused by extra commas. Note % also that each macro receives \emph{exactly} the tokens that you % specify as arguments, no premature expansion is done. @@ -325,7 +325,7 @@ % groups that surround the entire value, so |{abcd}| \emph{is} treated % correctly as |abcd|. Prior to v1.14, two levels of bracing are removed, if % you require the entire argument to be a single brace group, you had -% use |{{{abcd}}}|, fron v1.14 exactly one brace grup is removed, so to make +% use |{{{abcd}}}|, from v1.14 exactly one brace group is removed, so to make % the entire value be a brace group you need |{{abc}}|. % % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/graphics/trig.dtx b/Master/texmf-dist/source/latex/graphics/trig.dtx index 05101136910..8fc2c845cdb 100644 --- a/Master/texmf-dist/source/latex/graphics/trig.dtx +++ b/Master/texmf-dist/source/latex/graphics/trig.dtx @@ -49,7 +49,7 @@ % % These macros implement the trigonometric functions, sin, cos and tan. % In each case two commands are defined. For instance the command -% |\CalculateSin{33}| may be isued at some point, and then anywhere +% |\CalculateSin{33}| may be issued at some point, and then anywhere % later in the document, the command |\UseSin{33}| will return the % decimal expansion of $\sin(33^\circ)$. % @@ -208,7 +208,7 @@ % \end{macro} % % \begin{macro}{\TG@reduce} -% Repeatedly use one of the the relatations +% Repeatedly use one of the the relations % $\sin(x)=\sin(180-x)=\sin(-180-x)$ to get $x$ in the range $-90 \leq % x\leq 90$. Then call |\TG@series|. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/latex-tds/README.asciidoc b/Master/texmf-dist/source/latex/latex-tds/README.asciidoc index 3e5ba1db78b..f1d77f5b151 100644 --- a/Master/texmf-dist/source/latex/latex-tds/README.asciidoc +++ b/Master/texmf-dist/source/latex/latex-tds/README.asciidoc @@ -1,7 +1,7 @@ README for project latex-tds ============================ :author: Heiko Oberdiek -:revdate: 2014/11/03 +:revdate: 2014/11/12 :lang: en :toc: :numbered: @@ -87,7 +87,7 @@ The link addresses are the sources for the modules. ftp://ftp.ams.org/pub/tex/amsrefs/amsrefs.zip + ftp://ftp.ams.org/pub/tex/amscls.zip + ftp://ftp.ams.org/pub/tex/amsmath.zip + - http://tug.org/~karl/amsbooka.zip + patch/amsbooka.zip *amsfonts*:: {ctan}install/fonts/amsfonts.tds.zip[CTAN:install/fonts/amsfonts.tds.zip] *psnfss*:: @@ -320,6 +320,7 @@ Patches [cols=".3l,.7l", options="header", frame="topbot", grid="rows"] |=== |Diff/patch file|Patched file +|patch/amsbooka.zip |amslatex/amsbooka.* |patch/amsclass.dtx.diff |amslatex/amsclass.dtx |patch/amsfndoc.def.diff |amsfonts/amsfndoc.def |patch/amsfndoc.tex.diff |amsfonts/amsfndoc.tex @@ -704,3 +705,9 @@ History 2014/11/03:: * Module base: Update (2014-10-12). * Module tools: Update (2014-10-28). +2014/11/12:: + * Module graphics: Update (2014-11-07). + * Modules base, cyrillic, graphics, tools: + +00readme.txt+ renamed to +README+. + * Module amslatex: Missing +amsbooka.zip+ added to directory +patch+ + (until it is resolved at the AMS side). diff --git a/Master/texmf-dist/source/latex/latex-tds/build.pl b/Master/texmf-dist/source/latex/latex-tds/build.pl index 6c19ef63b82..3179b7c3ef6 100755 --- a/Master/texmf-dist/source/latex/latex-tds/build.pl +++ b/Master/texmf-dist/source/latex/latex-tds/build.pl @@ -4,8 +4,8 @@ $^W=1; my $prj = 'latex-tds'; my $file = 'build.pl'; -my $version = '1.191'; -my $date = '2014-05-21'; +my $version = '1.192'; +my $date = '2014-11-12'; my $author = 'Heiko Oberdiek'; my $copyright = "Copyright 2006-2014 $author"; chomp(my $license = <<"END_LICENSE"); @@ -34,7 +34,6 @@ my $time_start = time; my $url_ctan = 'ftp://dante.ctan.org/tex-archive'; my $url_ams = 'ftp://ftp.ams.org/pub/tex'; -my $url_amsbooka = 'http://tug.org/~karl/amsbooka.zip'; my $url_ltxprj = 'http://www.latex-project.org/'; my @required_list = ( @@ -67,7 +66,6 @@ my $error = "!!! Error:"; my $dir_incoming = 'incoming'; my $dir_incoming_ctan = "$dir_incoming/ctan"; my $dir_incoming_ams = "$dir_incoming/ams"; -my $dir_incoming_amsbooka = "$dir_incoming/amsbooka"; my $dir_incoming_ltxprj = "$dir_incoming/ltxprj"; my $dir_ltxpub = "latex2e-public"; my $dir_incoming_ltxpub = "$dir_incoming/$dir_ltxpub"; @@ -76,6 +74,7 @@ my $dir_lib = 'lib'; my $dir_license = 'license'; my $dir_tex = 'tex'; my $dir_patch = 'patch'; +my $dir_patch_amsbooka = $dir_patch; my $dir_distrib = 'distrib'; my $dir_build_distrib = "$dir_build/distrib"; my $dir_build_distrib_data = "$dir_build_distrib/$prj"; @@ -353,8 +352,6 @@ if (@list_modules > 0) { download_err('lgc2'); download_err('tlc2'); download_ctan_file('armtex.zip', 'language/armenian'); - ensure_directory($dir_incoming_amsbooka); - download("$dir_incoming_amsbooka/amsbooka.zip", $url_amsbooka); } ### VCS @@ -514,7 +511,7 @@ section('Unpacking'); # run("$prg_cp $dir_build/amslatex/ctan/amsrefs/amsrefs.dtx " # . "$dir_build/amslatex/texmf/source/latex/amsrefs/amsrefs.dtx"); unpacking_flat('amslatex', - "$dir_incoming_amsbooka/amsbooka.zip", + "$dir_patch_amsbooka/amsbooka.zip", "$dir_build/amslatex"); } @@ -862,9 +859,14 @@ section('Install tex doc'); sub check_readme ($) { my $module = shift; # my $readme = $module eq 'tools' ? 'readme.txt' : '00readme.txt'; - my $readme = '00readme.txt'; # since LaTeX revision 307 - if (-f "README" and not -f $readme) { - run("$prg_cp README $readme"); + # my $readme = '00readme.txt'; # since LaTeX revision 307 + # Since LaTeX 2014-11 switch to README. + my $readme = 'README'; + # if (-f "README" and not -f $readme) { + # run("$prg_cp README $readme"); + # } + if (-f '00readme.txt' and not -f $readme) { + run("$prg_cp 00readme.txt $readme"); } -f $readme or die "!!! Errror($module): Missing readme!\n"; @@ -876,7 +878,7 @@ section('Install tex doc'); cd "$dir_build/base"; check_readme 'base'; install 'texmf/doc/latex/base', qw[ - 00readme.txt + README autoload.txt bugs.txt changes.txt @@ -909,7 +911,7 @@ section('Install tex doc'); install 'texmf/doc/latex/tools', qw[ changes.txt manifest.txt - 00readme.txt + README ]; cd $cwd; } @@ -917,9 +919,10 @@ section('Install tex doc'); if ($modules{'graphics'}) { cd "$dir_build/graphics"; check_readme 'graphics'; - install('texmf/doc/latex/graphics', - '*.txt' - ); + install 'texmf/doc/latex/graphics', qw[ + README + *.txt + ]; install('texmf/tex/latex/graphics', '*.def' ); @@ -929,9 +932,10 @@ section('Install tex doc'); if ($modules{'cyrillic'}) { cd "$dir_build/cyrillic"; check_readme 'cyrillic'; - install('texmf/doc/latex/cyrillic', - '*.txt' - ); + install 'texmf/doc/latex/cyrillic', qw[ + README + *.txt + ]; cd $cwd; } diff --git a/Master/texmf-dist/source/latex/latex-tds/patch/amsbooka.zip b/Master/texmf-dist/source/latex/latex-tds/patch/amsbooka.zip Binary files differnew file mode 100644 index 00000000000..189dfbbf643 --- /dev/null +++ b/Master/texmf-dist/source/latex/latex-tds/patch/amsbooka.zip diff --git a/Master/texmf-dist/tex/latex/graphics/color.sty b/Master/texmf-dist/tex/latex/graphics/color.sty index 1a7a268213c..cffcc64f514 100644 --- a/Master/texmf-dist/tex/latex/graphics/color.sty +++ b/Master/texmf-dist/tex/latex/graphics/color.sty @@ -7,7 +7,7 @@ %% color.dtx (with options: `package') %% %% color.dtx Copyright (C) 1994--1999 David Carlisle -%% Copyright (C) 2005 David Carlisle, LaTeX3 Project +%% Copyright (C) 2005--2014 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -18,7 +18,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{color} - [2014/04/23 v1.1a Standard LaTeX Color (DPC)] + [2014/10/28 v1.1a Standard LaTeX Color (DPC)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax diff --git a/Master/texmf-dist/tex/latex/graphics/dvipdf.def b/Master/texmf-dist/tex/latex/graphics/dvipdf.def index 601a7befdd3..a4f2917c780 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipdf.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipdf.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipdf.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff --git a/Master/texmf-dist/tex/latex/graphics/dvips.def b/Master/texmf-dist/tex/latex/graphics/dvips.def index 5b6b2a15e49..6f3707d1f80 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvips.def +++ b/Master/texmf-dist/tex/latex/graphics/dvips.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvips.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def index de979f7a089..e51d6d005e2 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipsnam.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \DefineNamedColor{named}{GreenYellow} {cmyk}{0.15,0,0.69,0} \DefineNamedColor{named}{Yellow} {cmyk}{0,0,1,0} \DefineNamedColor{named}{Goldenrod} {cmyk}{0,0.10,0.84,0} diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsone.def b/Master/texmf-dist/tex/latex/graphics/dvipsone.def index 213d4d93bb7..09cf7c2599d 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsone.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsone.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipsone.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff --git a/Master/texmf-dist/tex/latex/graphics/dviwin.def b/Master/texmf-dist/tex/latex/graphics/dviwin.def index 6c6926656f1..bd8eca3ba46 100644 --- a/Master/texmf-dist/tex/latex/graphics/dviwin.def +++ b/Master/texmf-dist/tex/latex/graphics/dviwin.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dviwin.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \@namedef{Gin@rule@*}#1{{bmp}{}{#1}} \def\Ginclude@bmp#1{% \raise\Gin@req@height\hbox{% diff --git a/Master/texmf-dist/tex/latex/graphics/emtex.def b/Master/texmf-dist/tex/latex/graphics/emtex.def index 63fee498660..0d75ad7a686 100644 --- a/Master/texmf-dist/tex/latex/graphics/emtex.def +++ b/Master/texmf-dist/tex/latex/graphics/emtex.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{emtex.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \def\Ginclude@bmp#1{% \raise\Gin@req@height\hbox{\special{em:graph #1}}% \typeout{WARNING: emtex does not permit graphics to be scaled}% diff --git a/Master/texmf-dist/tex/latex/graphics/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty index c68c0f69255..c416a7be977 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics.sty @@ -9,7 +9,7 @@ %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995--1999 2001 David Carlisle %% Copyright (C) 2005--2006 David Carlisle, LaTeX3 Project -%% Copyright (C) 2009 LaTeX3 Project +%% Copyright (C) 2009-2014 LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -20,7 +20,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{graphics} - [2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR)] + [2014/10/28 v1.0p Standard LaTeX Graphics (DPC,SPQR)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -242,7 +242,7 @@ \let\Gin@viewport@code\relax \def\Gin@nosize#1{% \@latex@error - {Cannot determine size of graphic in #1 (no size specifed)}% + {Cannot determine size of graphic in #1 (no size specified)}% \@ehc} \newif\ifGin@bbox \def\Gread@eps#1{% diff --git a/Master/texmf-dist/tex/latex/graphics/graphicx.sty b/Master/texmf-dist/tex/latex/graphics/graphicx.sty index ccbdf4383b1..be0b177c5df 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphicx.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphicx.sty @@ -16,7 +16,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{graphicx} - [2014/04/25 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)] + [2014/10/28 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)] \DeclareOption{unknownkeysallowed} {\PassOptionsToPackage\CurrentOption{keyval}} \DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}} diff --git a/Master/texmf-dist/tex/latex/graphics/keyval.sty b/Master/texmf-dist/tex/latex/graphics/keyval.sty index f5ca00f4b3c..7b18abced31 100644 --- a/Master/texmf-dist/tex/latex/graphics/keyval.sty +++ b/Master/texmf-dist/tex/latex/graphics/keyval.sty @@ -15,7 +15,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{keyval} - [2014/05/08 v1.15 key=value parser (DPC)] + [2014/10/28 v1.15 key=value parser (DPC)] \long\def\setkeys#1#2{% \def\KV@prefix{KV@#1@}% \let\@tempc\relax diff --git a/Master/texmf-dist/tex/latex/graphics/pctex32.def b/Master/texmf-dist/tex/latex/graphics/pctex32.def index 6da3b0975d4..ab567f0fd24 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctex32.def +++ b/Master/texmf-dist/tex/latex/graphics/pctex32.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctex32.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff --git a/Master/texmf-dist/tex/latex/graphics/pctexhp.def b/Master/texmf-dist/tex/latex/graphics/pctexhp.def index e966b734b62..67d1e2e8b7e 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexhp.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexhp.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexhp.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \def\Ginclude@pcl#1{% \message{<#1>}% \ifGin@clip diff --git a/Master/texmf-dist/tex/latex/graphics/pctexps.def b/Master/texmf-dist/tex/latex/graphics/pctexps.def index c1f300b15c5..69ad3fd0a59 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexps.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexps.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexps.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff --git a/Master/texmf-dist/tex/latex/graphics/pctexwin.def b/Master/texmf-dist/tex/latex/graphics/pctexwin.def index a7eb220f016..ca41aa79459 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexwin.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexwin.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexwin.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \def\Ginclude@eps#1{% \message{<#1>}% \ifGin@clip diff --git a/Master/texmf-dist/tex/latex/graphics/tcidvi.def b/Master/texmf-dist/tex/latex/graphics/tcidvi.def index 0c34e2dadcb..68cffdb52d3 100644 --- a/Master/texmf-dist/tex/latex/graphics/tcidvi.def +++ b/Master/texmf-dist/tex/latex/graphics/tcidvi.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{tcidvi.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi diff --git a/Master/texmf-dist/tex/latex/graphics/truetex.def b/Master/texmf-dist/tex/latex/graphics/truetex.def index df33f3d23f4..ab57d690b9b 100644 --- a/Master/texmf-dist/tex/latex/graphics/truetex.def +++ b/Master/texmf-dist/tex/latex/graphics/truetex.def @@ -15,7 +15,7 @@ %% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{truetex.def} - [2014/04/23 v3.0j Driver-dependant file (DPC,SPQR)] + [2014/10/14 v3.0j Driver-dependent file (DPC,SPQR)] \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi |