From 1905e62be6b4a509d2afd3b48576741df8ec7e94 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 9 Oct 2011 23:49:45 +0000 Subject: tools (8oct11) git-svn-id: svn://tug.org/texlive/trunk@24253 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tools/afterpage.pdf | Bin 67821 -> 60688 bytes Master/texmf-dist/doc/latex/tools/array.pdf | Bin 266243 -> 259086 bytes Master/texmf-dist/doc/latex/tools/bm.pdf | Bin 302743 -> 302743 bytes Master/texmf-dist/doc/latex/tools/calc.pdf | Bin 221332 -> 221322 bytes Master/texmf-dist/doc/latex/tools/dcolumn.pdf | Bin 71337 -> 64227 bytes Master/texmf-dist/doc/latex/tools/delarray.pdf | Bin 58671 -> 51593 bytes Master/texmf-dist/doc/latex/tools/enumerate.pdf | Bin 66387 -> 59262 bytes Master/texmf-dist/doc/latex/tools/fileerr.pdf | Bin 59176 -> 51757 bytes Master/texmf-dist/doc/latex/tools/fontsmpl.pdf | Bin 51863 -> 44761 bytes Master/texmf-dist/doc/latex/tools/ftnright.pdf | Bin 141459 -> 141544 bytes Master/texmf-dist/doc/latex/tools/hhline.pdf | Bin 64778 -> 57715 bytes Master/texmf-dist/doc/latex/tools/indentfirst.pdf | Bin 43392 -> 36325 bytes Master/texmf-dist/doc/latex/tools/layout.pdf | Bin 99731 -> 92596 bytes Master/texmf-dist/doc/latex/tools/longtable.pdf | Bin 172192 -> 164902 bytes Master/texmf-dist/doc/latex/tools/multicol.pdf | Bin 279877 -> 271124 bytes Master/texmf-dist/doc/latex/tools/rawfonts.pdf | Bin 60162 -> 60160 bytes Master/texmf-dist/doc/latex/tools/showkeys.pdf | Bin 131973 -> 131979 bytes Master/texmf-dist/doc/latex/tools/somedefs.pdf | Bin 48795 -> 41728 bytes Master/texmf-dist/doc/latex/tools/tabularx.pdf | Bin 111120 -> 104047 bytes Master/texmf-dist/doc/latex/tools/theorem.pdf | Bin 145798 -> 138335 bytes Master/texmf-dist/doc/latex/tools/tools.pdf | Bin 66068 -> 66068 bytes Master/texmf-dist/doc/latex/tools/trace.pdf | Bin 87753 -> 80704 bytes Master/texmf-dist/doc/latex/tools/varioref.pdf | Bin 169278 -> 161720 bytes Master/texmf-dist/doc/latex/tools/verbatim.pdf | Bin 153251 -> 146142 bytes Master/texmf-dist/doc/latex/tools/xr.pdf | Bin 52652 -> 45588 bytes Master/texmf-dist/doc/latex/tools/xspace.pdf | Bin 81773 -> 74712 bytes Master/texmf-dist/source/latex/tools/varioref.dtx | 24 +++++++++------------- Master/texmf-dist/tex/latex/tools/varioref.sty | 16 ++++++--------- 28 files changed, 16 insertions(+), 24 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/tools/afterpage.pdf b/Master/texmf-dist/doc/latex/tools/afterpage.pdf index 91120433fc9..06ec3455106 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 1b05f3f17db..014aca610da 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 e0ab04d9bdf..977f04fa067 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 21357ce15e7..4957344e187 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/dcolumn.pdf b/Master/texmf-dist/doc/latex/tools/dcolumn.pdf index a708de97662..e0e5ee41830 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 7e52d6d1111..cdc96005cc0 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 2ab750dc52f..715631bd370 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 3db273ecb14..ddab50058a8 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 cc60dbbec56..f5186add152 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 fce888898d9..85308e6bf2a 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 2e98766251c..ee629cb4bf6 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 e9d3c1964a0..ee8769e7d48 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 626dfafb4d3..a13b09a2886 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 729e8ee6ec0..01d13a7276d 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 f73d9528c07..77e1703b5c9 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 c964347bfb6..5fcbcfff6e2 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 2f5f8254039..e1bd889a7b6 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 9dacb14fdec..dc26788d545 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 dc298936561..8fb869dbcce 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 4d5244fce41..a0279e59c79 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 eb02819f906..e2ad76d3b01 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 b3b87f26b29..99e79e13786 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 e10314a1245..543d72ed7de 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 cfc8b0a90aa..13d21596292 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 527e836f97b..3e6fe8ba197 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 0da2b167360..60321ebb60a 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/varioref.dtx b/Master/texmf-dist/source/latex/tools/varioref.dtx index 8459888071a..3cf17801dc7 100644 --- a/Master/texmf-dist/source/latex/tools/varioref.dtx +++ b/Master/texmf-dist/source/latex/tools/varioref.dtx @@ -33,10 +33,10 @@ % %\NeedsTeXFormat{LaTeX2e}[1995/05/16] %\ProvidesPackage{varioref} -% [2011/07/27 v1.4z package for extended references (FMi)] +% [2011/10/02 v1.4z package for extended references (FMi)] % \fi % -% \CheckSum{2172} +% \CheckSum{2164} %% \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 @@ -1923,18 +1923,14 @@ % 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)} -% \changes{v1.4z}{2011/07/27}{Previous fix need one more expansion -% (pr/4159)} -% \begin{macrocode} - \expandafter\def\expandafter#1\expandafter{% - \romannumeral - \expandafter\expandafter\expandafter - \z@ - \expandafter \@cdr - \romannumeral - \expandafter\expandafter\expandafter - \z@ - \csname r@#2\endcsname\@nil}% +% \changes{v1.4z}{2011/10/02}{Previous fix need one more expansion +% (pr/4159,pr/4171)} +% \begin{macrocode} + \expandafter\expandafter\expandafter\vref@@pagenum + \csname r@#2\endcsname{}{}\@nil#1% +} +\def\vref@@pagenum#1#2#3\@nil#4{% + \def#4{#2}% } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty index b4a5f5ed172..ababf87e083 100644 --- a/Master/texmf-dist/tex/latex/tools/varioref.sty +++ b/Master/texmf-dist/tex/latex/tools/varioref.sty @@ -43,7 +43,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/05/16] \ProvidesPackage{varioref} - [2011/07/27 v1.4z package for extended references (FMi)] + [2011/10/02 v1.4z 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 @@ -729,15 +729,11 @@ \def\fullref#1{\ref{#1} \reftextfaraway{#1}} \def\vref@pagenum#1#2{% \@ifundefined{r@#2}{\@namedef{r@#2}{{??}{??}}}{}% - \expandafter\def\expandafter#1\expandafter{% - \romannumeral - \expandafter\expandafter\expandafter - \z@ - \expandafter \@cdr - \romannumeral - \expandafter\expandafter\expandafter - \z@ - \csname r@#2\endcsname\@nil}% + \expandafter\expandafter\expandafter\vref@@pagenum + \csname r@#2\endcsname{}{}\@nil#1% +} +\def\vref@@pagenum#1#2#3\@nil#4{% + \def#4{#2}% } \def\vrefpagenum#1#2{% \@ifundefined{r@#2}% -- cgit v1.2.3