From bb6fd84d0f762e045075c0e6570c68b283436888 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 3 Aug 2011 22:03:35 +0000 Subject: tools (latex-tds 2jul11) git-svn-id: svn://tug.org/texlive/trunk@23393 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tools/afterpage.pdf | Bin 198236 -> 67821 bytes Master/texmf-dist/doc/latex/tools/array.pdf | Bin 544494 -> 266372 bytes Master/texmf-dist/doc/latex/tools/bm.pdf | Bin 318156 -> 302743 bytes Master/texmf-dist/doc/latex/tools/calc.pdf | Bin 360739 -> 221332 bytes Master/texmf-dist/doc/latex/tools/changes.txt | 26 ++- Master/texmf-dist/doc/latex/tools/dcolumn.pdf | Bin 206491 -> 71337 bytes Master/texmf-dist/doc/latex/tools/delarray.pdf | Bin 191530 -> 58671 bytes Master/texmf-dist/doc/latex/tools/enumerate.pdf | Bin 205164 -> 66387 bytes Master/texmf-dist/doc/latex/tools/fileerr.pdf | Bin 187110 -> 59031 bytes Master/texmf-dist/doc/latex/tools/fontsmpl.pdf | Bin 149401 -> 51863 bytes Master/texmf-dist/doc/latex/tools/ftnright.pdf | Bin 364182 -> 141318 bytes Master/texmf-dist/doc/latex/tools/hhline.pdf | Bin 184005 -> 64778 bytes Master/texmf-dist/doc/latex/tools/indentfirst.pdf | Bin 148431 -> 43392 bytes Master/texmf-dist/doc/latex/tools/layout.pdf | Bin 257131 -> 99731 bytes Master/texmf-dist/doc/latex/tools/longtable.pdf | Bin 371457 -> 172192 bytes Master/texmf-dist/doc/latex/tools/multicol.pdf | Bin 505409 -> 279914 bytes Master/texmf-dist/doc/latex/tools/rawfonts.pdf | Bin 138640 -> 133903 bytes Master/texmf-dist/doc/latex/tools/showkeys.pdf | Bin 253118 -> 242901 bytes Master/texmf-dist/doc/latex/tools/somedefs.pdf | Bin 160450 -> 48795 bytes Master/texmf-dist/doc/latex/tools/tabularx.pdf | Bin 265011 -> 111120 bytes Master/texmf-dist/doc/latex/tools/theorem.pdf | Bin 347999 -> 145648 bytes Master/texmf-dist/doc/latex/tools/tools.pdf | Bin 74633 -> 66068 bytes Master/texmf-dist/doc/latex/tools/trace.pdf | Bin 226665 -> 87753 bytes Master/texmf-dist/doc/latex/tools/varioref.pdf | Bin 343196 -> 168557 bytes Master/texmf-dist/doc/latex/tools/verbatim.pdf | Bin 330946 -> 153251 bytes Master/texmf-dist/doc/latex/tools/xr.pdf | Bin 170522 -> 52652 bytes Master/texmf-dist/doc/latex/tools/xspace.pdf | Bin 247286 -> 81773 bytes Master/texmf-dist/source/latex/tools/ftnright.dtx | 52 ++++- Master/texmf-dist/source/latex/tools/multicol.dtx | 231 ++++++++++++++++++---- Master/texmf-dist/source/latex/tools/varioref.dtx | 64 ++++-- Master/texmf-dist/source/latex/tools/verbatim.dtx | 4 +- Master/texmf-dist/source/latex/tools/xspace.dtx | 13 +- Master/texmf-dist/tex/latex/tools/ftnright.sty | 13 +- Master/texmf-dist/tex/latex/tools/multicol.sty | 62 +++++- Master/texmf-dist/tex/latex/tools/varioref.sty | 34 ++-- Master/texmf-dist/tex/latex/tools/verbatim.sty | 2 +- Master/texmf-dist/tex/latex/tools/verbtest.tex | 2 +- Master/texmf-dist/tex/latex/tools/xspace.sty | 7 +- 38 files changed, 419 insertions(+), 91 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/tools/afterpage.pdf b/Master/texmf-dist/doc/latex/tools/afterpage.pdf index 14068622434..87dc4010068 100644 Binary files a/Master/texmf-dist/doc/latex/tools/afterpage.pdf and b/Master/texmf-dist/doc/latex/tools/afterpage.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/array.pdf b/Master/texmf-dist/doc/latex/tools/array.pdf index bc4eca5c863..bd841ab61aa 100644 Binary files a/Master/texmf-dist/doc/latex/tools/array.pdf and b/Master/texmf-dist/doc/latex/tools/array.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/bm.pdf b/Master/texmf-dist/doc/latex/tools/bm.pdf index 97340ac79ff..24cef87c5dd 100644 Binary files a/Master/texmf-dist/doc/latex/tools/bm.pdf and b/Master/texmf-dist/doc/latex/tools/bm.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/calc.pdf b/Master/texmf-dist/doc/latex/tools/calc.pdf index 536d5af4bae..baece5c79ab 100644 Binary files a/Master/texmf-dist/doc/latex/tools/calc.pdf and b/Master/texmf-dist/doc/latex/tools/calc.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/changes.txt b/Master/texmf-dist/doc/latex/tools/changes.txt index 924abc08693..71c264da55c 100644 --- a/Master/texmf-dist/doc/latex/tools/changes.txt +++ b/Master/texmf-dist/doc/latex/tools/changes.txt @@ -1,4 +1,3 @@ - ======================================================================= This file lists changes to the LaTeX2e files in reverse chronological order. It is provided for convenience only. It therefore makes no claims to @@ -6,6 +5,31 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +2010-11-12 Frank Mittelbach + + * varioref.dtx: Avoid even \protected@edef in \vref@pagenum + to pacify french babel (pr/4093) + +2010-10-24 Frank Mittelbach + + * multicol.dtx: right-to-left language support added + +2010-08-06 Frank Mittelbach + + * multicol.dtx: typo corrections only -- thanks to Laurent Lyaudet + +2010-08-04 Frank Mittelbach + + * varioref.dtx: Correct spacing -- same mistake as in \vref (pr/4123) + Defaults for esperanto added + +2010-04-06 Will Robertson + + * xspace.dtx: Improve edge case for xspace (tools/3895) + +2010-02-25 Frank Mittelbach + + * ftnright.dtx: Check for split footnotes (pr/4099) 2009-09-13 Frank Mittelbach diff --git a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf index bb088fe75da..22970ded983 100644 Binary files a/Master/texmf-dist/doc/latex/tools/dcolumn.pdf and b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/delarray.pdf b/Master/texmf-dist/doc/latex/tools/delarray.pdf index f162f23c9f3..451974f75ca 100644 Binary files a/Master/texmf-dist/doc/latex/tools/delarray.pdf and b/Master/texmf-dist/doc/latex/tools/delarray.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/enumerate.pdf b/Master/texmf-dist/doc/latex/tools/enumerate.pdf index fab9ceb0b66..b4d9839fc6b 100644 Binary files a/Master/texmf-dist/doc/latex/tools/enumerate.pdf and b/Master/texmf-dist/doc/latex/tools/enumerate.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/fileerr.pdf b/Master/texmf-dist/doc/latex/tools/fileerr.pdf index 8f2ee1b45f1..bda12d4e49d 100644 Binary files a/Master/texmf-dist/doc/latex/tools/fileerr.pdf and b/Master/texmf-dist/doc/latex/tools/fileerr.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf index 0c7c7ae5195..39a5df4a540 100644 Binary files a/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf and b/Master/texmf-dist/doc/latex/tools/fontsmpl.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/ftnright.pdf b/Master/texmf-dist/doc/latex/tools/ftnright.pdf index 6b0c003409a..0bc70352931 100644 Binary files a/Master/texmf-dist/doc/latex/tools/ftnright.pdf and b/Master/texmf-dist/doc/latex/tools/ftnright.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/hhline.pdf b/Master/texmf-dist/doc/latex/tools/hhline.pdf index 9a393daf65a..20e33daf3c2 100644 Binary files a/Master/texmf-dist/doc/latex/tools/hhline.pdf and b/Master/texmf-dist/doc/latex/tools/hhline.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf index b51f845c380..3e7aeebe5d2 100644 Binary files a/Master/texmf-dist/doc/latex/tools/indentfirst.pdf and b/Master/texmf-dist/doc/latex/tools/indentfirst.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/layout.pdf b/Master/texmf-dist/doc/latex/tools/layout.pdf index e9461cf3d51..5db8d17436d 100644 Binary files a/Master/texmf-dist/doc/latex/tools/layout.pdf and b/Master/texmf-dist/doc/latex/tools/layout.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/longtable.pdf b/Master/texmf-dist/doc/latex/tools/longtable.pdf index 68ddad7233a..16f33cf5b1b 100644 Binary files a/Master/texmf-dist/doc/latex/tools/longtable.pdf and b/Master/texmf-dist/doc/latex/tools/longtable.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/multicol.pdf b/Master/texmf-dist/doc/latex/tools/multicol.pdf index c8dd936f3ab..88135ac1bce 100644 Binary files a/Master/texmf-dist/doc/latex/tools/multicol.pdf and b/Master/texmf-dist/doc/latex/tools/multicol.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf index f0c5af9dba3..adbd9c35d0c 100644 Binary files a/Master/texmf-dist/doc/latex/tools/rawfonts.pdf and b/Master/texmf-dist/doc/latex/tools/rawfonts.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/showkeys.pdf b/Master/texmf-dist/doc/latex/tools/showkeys.pdf index aa704dadea6..363a3ae5175 100644 Binary files a/Master/texmf-dist/doc/latex/tools/showkeys.pdf and b/Master/texmf-dist/doc/latex/tools/showkeys.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/somedefs.pdf b/Master/texmf-dist/doc/latex/tools/somedefs.pdf index 9cbbe85bae0..78d5056e294 100644 Binary files a/Master/texmf-dist/doc/latex/tools/somedefs.pdf and b/Master/texmf-dist/doc/latex/tools/somedefs.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/tabularx.pdf b/Master/texmf-dist/doc/latex/tools/tabularx.pdf index c528112c2c3..634029549d4 100644 Binary files a/Master/texmf-dist/doc/latex/tools/tabularx.pdf and b/Master/texmf-dist/doc/latex/tools/tabularx.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/theorem.pdf b/Master/texmf-dist/doc/latex/tools/theorem.pdf index 3cac407461e..7771388979c 100644 Binary files a/Master/texmf-dist/doc/latex/tools/theorem.pdf and b/Master/texmf-dist/doc/latex/tools/theorem.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/tools.pdf b/Master/texmf-dist/doc/latex/tools/tools.pdf index ebf7dcb22d6..68d75270526 100644 Binary files a/Master/texmf-dist/doc/latex/tools/tools.pdf and b/Master/texmf-dist/doc/latex/tools/tools.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/trace.pdf b/Master/texmf-dist/doc/latex/tools/trace.pdf index a5884e0d8d0..f337d05109e 100644 Binary files a/Master/texmf-dist/doc/latex/tools/trace.pdf and b/Master/texmf-dist/doc/latex/tools/trace.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/varioref.pdf b/Master/texmf-dist/doc/latex/tools/varioref.pdf index 65b48422a7e..c8dcdc7b552 100644 Binary files a/Master/texmf-dist/doc/latex/tools/varioref.pdf and b/Master/texmf-dist/doc/latex/tools/varioref.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/verbatim.pdf b/Master/texmf-dist/doc/latex/tools/verbatim.pdf index 624b3418a49..ea82b59127c 100644 Binary files a/Master/texmf-dist/doc/latex/tools/verbatim.pdf and b/Master/texmf-dist/doc/latex/tools/verbatim.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/xr.pdf b/Master/texmf-dist/doc/latex/tools/xr.pdf index 05c1f99fcf6..829a0b6c9ac 100644 Binary files a/Master/texmf-dist/doc/latex/tools/xr.pdf and b/Master/texmf-dist/doc/latex/tools/xr.pdf differ diff --git a/Master/texmf-dist/doc/latex/tools/xspace.pdf b/Master/texmf-dist/doc/latex/tools/xspace.pdf index cc4fac98643..7817b7127cc 100644 Binary files a/Master/texmf-dist/doc/latex/tools/xspace.pdf and b/Master/texmf-dist/doc/latex/tools/xspace.pdf differ diff --git a/Master/texmf-dist/source/latex/tools/ftnright.dtx b/Master/texmf-dist/source/latex/tools/ftnright.dtx index 7f6306aa3c4..07f56cf7efb 100644 --- a/Master/texmf-dist/source/latex/tools/ftnright.dtx +++ b/Master/texmf-dist/source/latex/tools/ftnright.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 -% 2006 2008 2009 +% 2006 2008 2009 2010 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -26,11 +26,11 @@ %% Copyright (C) 1989-2004 Frank Mittelbach, all rights reserved. %<+package>\NeedsTeXFormat{LaTeX2e}[1995/06/01] %<+package>\ProvidesPackage{ftnright} -%<+package> [2004/01/16 v1.1e footnote layout package (FMi)] +%<+package> [2010/02/25 v1.1f footnote layout package (FMi)] % % \fi %% -%% \CheckSum{426} +%% \CheckSum{431} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -163,10 +163,7 @@ % {The \LaTeX{} package {\tt \filename} which is described % in this article has the version number \fileversion{} dated % \filedate.}} -% \author{Frank Mittelbach\\ -% Electronic Data Systems (Deutschland) GmbH\\ -% Eisenstra\ss e 58 \\ -% 65428 R\"usselsheim} +% \author{Frank Mittelbach} % % % \maketitle @@ -289,6 +286,27 @@ % will make such changes more easy. % % +% \subsection{Limitations} +% +% If in the first column there is more than a full column worth of footnote +% material the material will be split resulting in footnotes out of +% order. This issue is now detected and generates an error but the package is +% unable to gracefully handle it. This gives you two options: either rearrange +% your input so that it will use less footnotes in the first column (or add +% some pagebreaks at suitable places) or allow explicitly for more material to +% be gathered. The latter can be achieved by adding +%\begin{verbatim} +%\makeatletter +%\def\preparefootins{% +% \global\rcol@footinsskip\skip\footins +% \global\skip\footins\z@ +% \global\count\footins\z@ +% \global\dimen\footins2\textheight} +%\makeatother +%\end{verbatim} +% to the preamble of your document. However, with this you allow two columns +% worth of footnote material and that means that some of your footnotes are +% likely to be detached from their reference and show up on a later page! % % \StopEventually{ % @@ -781,6 +799,26 @@ `twocolumn' in the \noexpand\documentclass command.}% \shipout\box\footins \fi\fi +% \end{macrocode} +% What we also need to check is if there is so much footnote material that +% it resulted in a footnote being split. If that happens the whole +% algorithm falls apart and the footnotes get out of sync. For the +% moment we simply detect it here, perhaps some better scheme can be +% implemented. One way to avoid this is to allow more than |\textheight| of +% footnotes in |\preparefootins|. However, that isn't such a good idea +% either as that means that a footnote from column one, might end up +% completely on a later page. +% \changes{v1.1f}{2010/02/25}{Check for split footnotes (pr/4099)} +% \begin{macrocode} + \ifnum\insertpenalties>\z@ + \@latexerr{ftnright package + scrambled footnotes}% + {There is too much footnote material in + the first column and ftnright^^Jis + unable to cope with this.^^JYou need + to reduce the amount to get a properly + formatted page.}% + \fi \else % \end{macrocode} % When we construct the second column, we must first check whether diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx index e0e293bb4f2..fd69fab4efb 100644 --- a/Master/texmf-dist/source/latex/tools/multicol.dtx +++ b/Master/texmf-dist/source/latex/tools/multicol.dtx @@ -1,9 +1,5 @@ % \iffalse meta-comment % -% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 -% 2006 2008 2009 -% The LaTeX3 Project and any individual authors listed elsewhere -% in this file. % % This file is part of the Standard LaTeX `Tools Bundle'. % ------------------------------------------------------- @@ -24,7 +20,7 @@ % \iffalse This is a METACOMMENT % %% Package `multicol' to use with LaTeX2e -%% Copyright 1989-2007 Frank Mittelbach +%% Copyright 1989-2011 Frank Mittelbach %% %% In addition to the terms of LPPL any distributed version %% (unchanged or modified) of multicol has to keep the statement @@ -95,10 +91,10 @@ % \ProvidesFile{multicol.drv} % \fi % \ProvidesFile{multicol.dtx} - [2008/12/05 v1.6h multicolumn formatting (FMi)] + [2011/06/27 v1.7a multicolumn formatting (FMi)] % % -%% \CheckSum{1560} +%% \CheckSum{1669} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -190,6 +186,18 @@ % the scope of the environment. % \end{abstract} % +% \RLmulticolcolumns +% +% \begin{multicols}{3}[\section*{Preface to version 1.7}] +% The 1.7 release adds support for languages that are typeset +% right-to-left. For those languages the order of the columns on the page +% also need to be reversed---something that wasn't supported before. This +% paragraph demonstrates the result (as it is typeset as if we are writing +% in a left-to-right language---so restart reading the rightmost column +% first if you started with this column). +% \end{multicols} +% +% \LRmulticolcolumns % % \begin{multicols}{3}[\section*{Preface to version 1.5 + 1.6}] % \hbadness=10000 @@ -211,9 +219,9 @@ % \setcounter{collectmore}{2} % \begin{multicols}{3}[\section{Introduction}] % \hbadness=10000 -% Switching between two column and one column layout is possible in +% Switching between two-column and one-column layout is possible in % \LaTeX{}, but every use of |\twocolumn| or |\onecolumn| -% starts a new page. Moreover, the last page of two column output +% starts a new page. Moreover, the last page of two-column output % isn't balanced and this often results in an empty, or nearly % empty, right column. When I started to write macros for {\sf % doc.sty} (see ``The {\tt doc}--Option'', \TUB\ @@ -224,11 +232,11 @@ % course that it is also possible to start the next article on the % same page. Rewriting the index environment was comparatively easy, % but the next goal, designing an environment which takes care of -% footnotes, floats etc., was a harder task. It took me a whole +% footnotes, floats, etc., was a harder task. It took me a whole % weekend\footnote{I started with the algorithm given in the \TeX % book on page 417. Without this help a weekend would not have been % enough. (This remark was made in the documentation of the initial -% release, since then several hundreds more hours went into it +% release, since then several hundreds more hours went into % improving the original code.)} to get together the few lines of % code below and there is % still a good chance that I missed something after all. @@ -358,7 +366,7 @@ % step, balancing will be done when the end of the \mc{} environment % is reached. % In the first step \TeX{} might consider more material whilst -% finding the final columns than it actually use when shipping out the +% finding the final column content than it actually uses when shipping out the % page. This might cause a problem if a footnote is encountered in % the part of the input considered, but not used, on the current page. % In this case the footnote might show up on the current page, while the @@ -431,7 +439,7 @@ % acceptable solution at all and will then finally choose the extreme % solution of placing all text into the first column. % -% Often, when colunms are balanced, it is impossible to find a solution +% Often, when columns are balanced, it is impossible to find a solution % that distributes the text evenly over all columns. If that is the case % the last column usually has less text than the others. In the earlier % releases this text was stretched to produce a column with the same @@ -461,12 +469,12 @@ % \texttt{multicols*} instead of the usual environment the columns on % the last page are not balanced. Of course, this environment only % works on top-level, e.g., inside a box one has to balance to -% determine a column height in absense of a fixed value. +% determine a column height in absence of a fixed value. % % % \subsection{Manually breaking columns} % -% Another request often voiced was: ``How to I tell \LaTeX{} that it +% Another request often voiced was: ``How do I tell \LaTeX{} that it % should break the first column after this particular line?''. The % |\pagebreak| command (which works with the two-column option of % \LaTeX{}) is of no use here since it would end the collection phase @@ -474,7 +482,7 @@ % the |\columnbreak| command was added. If used within a paragraph it % marks the end of the current line as the desired breakpoint. You can % observe its effect on -% the previous page where three lines of text have been artifically +% the previous page where three lines of text have been artificially % forced into the second column (resulting in some white % space between paragraphs in the first column). % @@ -494,6 +502,15 @@ % |\topfraction|, etc.\ rather than by |\dbl...|. % % +% \subsection{Support for right-to-left typesetting} +% +% In right-to-left typesetting the order of the columns on the page +% also need to be reversed, i.e., the first column has to appear on the far +% right and the last column on the left. This is supported through the +% commands |\RLmulticolcolumns| (switching to right-to-left typesetting) +% and |\LRmulticolcolumns| (switching to left-to-right typesetting) the +% latter being the default. +% % \subsection{Warnings} % % Under certain circumstances the use of the \mc{} environment may @@ -507,14 +524,14 @@ % % As the columns are often very narrow \TeX{} wasn't able to find a % good way to break the paragraph. Underfull denotes a loose line but -% as long the badness values is below $10000$ the result is probably +% as long as the badness value is below $10000$ the result is probably % acceptable. % % \item[] % {\hspace*{-\labelsep}\tt Underfull \string\vbox\space ... while % \string\output\space is active} % -% If a column contains an character with an unusual depth, for +% If a column contains a character with an unusual depth, for % example a `(', in the bottom line then this message may show up. It % usually has no significance as long as the value is not more than a % few points. @@ -524,9 +541,9 @@ % % As mentioned above, \mc{} sometimes screws up the footnote % numbering. As a precaution, whenever there is a footnote on a -% page that where \mc{} had to leave a remainder for the following +% page where \mc{} had to leave a remainder for the following % page this warning appears. Check the footnote numbering on this -% page. If it turns out that it is wrong you have to manually break +% page. If it turns out that it is wrong, you have to manually break % the page using |\newpage| or |\pagebreak[..]|. % % \item[] {\hspace*{-\labelsep}\tt Floats and marginpars not allowed @@ -609,7 +626,7 @@ % revision. % % A note to people who like to improve the balancing algorithm of -% \mc{}: The balancing routine in now placed into a single macro +% \mc{}: The balancing routine is now placed into a single macro % which is called |\balance@columns|. This means that one can easily % try different balancing routines by rewriting this macro. The % interface for it is explained in table \ref{tab:balance}. There are @@ -636,7 +653,7 @@ % in register |\mult@firstbox|${}+2$, \ldots, % only the last one as an exception in % register |\mult@grightbox|. Furthermore it has to set up -% two the macros +% the two macros % |\kept@firstmark| and |\kept@botmark| to hold the values for the % first and bottom mark as found in the individual columns. There % are some helper functions defined in section \ref{sec:v14} which @@ -683,7 +700,7 @@ % running both in the old and the new \TeX{} (actually it will % simply ignore the new feature if it is not available). The % calculation of |\emergencystretch| is probably incorrect. I -% made a few tests but of course one has have much more experience +% made a few tests but of course one has to have much more experience % with the new possibilities to achieve the maximum quality. % % Version 1.1a had a nice `feature': the penalty for using the @@ -855,7 +872,7 @@ % %^^A \subsection{Option processing} % -% Next we declare options supported by \mc{}. Twocolumn mode +% Next we declare options supported by \mc{}. Two-column mode % and \mc{} do not work together so we warn about possible % problems. However, since you can revert to |\onecolumn| % in which case \mc{} does work, we don't make this an error. @@ -1893,6 +1910,11 @@ % |\full@width| (shifting it by |\multicol@leftmargin| to the right % so that it will be placed correctly if we are within a list % environment) +% and separating the columns with a rule if desired. +% \changes{v1.5a}{1992/11/04}{New box mechanism} +% \changes{v1.5z}{2000/07/10}{Ensure that column rule has always +% \cs{normalcolor}} +% \changes{v1.6f}{2006/09/19}{Make the color of the rule a hook} % \changes{v1.4l}{1992/08/17}{use \cs{multicol@leftmargin} instead of % \cs{@totalleftmargin}} % @@ -1920,15 +1942,21 @@ % \changes{v1.6a}{2003/03/15}{Preparing for adjusting \cs{prevdepth}} % \begin{macrocode} \setbox\z@\hbox{p}\global\dimen\tw@\dp\z@ - \moveright\multicol@leftmargin - \hbox to\full@width{% % \end{macrocode} -% and separating the columns with a rule if desired. -% \changes{v1.5a}{1992/11/04}{New box mechanism} -% \changes{v1.5z}{2000/07/10}{Ensure that column rule has always -% \cs{normalcolor}} -% \changes{v1.6f}{2006/09/19}{Make the color of the rule a hook} +% If the document is written in a language that is typeset right-to-left +% then, of course, the multicol columns should be also typeset +% right-to-left. To support this we call |\maybe@reverse@columns| which +% either does nothin (in the LR case) or re-sorts the columns so that they +% come out in reverse order (for the RL case). +% \changes{v1.7a}{2010/10/24}{} +% \begin{macrocode} + \maybe@reverse@columns +% \end{macrocode} +% After that we can output all columns regardless of typesetting direction +% in the same way. % \begin{macrocode} + \moveright\multicol@leftmargin + \hbox to\full@width{% \process@cols\mult@gfirstbox{% % \end{macrocode} % If the depth of the current box is larger than the maximum found @@ -1967,9 +1995,9 @@ % \begin{macrocode} \kern-\dimen\tw@ % \end{macrocode} -% However, in case of of the columns was unusually deep \TeX{} may +% However, in case one of the columns was unusually deep \TeX{} may % have tried some corrective actions in which case backing up by -% the ahve value will not bring us back to the baseline. A good +% the saved value will not bring us back to the baseline. A good % indication for this is a depth of |\maxdepth| though it is not an % absolute proof. If the option \texttt{grid} is used % |\mc@gridwarn| will expand to this, otherwise to |\maxdimen| in @@ -2015,8 +2043,8 @@ % \begin{macro}{\multi@column@out} % Now we can't postpone the difficulties any longer. The % |\multi@column@out| routine will be called in two situations. -% Either the page is full (i.e.\ we have collected enough material -% to generate all the required columns) or a float or marginpar (or +% Either the page is full (i.e., we have collected enough material +% to generate all the required columns) or a float or marginpar or % a |\clearpage| is % sensed. In the latter case the |\outputpenalty| is less % than $-10000$, otherwise the penalty which triggered the output @@ -2140,13 +2168,13 @@ \hrule\allowbreak \fi \fi % \end{macrocode} -% To get a correct marks for the current page we have to (locally +% To get a correct marks for the current page we have to (locally) % redefine |\firstmark| and |\botmark|. % If |\kept@firstmark| is non-empty then |\kept@botmark| must be % non-empty too so we can use their values. Otherwise we use the % value of |\kept@topmark| which was first initialized when we % gathered the |\partical@page| and later on was updated to the -% |\botmark| for the preceding page +% |\botmark| for the preceding page. % % \changes{v1.4a}{1992/02/14}{\cs{botmark} set to \cs{splitbotmark}} % \begin{macrocode} @@ -3482,6 +3510,135 @@ % \end{macrocode} % \end{macro} % +% +% \subsection{Supporting right-to-left languages} \label{sec:RL} +% +% +% \changes{v1.7a}{2010/10/24}{RL language support added} +% +% \begin{macro}{\RLmulticolcolumns} +% \begin{macro}{\LRmulticolcolumns} +% \begin{macro}{\maybe@reverse@columns} +% Macros to switch between left-right and right-left typesetting. In RL +% typesetting the |\reverse@column@boxes| is executed prior to typesetting +% the columns. In LR typesetting this resorting is omitted as the boxes are +% already in the right order. +% \begin{macrocode} +\newcommand\RLmulticolcolumns + {\let\maybe@reverse@columns + \reverse@column@boxes} +\newcommand\LRmulticolcolumns + {\let\maybe@reverse@columns\relax} +% \end{macrocode} +% The default is left-to-right: +% \begin{macrocode} +\LRmulticolcolumns +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} + + +% \begin{macro}{\multicol@sort@counter} +% We need a counter to resort the column boxes if we are typesetting +% right-to-left. +% \begin{macrocode} +\newcount\multicol@sort@counter +% \end{macrocode} +% \end{macro} + + +% \begin{macro}{\reverse@column@boxes} +% This macro is called to re-sort the assembled column boxes when we are +% typesetting right-to-left. The first step is to reverse the columns. +% \begin{macrocode} +\def\reverse@column@boxes {% + \ifnum\c@tracingmulticols>\thr@@ + \typeout{reversing columns ...} + \fi +% \end{macrocode} +% The columns are at this point in the boxes with register numbers +% |\mult@gfirstbox|, $|\mult@gfirstbox|+2$, \ldots{} but the last column +% is in |\mult@rightbox| which is equal to $|\mult@gfirstbox|-2$. +% +% So to re-sort we use |\process@cols| with |\count@| starting at +% |\mult@gfirstbox| and incrementing by 2 and |\multicol@sort@counter| +% starting at the high end of the now unused intermediate boxes and +% decrementing by 2. +% \begin{macrocode} + \multicol@sort@counter\doublecol@number + \advance\multicol@sort@counter\m@ne + \process@cols\mult@gfirstbox{% + \setbox\multicol@sort@counter + \box\count@ + \ifnum\c@tracingmulticols>\thr@@ + \typeout{Setting + \the\multicol@sort@counter\space + <- \the\count@}% + \fi + \advance \multicol@sort@counter -\tw@ + }% +% \end{macrocode} +% For example with 4 columns we would see something like +% this: +% What remains to do is to move the last box out of the way: +% \begin{macrocode} +% + \ifnum\c@tracingmulticols>\thr@@ + \typeout{Setting last: + \the\mult@grightbox\space + <- \the\mult@rightbox}% + \fi + \setbox \mult@grightbox \box\mult@rightbox +% \end{macrocode} +% Now the boxes are more or less resorted but the register numbers are off +% by one, so we shift the boxes again using |\process@cols|. This time +% |\multicol@sort@counter| trails one behind |\count@|. +% \begin{macrocode} + \ifnum\c@tracingmulticols>\thr@@ + \typeout{shifting ...} + \fi + \multicol@sort@counter\mult@gfirstbox + \advance\multicol@sort@counter \m@ne + \process@cols\mult@gfirstbox{% + \global\setbox\count@ + \box\multicol@sort@counter + \ifnum\c@tracingmulticols>\thr@@ + \typeout{Setting \the\count@\space + <- \the\multicol@sort@counter}% + \fi + \advance \multicol@sort@counter \tw@ + }% +% \end{macrocode} +% With 4 columns this would do the following register moves: +% \begin{verbatim} +% Setting 31 <- 30 +% Setting 33 <- 32 +% Setting 35 <- 34 +% \end{verbatim} +% Now all columns except the last one are in the right place. That one is +% now in highest register we used which corresponds to +% $|\doublecol@number|-1$ if you look back to the first loop. And it has to +% move to |\mult@rightbox| which happens in the following code. +% \begin{macrocode} + \multicol@sort@counter\doublecol@number + \advance\multicol@sort@counter\m@ne + \ifnum\c@tracingmulticols>\thr@@ + \typeout{Setting last: + \the\mult@rightbox\space + <- \the\multicol@sort@counter}% + \fi + \global\setbox \mult@rightbox + \box\multicol@sort@counter +% \end{macrocode} +% After that the columns are in the same boxes as before but sorted the +% other way around and thus can be processed without further adjustments by +% the normal multicol code. +% \begin{macrocode} +} +% \end{macrocode} +% \end{macro} +% % \end{multicols*} % % \Finale diff --git a/Master/texmf-dist/source/latex/tools/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx index 9404a96ab21..7cf7c7eed50 100644 --- a/Master/texmf-dist/source/latex/tools/varioref.dtx +++ b/Master/texmf-dist/source/latex/tools/varioref.dtx @@ -22,7 +22,7 @@ % \fi % \iffalse %% Package varioref to use with LaTeX2e -%% Copyright (C) 1992-2009 Frank Mittelbach, all rights reserved. +%% Copyright (C) 1992-2010 Frank Mittelbach, all rights reserved. %% %% For additions or updates to the language options please contact %% the author at @@ -34,10 +34,10 @@ % %\NeedsTeXFormat{LaTeX2e}[1995/05/16] %\ProvidesPackage{varioref} -% [2009/09/13 v1.4w package for extended references (FMi)] +% [2010/11/12 v1.4y package for extended references (FMi)] % \fi % -% \CheckSum{2150} +% \CheckSum{2170} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -871,18 +871,25 @@ \def\reftextpagerange#1#2{on pages~\pageref{#1}--\pageref{#2}}% \def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}% }} +% \end{macrocode} +% +% The esperanto strings were suggested by Albert Reiner +% (\verb=areiner@tph.tuwien.ac.at=). +% \changes{v1.4x}{2010/08/04}{Defaults for esperanto added} +% \begin{macrocode} \DeclareOption{esperanto} - {\vref@excuse{esperanto}% - \vref@addto\extrasesperanto{% - \def\reftextfaceafter {on the \reftextvario{facing}{next} page}% - \def\reftextfacebefore{on the \reftextvario{facing}{preceding} - page}% - \def\reftextafter {on the \reftextvario{following}{next} page}% - \def\reftextbefore {on the \reftextvario{preceding}{previous} page}% - \def\reftextcurrent {on \reftextvario{this}{the current} page}% - \def\reftextfaraway#1{on page~\pageref{#1}}% - \def\reftextpagerange#1#2{on pages~\pageref{#1}--\pageref{#2}}% - \def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}% + {\vref@addto\extrasesperanto{% + \def\reftextfaceafter{en la + \reftextvario{flanka}{sekva} pa\^go}% + \def\reftextfacebefore{en la + \reftextvario{flanka}{anta\u ua} pa\^go}% + \def\reftextafter{en la sekva pa\^go}% + \def\reftextbefore{en la anta\u ua pa\^go}% + \def\reftextcurrent{\reftextvario{\^ci-pa\^ge}% + {en \^ci tiu pa\^go}}% + \def\reftextfaraway#1{en pa\^go~\pageref{#1}}% + \def\reftextpagerange#1#2{en pa\^goj~\pageref{#1} \^gis \pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1} \^gis~\ref{#2}}% }} % \end{macrocode} % The finnish strings were suggested by Matti Rintala @@ -1889,11 +1896,9 @@ % % \begin{macro}{\vref@pagenum} % \changes{v1.2a}{1998/08/01}{Macro added} -% \changes{v1.4w}{2009/09/13}{Use \cs{protected@edef} to avoid problems -% in complicated setups, e.g., microtype (pr/4080)} % This command takes a label as |#1| extracts the page number % associated with it and saves the result in a csname which is -% passed as |#1|. If the label isn't associates with a page number +% passed as |#1|. If the label isn't associated with a page number % it essentially associates it with |??| for both the label number % and the page, thus defining the label this way. This means that % no label warning is generated for this label in case it is @@ -1901,7 +1906,26 @@ % \begin{macrocode} \def\vref@pagenum#1#2{% \@ifundefined{r@#2}{\@namedef{r@#2}{{??}{??}}}{}% - \protected@edef#1{\expandafter\expandafter\expandafter +% \end{macrocode} +% Extracting and saving the page number turned out to be a soure of subtle +% bugs. Initially it was done through an |\edef| with a bunch of +% |\expandafter| commands inside. This posed a problem if the page number +% itself contained code which needed protection (e.g., pr/4080) so this got +% changed to use |\protected@edef|. However, that in turn failed with Babel +% (pr/4093) +% if the label contained active characters, e.g., a ``:'' in French. So now +% we use even more |\expandafter| commands to avoid any expansion other +% than what is absolutely required---I'm sure there is now a simpler way +% to code this, but \ldots: +% \changes{v1.4w}{2009/09/13}{Use \cs{protected@edef} to avoid problems +% in complicated setups, e.g., microtype (pr/4080)} +% \changes{v1.4y}{2010/11/12}{Avoid even \cs{protected@edef} to pacify french +% babel (pr/4093)} +% \begin{macrocode} + \expandafter\expandafter\expandafter + \def\expandafter\expandafter\expandafter + #1\expandafter\expandafter\expandafter + {\expandafter\expandafter\expandafter \@cdr\csname r@#2\endcsname \@nil}% } @@ -2042,6 +2066,8 @@ % \changes{v1.4a}{2002/02/24}{Macro added} % \begin{macro}{\Vr@f} % \changes{v1.4a}{2002/02/24}{Macro added} +% \changes{v1.4x}{2010/08/04}{Correct spacing -- same mistake as in \cs{vref} +% (pr/4123)} % |\Vref| is the counterpart to |\vref| with |\ref| replaced by % |\Ref| in its definition. % \begin{macrocode} @@ -2051,7 +2077,7 @@ \def\Vr@f#1{% \leavevmode\unskip\vref@space \Ref{#1}% - \@vpageref[\unskip]{#1}} + \vpageref[\unskip]{#1}} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/tools/verbatim.dtx b/Master/texmf-dist/source/latex/tools/verbatim.dtx index 88274e27c2f..155b5042ed1 100644 --- a/Master/texmf-dist/source/latex/tools/verbatim.dtx +++ b/Master/texmf-dist/source/latex/tools/verbatim.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 -% 2006 2008 2009 +% 2006 2008 2009 2011 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -26,7 +26,7 @@ % % %% Package `verbatim' to use with LaTeX2e -%% Copyright (C) 1989--2003 by Rainer Schöpf. All rights reserved. +%% Copyright (C) 1989--2003 by Rainer Sch\"opf. All rights reserved. % % Copying of this file is authorized only if either % (1) you make absolutely no changes to your copy, including name, or diff --git a/Master/texmf-dist/source/latex/tools/xspace.dtx b/Master/texmf-dist/source/latex/tools/xspace.dtx index 2740032c7a2..a8a11f8a097 100644 --- a/Master/texmf-dist/source/latex/tools/xspace.dtx +++ b/Master/texmf-dist/source/latex/tools/xspace.dtx @@ -33,7 +33,7 @@ %\ProvidesFile{xspace.drv} % \fi % \ProvidesFile{xspace.dtx} - [2006/05/08 v1.12 Space after command names (DPC,MH)] + [2009/10/20 v1.13 Space after command names (DPC,MH)] % % \iffalse %<*driver> @@ -60,7 +60,7 @@ % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \CheckSum{209} +% \CheckSum{218} % % \changes{v1.00}{1991/08/30}{Initial version} % \changes{v1.01}{1992/06/26}{Re-issue for the new doc and docstrip} @@ -243,8 +243,17 @@ \def\@xspace@exceptions@tlp{% ,.'/?;:!~-)\ \/\bgroup\egroup\@sptoken\space\@xobeysp \footnote\footnotemark + \xspace@check@icr } % \end{macrocode} +% And here we get the non-empty definition of \cs{check@icr}. +% \changes{v1.13}{2009/10/20}{fix for "tools/3895": `text font commands fool xspace'} +% \begin{macrocode} +\begingroup + \text@command\relax + \global\let\xspace@check@icr\check@icr +\endgroup +% \end{macrocode} % \end{macro} % % \begin{macro}{\xspaceaddexceptions} diff --git a/Master/texmf-dist/tex/latex/tools/ftnright.sty b/Master/texmf-dist/tex/latex/tools/ftnright.sty index f96de9bd895..72c5c39f086 100644 --- a/Master/texmf-dist/tex/latex/tools/ftnright.sty +++ b/Master/texmf-dist/tex/latex/tools/ftnright.sty @@ -35,9 +35,9 @@ %% Copyright (C) 1989-2004 Frank Mittelbach, all rights reserved. \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{ftnright} - [2004/01/16 v1.1e footnote layout package (FMi)] + [2010/02/25 v1.1f footnote layout package (FMi)] %% -%% \CheckSum{426} +%% \CheckSum{431} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -130,6 +130,15 @@ `twocolumn' in the \noexpand\documentclass command.}% \shipout\box\footins \fi\fi + \ifnum\insertpenalties>\z@ + \@latexerr{ftnright package + scrambled footnotes}% + {There is too much footnote material in + the first column and ftnright^^Jis + unable to cope with this.^^JYou need + to reduce the amount to get a properly + formatted page.}% + \fi \else \ifvoid\footins \setbox\@outputbox\box\@cclv diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty index a52e88d679b..50284dc079f 100644 --- a/Master/texmf-dist/tex/latex/tools/multicol.sty +++ b/Master/texmf-dist/tex/latex/tools/multicol.sty @@ -32,7 +32,7 @@ %% given in the file `manifest.txt'. %% %% Package `multicol' to use with LaTeX2e -%% Copyright 1989-2007 Frank Mittelbach +%% Copyright 1989-2011 Frank Mittelbach %% %% In addition to the terms of LPPL any distributed version %% (unchanged or modified) of multicol has to keep the statement @@ -97,8 +97,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{multicol} - [2008/12/05 v1.6h multicolumn formatting (FMi)] -%% \CheckSum{1560} + [2011/06/27 v1.7a multicolumn formatting (FMi)] +%% \CheckSum{1669} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -386,6 +386,7 @@ \ifvmode\else\errmessage{Multicol Error}\fi \nointerlineskip \setbox\z@\hbox{p}\global\dimen\tw@\dp\z@ + \maybe@reverse@columns \moveright\multicol@leftmargin \hbox to\full@width{% \process@cols\mult@gfirstbox{% @@ -847,6 +848,61 @@ \fi \fi} \newbox\colbreak@box +\newcommand\RLmulticolcolumns + {\let\maybe@reverse@columns + \reverse@column@boxes} +\newcommand\LRmulticolcolumns + {\let\maybe@reverse@columns\relax} +\LRmulticolcolumns + +\newcount\multicol@sort@counter + +\def\reverse@column@boxes {% + \ifnum\c@tracingmulticols>\thr@@ + \typeout{reversing columns ...} + \fi + \multicol@sort@counter\doublecol@number + \advance\multicol@sort@counter\m@ne + \process@cols\mult@gfirstbox{% + \setbox\multicol@sort@counter + \box\count@ + \ifnum\c@tracingmulticols>\thr@@ + \typeout{Setting + \the\multicol@sort@counter\space + <- \the\count@}% + \fi + \advance \multicol@sort@counter -\tw@ + }% + \ifnum\c@tracingmulticols>\thr@@ + \typeout{Setting last: + \the\mult@grightbox\space + <- \the\mult@rightbox}% + \fi + \setbox \mult@grightbox \box\mult@rightbox + \ifnum\c@tracingmulticols>\thr@@ + \typeout{shifting ...} + \fi + \multicol@sort@counter\mult@gfirstbox + \advance\multicol@sort@counter \m@ne + \process@cols\mult@gfirstbox{% + \global\setbox\count@ + \box\multicol@sort@counter + \ifnum\c@tracingmulticols>\thr@@ + \typeout{Setting \the\count@\space + <- \the\multicol@sort@counter}% + \fi + \advance \multicol@sort@counter \tw@ + }% + \multicol@sort@counter\doublecol@number + \advance\multicol@sort@counter\m@ne + \ifnum\c@tracingmulticols>\thr@@ + \typeout{Setting last: + \the\mult@rightbox\space + <- \the\multicol@sort@counter}% + \fi + \global\setbox \mult@rightbox + \box\multicol@sort@counter +} \endinput %% %% End of file `multicol.sty'. diff --git a/Master/texmf-dist/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty index 824d01f2574..6df5db8ee63 100644 --- a/Master/texmf-dist/tex/latex/tools/varioref.sty +++ b/Master/texmf-dist/tex/latex/tools/varioref.sty @@ -32,7 +32,7 @@ %% given in the file `manifest.txt'. %% %% Package varioref to use with LaTeX2e -%% Copyright (C) 1992-2009 Frank Mittelbach, all rights reserved. +%% Copyright (C) 1992-2010 Frank Mittelbach, all rights reserved. %% %% For additions or updates to the language options please contact %% the author at @@ -43,7 +43,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/05/16] \ProvidesPackage{varioref} - [2009/09/13 v1.4w package for extended references (FMi)] + [2010/11/12 v1.4y package for extended references (FMi)] %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -307,17 +307,18 @@ \def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}% }} \DeclareOption{esperanto} - {\vref@excuse{esperanto}% - \vref@addto\extrasesperanto{% - \def\reftextfaceafter {on the \reftextvario{facing}{next} page}% - \def\reftextfacebefore{on the \reftextvario{facing}{preceding} - page}% - \def\reftextafter {on the \reftextvario{following}{next} page}% - \def\reftextbefore {on the \reftextvario{preceding}{previous} page}% - \def\reftextcurrent {on \reftextvario{this}{the current} page}% - \def\reftextfaraway#1{on page~\pageref{#1}}% - \def\reftextpagerange#1#2{on pages~\pageref{#1}--\pageref{#2}}% - \def\reftextlabelrange#1#2{\ref{#1} to~\ref{#2}}% + {\vref@addto\extrasesperanto{% + \def\reftextfaceafter{en la + \reftextvario{flanka}{sekva} pa\^go}% + \def\reftextfacebefore{en la + \reftextvario{flanka}{anta\u ua} pa\^go}% + \def\reftextafter{en la sekva pa\^go}% + \def\reftextbefore{en la anta\u ua pa\^go}% + \def\reftextcurrent{\reftextvario{\^ci-pa\^ge}% + {en \^ci tiu pa\^go}}% + \def\reftextfaraway#1{en pa\^go~\pageref{#1}}% + \def\reftextpagerange#1#2{en pa\^goj~\pageref{#1} \^gis \pageref{#2}}% + \def\reftextlabelrange#1#2{\ref{#1} \^gis~\ref{#2}}% }} \DeclareOption{finnish} {\vref@addto\extrasfinnish{% @@ -728,7 +729,10 @@ \def\fullref#1{\ref{#1} \reftextfaraway{#1}} \def\vref@pagenum#1#2{% \@ifundefined{r@#2}{\@namedef{r@#2}{{??}{??}}}{}% - \protected@edef#1{\expandafter\expandafter\expandafter + \expandafter\expandafter\expandafter + \def\expandafter\expandafter\expandafter + #1\expandafter\expandafter\expandafter + {\expandafter\expandafter\expandafter \@cdr\csname r@#2\endcsname \@nil}% } @@ -772,7 +776,7 @@ \def\Vr@f#1{% \leavevmode\unskip\vref@space \Ref{#1}% - \@vpageref[\unskip]{#1}} + \vpageref[\unskip]{#1}} \endinput %% %% End of file `varioref.sty'. diff --git a/Master/texmf-dist/tex/latex/tools/verbatim.sty b/Master/texmf-dist/tex/latex/tools/verbatim.sty index 3a49901e615..d3bc38388de 100644 --- a/Master/texmf-dist/tex/latex/tools/verbatim.sty +++ b/Master/texmf-dist/tex/latex/tools/verbatim.sty @@ -32,7 +32,7 @@ %% given in the file `manifest.txt'. %% %% Package `verbatim' to use with LaTeX2e -%% Copyright (C) 1989--2003 by Rainer Sch^^f6pf. All rights reserved. +%% Copyright (C) 1989--2003 by Rainer Sch\"opf. All rights reserved. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{verbatim} [2003/08/22 v1.5q LaTeX2e package for verbatim enhancements] diff --git a/Master/texmf-dist/tex/latex/tools/verbtest.tex b/Master/texmf-dist/tex/latex/tools/verbtest.tex index ae0142da63d..1649ea539d4 100644 --- a/Master/texmf-dist/tex/latex/tools/verbtest.tex +++ b/Master/texmf-dist/tex/latex/tools/verbtest.tex @@ -32,7 +32,7 @@ %% given in the file `manifest.txt'. %% %% Package `verbatim' to use with LaTeX2e -%% Copyright (C) 1989--2003 by Rainer Sch^^f6pf. All rights reserved. +%% Copyright (C) 1989--2003 by Rainer Sch\"opf. All rights reserved. \documentclass{article} \usepackage{verbatim} diff --git a/Master/texmf-dist/tex/latex/tools/xspace.sty b/Master/texmf-dist/tex/latex/tools/xspace.sty index 30628e2eb70..a3fffe44379 100644 --- a/Master/texmf-dist/tex/latex/tools/xspace.sty +++ b/Master/texmf-dist/tex/latex/tools/xspace.sty @@ -36,7 +36,7 @@ %% Morten H\o gholm \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{xspace} - [2006/05/08 v1.12 Space after command names (DPC,MH)] + [2009/10/20 v1.13 Space after command names (DPC,MH)] \DeclareRobustCommand\xspace{\@xspace@firsttrue \futurelet\@let@token\@xspace} \newif\if@xspace@first @@ -44,7 +44,12 @@ \def\@xspace@exceptions@tlp{% ,.'/?;:!~-)\ \/\bgroup\egroup\@sptoken\space\@xobeysp \footnote\footnotemark + \xspace@check@icr } +\begingroup + \text@command\relax + \global\let\xspace@check@icr\check@icr +\endgroup \newcommand*\xspaceaddexceptions{% \g@addto@macro\@xspace@exceptions@tlp } -- cgit v1.2.3