summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/tools/ftnright.sty13
-rw-r--r--Master/texmf-dist/tex/latex/tools/multicol.sty62
-rw-r--r--Master/texmf-dist/tex/latex/tools/varioref.sty34
-rw-r--r--Master/texmf-dist/tex/latex/tools/verbatim.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tools/verbtest.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tools/xspace.sty7
6 files changed, 97 insertions, 23 deletions
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
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 14:04:20 +0000