summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/sttools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-10-18 22:33:43 +0000
committerKarl Berry <karl@freefriends.org>2012-10-18 22:33:43 +0000
commit34c48d9566089694027f919d621fec0e075d1b84 (patch)
tree0d9a5e32bd2805eb15ed9a7444b9dfead77d58d9 /Master/texmf-dist/tex/latex/sttools
parentb2af3a5c5a7adb196a11e1d049a2162b4dd34a45 (diff)
sttools (19oct12)
git-svn-id: svn://tug.org/texlive/trunk@28013 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/sttools')
-rw-r--r--Master/texmf-dist/tex/latex/sttools/boundbox.sty188
-rw-r--r--Master/texmf-dist/tex/latex/sttools/cuted.sty346
-rw-r--r--Master/texmf-dist/tex/latex/sttools/floatpag.sty163
-rw-r--r--Master/texmf-dist/tex/latex/sttools/flushend.sty207
-rw-r--r--Master/texmf-dist/tex/latex/sttools/marginal.sty243
-rw-r--r--Master/texmf-dist/tex/latex/sttools/midfloat.sty97
-rw-r--r--Master/texmf-dist/tex/latex/sttools/stabular.sty174
-rw-r--r--Master/texmf-dist/tex/latex/sttools/stfloats.sty141
-rw-r--r--Master/texmf-dist/tex/latex/sttools/texsort.sty221
9 files changed, 904 insertions, 876 deletions
diff --git a/Master/texmf-dist/tex/latex/sttools/boundbox.sty b/Master/texmf-dist/tex/latex/sttools/boundbox.sty
index a08ac801f9e..1799613f736 100644
--- a/Master/texmf-dist/tex/latex/sttools/boundbox.sty
+++ b/Master/texmf-dist/tex/latex/sttools/boundbox.sty
@@ -1,85 +1,117 @@
-%% boundbox.sty
-%% Copyright 1997 Sigitas Tolu\v sis
+%%
+%% This is file `boundbox.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% boundbox.dtx (with options: `package')
+%%
+%% Copyright (C) 1997-2012 by Sigitas Tolu\v{s}is <sigitas@vtex.lt>
%% VTeX Ltd., Akademijos 4, Vilnius, Lithuania
-%% e-mail sigitas@vtex.lt
%% http://www.vtex.lt/tex/download/macros/
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% PURPOSE: Calculate TeX bounding box in rounded points (LaTeX2e)
+%% from left top corner of the paper
%%
-% This program can redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or (at your option) any later version.
-%
-% PURPOSE: Calculate TeX Bounding Box in points (LaTeX2e)
-%
-% SHORT DESCRIPTION:
-%
-% \@calculate
-% -----------
-% Internal macro \@calculate writes TeX box dimensions
-% to the token list \bound in such format:
-%
-% \bound{left=x1 top=y1 right=x2 bottom=y2}
-%
-% x1 - distance in points from the left side of paper
-% to the left side of TeX box
-% y1 - distance in points from the top of paper
-% to the top of TeX box (including head)
-% x2 - distance in points from the left side of paper
-% to the right side of TeX box
-% y2 - distance in points from the top of paper
-% to the bottom of TeX box
-% (including foot; with option "nofoot" without foot)
-%
-% \topoint#1#2
-% ------------
-% Dimension #1 in any unit of measure converts to value in points
-% and defines it to macro #2
-%
-% This package writes such special to DVI:
-% \special{mt:TeXBBox left=x1 top=y1 right=x2 bottom=y2}
-%
-%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{boundbox}[1998/02/24]
-%
+\ProvidesPackage{boundbox}
+ [2012/05/29 v1.3 Calculate TeX bounding box in points]
+%%
\newif\if@withfoot \@withfoottrue
+\newif\if@output@bbox@special \@output@bbox@specialtrue
\DeclareOption{nofoot}{\global\@withfootfalse}
+\DeclareOption{nospec}{\global\@output@bbox@specialfalse}
\ProcessOptions
-%
-\newtoks\bound \bound={}%
-\def\@@to#1#2{\begingroup
- \xdef\a@act{\global\noexpand#1{\the#1#2}}\a@act
-\endgroup}
-%
-\def\topoint#1#2{%
-\@tempdimb=#1
-\@tempcnta=\@tempdimb
-\multiply\@tempcnta by10
-\divide\@tempcnta by18647 \advance\@tempcnta by1
-\multiply\@tempcnta by72 \divide\@tempcnta by2540
-\expandafter\def\expandafter#2\expandafter{\the\@tempcnta}}
-%
-\def\@calculate{%
-\@tempdima=1in
-\advance\@tempdima by\hoffset
-\advance\@tempdima by\oddsidemargin
-\topoint{\@tempdima}{\@a}%
-\advance\@tempdima\textwidth
-\topoint{\@tempdima}{\@c}%
-\@tempdima=1in
-\advance\@tempdima by\voffset
-\advance\@tempdima by\topmargin
-\topoint{\@tempdima}{\@b}%
-\advance\@tempdima by\headheight
-\advance\@tempdima by\headsep
-\advance\@tempdima\textheight
-\if@withfoot
- \advance\@tempdima\footskip
-\fi
-\topoint{\@tempdima}{\@d}%
-\@tempcnta=\@d
-\expandafter\def\expandafter\@d\expandafter{\the\@tempcnta}%
-\@@to\bound{left=\@a\space top=\@b\space right=\@c\space bottom=\@d}%
-}
-\AtBeginDocument{\@calculate\special{mt:TeXBBox \the\bound}}
-\endinput \ No newline at end of file
+%%
+\def\special@bbox@odd@prefix{mt:TeXBBox:odd}
+\def\special@bbox@even@prefix{mt:TeXBBox:even}
+%%
+\def\roundtexdim#1#{\round@tex@dim{#1}}
+\def\round@tex@dim#1#2#3{%
+ \expandafter\expandafter\csname get@#1@pt@data\endcsname\the#2\to#3\relax
+ }
+\def\get@floor@pt@data#1.#2#3\to#4{%
+ \bgroup
+ \@tempcnta=#1\relax
+ \xdef#4{\the\@tempcnta}%
+ \egroup
+ }
+\def\get@round@pt@data#1.#2#3\to#4{%
+ \bgroup
+ \@tempcnta=#1\relax
+ \ifnum#2>4\relax
+ \advance\@tempcnta by\@ne
+ \fi
+ \xdef#4{\the\@tempcnta}%
+ \egroup
+ }
+\let\get@@pt@data\get@round@pt@data
+\def\get@ceil@pt@data#1.#2#3\to#4{%
+ \bgroup
+ \@tempcnta=#1\relax
+ \afterassignment\@gobbletwo
+ \@tempcntb=#2#3\relax
+ \ifnum\@tempcntb>0\relax
+ \advance\@tempcnta by\@ne
+ \fi
+ \xdef#4{\the\@tempcnta}%
+ \egroup
+ }
+\def\@calculate@bbox{%
+ \bgroup
+ \@tempdima=1in\relax
+ \advance\@tempdima by\hoffset
+ \advance\@tempdima by\oddsidemargin
+ \roundtexdim floor{\@tempdima}\bbox@odd@left@pt
+ \advance\@tempdima\textwidth
+ \roundtexdim ceil{\@tempdima}\bbox@odd@right@pt
+ \@tempdima=1in\relax
+ \advance\@tempdima by\hoffset
+ \advance\@tempdima by\evensidemargin
+ \roundtexdim floor{\@tempdima}\bbox@even@left@pt
+ \advance\@tempdima\textwidth
+ \roundtexdim ceil{\@tempdima}\bbox@even@right@pt
+ \@tempdima=1in\relax
+ \advance\@tempdima by\voffset
+ \advance\@tempdima by\topmargin
+ \roundtexdim floor{\@tempdima}\bbox@odd@top@pt
+ \global\let\bbox@even@top@pt\bbox@odd@top@pt
+ \advance\@tempdima by\headheight
+ \advance\@tempdima by\headsep
+ \advance\@tempdima\textheight
+ \if@withfoot
+ \advance\@tempdima\footskip
+ \fi
+ \roundtexdim ceil{\@tempdima}\bbox@odd@bottom@pt
+ \global\let\bbox@even@bottom@pt\bbox@odd@bottom@pt
+ \egroup
+ }
+%%
+\AtBeginDocument{%
+ \@calculate@bbox
+ \if@output@bbox@special
+ \special{\special@bbox@odd@prefix\space
+ left=\csname bbox@odd@left@pt\endcsname\space
+ top=\csname bbox@odd@top@pt\endcsname\space
+ right=\csname bbox@odd@right@pt\endcsname\space
+ bottom=\csname bbox@odd@bottom@pt\endcsname
+ }%
+ \special{\special@bbox@even@prefix\space
+ left=\csname bbox@even@left@pt\endcsname\space
+ top=\csname bbox@even@top@pt\endcsname\space
+ right=\csname bbox@even@right@pt\endcsname\space
+ bottom=\csname bbox@even@bottom@pt\endcsname
+ }%
+ \fi
+ }
+\endinput
+%%
+%% End of file `boundbox.sty'.
diff --git a/Master/texmf-dist/tex/latex/sttools/cuted.sty b/Master/texmf-dist/tex/latex/sttools/cuted.sty
index 3b60c518455..972720acffb 100644
--- a/Master/texmf-dist/tex/latex/sttools/cuted.sty
+++ b/Master/texmf-dist/tex/latex/sttools/cuted.sty
@@ -1,58 +1,46 @@
-%% cuted.sty
-%% Copyright 1997 Sigitas Tolu\v sis
+%%
+%% This is file `cuted.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% cuted.dtx (with options: `package')
+%%
+%% Copyright (C) 1997-2012 by Sigitas Tolu\v{s}is <sigitas@vtex.lt>
%% VTeX Ltd., Akademijos 4, Vilnius, Lithuania
-%% e-mail sigitas@vtex.lt
%% http://www.vtex.lt/tex/download/macros/
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% PURPOSE: Insert some onecolumn material in full-width on double-column page.
%%
-% This program can redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or (at your option) any later version.
-%
-% PURPOSE: Insert some onecolumn material in full-width on double-column page.
-%
-% SHORT DESCRIPTION:
-%
-% It is denoted to place some material in full-width at any place
-% on double-column page (\twocolumn mode). The part of material
-% can be placed on the next page. Existing text is placed
-% under inserted material in two columns (it is reformatted).
-%
-% Provides new environment:
-%
-% \begin{strip} ... \end{strip}
-% -----------------------------
-%
-% Puts \vbox{...} in full-width on double-column page.
-% Adds \stripsep glue before and after
-% (By default \stripsep=15pt plus2pt minus 2pt).
-% It can be problems with floats and footnotes. In the case of
-% problems with footnotes it is possible to correct the situation
-% using commands \footnotemark and \footnotetext.
-%
-% Provides new command:
-% \oldcolsbreak{#1}
-%
-% Adds #1 in place of original column break if strip is placed
-% on the right column.
-%
-% \changes{1997/09/02}{improved column balancing}
-% \changes{1997/09/03}{float control for \@colroom setting}
-% \changes{1997/09/04}{improved \@colroom setting}
-% \changes{1997/09/05}{checking for \@viper and \hold@viper}
-% \changes{1997/09/09}{compatibility with flushend.sty}
-% \changes{1997/09/22}{improved \output ir \@specialoutput}
-% \changes{1997/10/01}{improved \output ir \@addviper}
-%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cuted}[1997/10/01]
-%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{cuted}
+ [2012/10/04 v1.5 Mixing onecolumn and twocolumn modes]
+\def\on@stripcols@break{\hbox{}}
+\DeclareOption{unskipbreak}{\gdef\on@stripcols@break{\unskip}}
+\newif\if@flushend@auto@baselineskip
+\DeclareOption{autobase}{\global\@flushend@auto@baselineskiptrue}
+\ProcessOptions
+
\newtoks\At@ViperColsBreak \At@ViperColsBreak{}
\def\oldcolsbreak#1{\global\At@ViperColsBreak{#1}}
+\def\viper@top@hook{\splittopskip0pt plus 2pt}
+
\newbox\v@aaa
\newbox\v@ccc
-\@ifundefined{stripsep}{\newskip\stripsep\stripsep 15pt plus 2pt minus 2pt}{}
-%
+\@ifundefined{lastskip@a}{\newskip\lastskip@a}{}
+\@ifundefined{lastskip@b}{\newskip\lastskip@b}{}
+\@ifundefined{lastskip@d}{\newskip\lastskip@d}{}
+\@ifundefined{lastbox@a}{\newbox\lastbox@a}{}
+\@ifundefined{stripsep}{\newskip\stripsep \stripsep 15pt plus 2pt minus 2pt}{}
+
\@ifundefined{@viper}{\newbox\@viper}{}
\newif\if@lastviper \@lastviperfalse
\def\@outputdblcol{%
@@ -74,7 +62,11 @@
}%
\ifvoid\hold@viper
\else
- \setbox\@outputbox \vbox{\box\hold@viper\box\@outputbox}%
+ \setbox\@outputbox \vbox to\textheight{%
+ \box\hold@viper
+ \box\@outputbox
+ \vss
+ }%
\fi
\@combinedblfloats
\@outputpage
@@ -87,11 +79,14 @@
\ifvoid\@viper
\else
\global\setbox\@viper\vbox{%
- \vskip-\stripsep\unvbox\@viper}\@viperoutput
+ \vskip-\stripsep
+ \unvbox\@viper
+ }%
+ \@viperoutput
\fi
\endgroup
\fi
-}
+ }
\mathchardef\@Mv=10005
\newcount\viper@penalty
\def\strip{%
@@ -104,18 +99,24 @@
\hsize\textwidth
\@parboxrestore
\col@number \@ne
- \vrule height\topskip width0pt depth0pt
-}
+ \vrule height\topskip width\z@ depth\z@
+ }
\def\endstrip{%
- \egroup
+ \egroup
\ifnum\viper@penalty <-\@Mii
\penalty -\@Miv
- \@tempdima\prevdepth %% saving and restoring \prevdepth added
- \vbox{}% %% 26 May 87 to prevent extra vertical
- \prevdepth \@tempdima %% space when used in vertical mode
- \penalty-\@Mv\relax
+ \ifvmode
+ \@tempdima\prevdepth %% saving and restoring \prevdepth added
+ \vbox{}% %% 26 May 87 to prevent extra vertical
+ \prevdepth\@tempdima %% space when used in vertical mode
+ \penalty-\@Mv\relax
+ \else
+ \par
+ \penalty-\@Mv\relax
+ \noindent
+ \fi
\fi
-}
+ }
\gdef\@viperoutput{%
\global \setbox\@holdpg \vbox{%
\unvbox\@holdpg
@@ -140,14 +141,14 @@
\@reinserts
\@addviper
\fi
-}
+ }
\gdef\@specialoutput{%
\ifnum \outputpenalty>-\@Mii
\@doclearpage
\else
\ifnum \outputpenalty<-\@Miii
\ifnum \outputpenalty<-\@MM \deadcycles \z@ \fi
- \ifnum \outputpenalty=-10005
+ \ifnum \outputpenalty=-\@Mv
\@viperoutput
\ifnum \outputpenalty<\z@
\if@nobreak
@@ -196,9 +197,9 @@
\fi
\fi
\fi
-}
+ }
\@ifundefined{hold@viper}{\newbox\hold@viper}{}
-\newdimen\ht@viper
+\newdimen\ht@viper
\def \@addviper {%
\if@firstcolumn
\@insertfalse
@@ -207,28 +208,27 @@
\advance \@reqcolroom \ht\@viper
\advance \@reqcolroom \stripsep
\ifvoid\hold@viper\@tempdima=\z@\else\@tempdima\ht\hold@viper\fi
-%
+%%
\@tempdimb \ht@viper
\loop
\setbox\v@aaa\copy\@holdpg
\setbox\v@ccc\vbox to\@tempdimb{%
\vsplit\v@aaa to\@tempdimb\vss\vsplit\v@aaa to\@tempdimb}%
\wlog{Extra height:\the\ht\v@aaa\space when \the\@tempdimb}%
- \ifvoid\v@aaa \else \advance\@tempdimb 1pt \repeat%
+ \ifvoid\v@aaa \else \advance\@tempdimb 1pt \repeat
\loop
\setbox\v@aaa\copy\@holdpg
\setbox\v@ccc\vbox to\@tempdimb{%
\vsplit\v@aaa to\@tempdimb\vss}%
\wlog{(2)Left:\the\ht\v@ccc\space Right:\the\ht\v@aaa\space Output:\the\@tempdimb}%
- \ifdim \ht\v@ccc<\ht\v@aaa \@tempdimb \the\ht\v@aaa \repeat%
+ \ifdim \ht\v@ccc<\ht\v@aaa \@tempdimb \the\ht\v@aaa \repeat
\wlog{- LAST -^^JLeft:\the\ht\v@ccc^^JRight:\the\ht\v@aaa^^JOutput:\the\@tempdimb}%
\setbox\v@ccc\vbox to\@tempdimb{%
\vsplit\@holdpg to\@tempdimb\vss}%
-%
+%%
\setbox\@tempboxa \vbox {%
\hb@xt@\textwidth {%
\hb@xt@\columnwidth {%
-% \vbox to\ht@viper{\vsplit\@holdpg to\ht@viper\vss} \hss}%
\vbox to\ht@viper{\box\v@ccc\vss} \hss}%
\hfil
\vrule \@width\columnseprule
@@ -306,41 +306,101 @@
\@reqcolroom\ht@viper
\advance \@reqcolroom \ht\@viper
\advance \@reqcolroom \stripsep
- \global\setbox\@holdpg\vbox{\unvbox\@leftcolumn
- \setbox\@tempboxa\lastbox\unskip\the\At@ViperColsBreak\unvbox\@holdpg}%
+ \if@flushend@auto@baselineskip
+ \setbox\@tempboxa\vbox{\unvcopy\@leftcolumn
+ \global\lastskip@d\lastskip
+ \global\lastskip@b\lastskip
+ \loop
+ \global\lastskip@a\lastskip@b
+ \unskip\unpenalty
+ \global\lastskip@b\lastskip
+ \global\advance\lastskip@d by\lastskip
+ \ifdim\lastskip@b=-\lastskip@a
+ \global\advance\lastskip@d by-\lastskip
+ \else
+ \repeat
+ \ifdim\lastskip@b=-\lastskip@a
+ \ifdim\lastskip@b=\z@
+ \setbox\lastbox@a\lastbox
+ \global\advance\lastskip@d by\ht\lastbox@a
+ \global\advance\lastskip@d by\lastskip
+ \unskip\unpenalty
+ \setbox\lastbox@a\lastbox
+ \global\advance\lastskip@d by\dp\lastbox@a
+ \else
+ \global\lastskip@d\lastskip
+ \global\advance\lastskip@d by\topskip
+ \fi
+ \fi
+ \global\advance\lastskip@d by-\topskip
+ }%
+ \ifdim\ht\@holdpg>\@colht
+ \global\setbox\@holdpg\vbox{\unvbox\@leftcolumn\unskip\unpenalty
+ \par\eject
+ \vbox to \@colht{\unvbox\@holdpg\unskip}%
+ }%
+ \else
+ \global\setbox\@holdpg\vbox{%
+ \unvbox\@leftcolumn\unskip\unpenalty
+ \vskip\lastskip@d
+ \the\At@ViperColsBreak
+ \unvbox\@holdpg
+ \unskip
+ }%
+ \fi
+ \else
+ \global\setbox\@holdpg\vbox{%
+ \unvbox\@leftcolumn
+ \setbox\@tempboxa\lastbox
+ \on@stripcols@break
+ \the\At@ViperColsBreak
+ \unvbox\@holdpg
+ }%
+ \fi
\global\At@ViperColsBreak{}%
\ht@viper .5\ht\@holdpg
+ \ifdim \ht@viper>\@colht
+ \ht@viper \@colht
+ \fi
\ifvoid\hold@viper\@tempdima=\z@\else\@tempdima\ht\hold@viper\fi
-%
+%%
\@tempdimb \ht@viper
\loop
- \setbox\v@aaa\copy\@holdpg
- \setbox\v@ccc\vbox to\@tempdimb{%
- \vsplit\v@aaa to\@tempdimb\vss\vsplit\v@aaa to\@tempdimb}%
- \wlog{Extra height:\the\ht\v@aaa\space when \the\@tempdimb}%
- \ifvoid\v@aaa \else \advance\@tempdimb 1pt \repeat%
+ \setbox\v@aaa\copy\@holdpg
+ \setbox\v@ccc\vbox to\@tempdimb{%
+ \vsplit\v@aaa to\@tempdimb
+ \vss
+ \vsplit\v@aaa to\@tempdimb
+ }%
+ \wlog{Extra height:\the\ht\v@aaa\space when \the\@tempdimb}%
+ \ifvoid\v@aaa
+ \else
+ \advance\@tempdimb 1\p@
+ \repeat
\loop
- \setbox\v@aaa\copy\@holdpg
- \setbox\v@ccc\vbox to\@tempdimb{%
- \vsplit\v@aaa to\@tempdimb\vss}%
- \wlog{(2)Left:\the\ht\v@ccc\space Right:\the\ht\v@aaa\space Output:\the\@tempdimb}%
- \ifdim \ht\v@ccc<\ht\v@aaa \@tempdimb \the\ht\v@aaa \repeat%
- \wlog{- LAST -^^JLeft:\the\ht\v@ccc^^JRight:\the\ht\v@aaa^^JOutput:\the\@tempdimb}%
- \setbox\v@ccc\vbox to\@tempdimb{%
- \vsplit\@holdpg to\@tempdimb\vss}%
-%
+ \setbox\v@aaa\copy\@holdpg
+ \setbox\v@ccc\vbox to\@tempdimb{\vsplit\v@aaa to\@tempdimb\vss}%
+ \wlog{(2)Left:\the\ht\v@ccc\space
+ Right:\the\ht\v@aaa\space
+ Output:\the\@tempdimb
+ }%
+ \ifdim\ht\v@ccc<\ht\v@aaa
+ \@tempdimb \the\ht\v@aaa
+ \repeat
+ \wlog{- LAST -^^JLeft:\the\ht\v@ccc
+ ^^JRight:\the\ht\v@aaa
+ ^^JOutput:\the\@tempdimb
+ }%
+ \setbox\v@ccc\vbox to\@tempdimb{\vsplit\@holdpg to\@tempdimb\vss}%
\setbox\@tempboxa\vbox{%
\hb@xt@\textwidth {%
- \hb@xt@\columnwidth {%
-% \vbox to\ht@viper{\vsplit\@holdpg to \ht@viper\vss} \hss}%
- \vbox to\ht@viper{\box\v@ccc\vss} \hss}%
- \hfil
- \vrule \@width\columnseprule
- \hfil
- \hb@xt@\columnwidth {%
- \vbox to\ht@viper{\box\@holdpg\vss} \hss}%
- }%
- }%
+ \hb@xt@\columnwidth{\vbox to\ht@viper{\box\v@ccc\vss} \hss}%
+ \hfil
+ \vrule \@width\columnseprule
+ \hfil
+ \hb@xt@\columnwidth {\vbox to\ht@viper{\box\@holdpg\vss} \hss}%
+ }%
+ }%
\ifvoid\hold@viper
\global\setbox\hold@viper \vbox {%
\unvbox\@tempboxa
@@ -351,7 +411,7 @@
}%
\else
\global\setbox\hold@viper \vbox {%
- \unvbox\hold@viper
+ \unvbox\hold@viper
\unvbox\@tempboxa
\penalty\interlinepenalty
\vskip\stripsep
@@ -373,61 +433,63 @@
\advance\@tempdima by-\ht\hold@viper
\global \advance \@colht \@tempdima
\ifdim \@colht<2.5\baselineskip
- \@latex@warning@no@line {Optional argument of \noexpand\twocolumn
- too tall on page \thepage (2 stulpelis)}%
+ \@latex@warning@no@line {Optional argument of \noexpand\twocolumn
+ too tall on page \thepage (2 stulpelis)}%
+ \@emptycol
+ \if@firstcolumn
+ \else
+ \@emptycol
+ \fi
+ \global\@lastvipertrue
+ \else
+ \global \vsize \@colht
+ \global \@colroom \@colht
+ \check@floats
+ \ifdim\@tempdima>\z@
+ \global\advance\@colroom by-\@tempdima
+ \fi
+ \ifdim\@colroom<\z@
+ \global\@colroom 1pt
+ \ifdim\@tempdima>\@colht
+ \@latex@warning@no@line {TOP ir/ar BOT FLOAT's
+ netelpa lape \thepage (2 stulpelis)}%
+ \fi
\@emptycol
\if@firstcolumn
\else
- \@emptycol
+ \@emptycol
\fi
\global\@lastvipertrue
- \else
- \global \vsize \@colht
- \global \@colroom \@colht
- \check@floats
- \ifdim\@tempdima>\z@
- \global\advance\@colroom by-\@tempdima
- \fi
- \ifdim\@colroom<\z@
- \global\@colroom 1pt
- \ifdim\@tempdima>\@colht
- \@latex@warning@no@line {TOP ir/ar BOT FLOAT's
- netelpa lape \thepage (2 stulpelis)}%
- \fi
- \@emptycol
- \if@firstcolumn
- \else
- \@emptycol
- \fi
- \global\@lastvipertrue
- \fi
+ \fi
\fi
\fi
\fi
\if@insert
\else
- \advance\@tempdima by-\ht\hold@viper
- \global \advance \@colht \@tempdima
- \global\setbox\hold@viper \vbox {%
- \unvbox\hold@viper
- \vsplit\@viper to \@colht
- \vss
- }%
- \vbox{}%
- \global\@firstcolumnfalse
- \newpage
+ \advance\@tempdima by-\ht\hold@viper
+ \global \advance \@colht \@tempdima
+ \global\setbox\hold@viper \vbox {%
+ \unvbox\hold@viper
+ \csname viper@top@hook\endcsname
+ \vsplit\@viper to \@colht
+ \vss
+ }%
+ \vbox{}%
+ \global\@firstcolumnfalse
+ \newpage
\fi
-}
+ }
-\def \check@floats {%
+\def\check@floats{%
\global\@tempdima\z@
- \let \@elt \ht@comflelt
- \ifx \@toplist\@empty \else\@toplist \fi
- \ifx \@botlist\@empty \else\@botlist \fi
-}
-\def\ht@comflelt#1{\setbox\@tempboxa\vbox{\copy #1\vskip\floatsep}%
-\global\advance\@tempdima\ht\@tempboxa}
-
+ \let\@elt\ht@comflelt
+ \ifx\@toplist\@empty \else \@toplist \fi
+ \ifx\@botlist\@empty \else \@botlist \fi
+ }
+\def\ht@comflelt#1{%
+ \setbox\@tempboxa\vbox{\copy #1\vskip\floatsep}%
+ \global\advance\@tempdima by\ht\@tempboxa
+ }
\output {%
\let \par \@@par
\ifnum \outputpenalty<-\@M
@@ -466,9 +528,7 @@
\global \vsize \@colroom
\fi
\fi
-}
+ }
\endinput
-
-
-
-
+%%
+%% End of file `cuted.sty'.
diff --git a/Master/texmf-dist/tex/latex/sttools/floatpag.sty b/Master/texmf-dist/tex/latex/sttools/floatpag.sty
index 9dbc540c484..98b32de3206 100644
--- a/Master/texmf-dist/tex/latex/sttools/floatpag.sty
+++ b/Master/texmf-dist/tex/latex/sttools/floatpag.sty
@@ -1,56 +1,50 @@
-%% floatpag.sty
-%% Copyright 1999 V. Statulevi\v cius
+%%
+%% This is file `floatpag.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% floatpag.dtx (with options: `package')
+%%
+%% Copyright (C) 1999-2012 by Vytas Statulevi\v{c}ius <vytas@vtex.lt>
%% VTeX Ltd., Akademijos 4, Vilnius, Lithuania
-%% e-mail vytas@vtex.lt
%% http://www.vtex.lt/tex/download/macros/
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% The macros, developed by Sigitas Tolu\v{s}is <sigitas@vtex.lt>,
+%% were used in this package.
%%
-% This program can redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or (at your option) any later version.
-%
-% PURPOSE: provides commands to apply different pagestyles
-% to the full page floats.
-%
-% USAGE:
-% \floatpagestyle{foo} will apply pagestyle 'foo' to all pages
-% occupied by full page floats.
-%
-% \rotfloatpagestyle{foo} will apply pagestyle 'foo' to all pages
-% occupied by sideways figures and tables
-% produced with the help of 'rotating.sty'
-% package (Sebastian Rahtz and Leonor Barroca)
-%
-% \thisfloatpagestyle{foo} will apply pagestyle 'foo' to a page where
-% this command was used inside figure or table
-% environment
-%
-% DEFAULT:
-% \floatpagestyle{headings}
-% \rotfloatpagestyle{plain}
-%
-% The macros, developed by Sigitas Tolusis <sigitas@vtex.lt>,
-% were used in this package.
-%
-% The following commands from the LaTeX2e kernel were redefined:
-% \@xfloat, \@vtryfc
-% The following command from the rotating.sty was redefined:
-% \@xrotfloat
-%
+%% The Current Maintainer of this work is Sigitas Tolu\v{s}is.
+%%
+%% PURPOSE: provides commands to apply different pagestyles
+%% to the full page floats.
+%%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{floatpag}
+ [2012/05/29 v1.1 Different pagestyles on float pages]
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{floatpag}
[1999/04/29
FLOAT PAGESTYLE]
\def\floatpagestyle#1{\gdef\at@float@page{\thispagestyle{#1}}}
-\def\rotfloatpagestyle#1{\gdef\@r@f@pagestyle{#1}\gdef\at@rotfloat@page{\thispagestyle{#1}}}
+\def\rotfloatpagestyle#1{%
+ \gdef\@r@f@pagestyle{#1}%
+ \gdef\at@rotfloat@page{\thispagestyle{#1}}%
+ }
\floatpagestyle{headings}
\rotfloatpagestyle{plain}
-%
\def\thisfloatpagestyle#1{%
- \expandafter\expandafter\expandafter\gdef\expandafter
- \csname\number\@currbox @float\endcsname{\thispagestyle{#1}}\relax}
-%
-% Perrabibreziame \x@float - paprasti float'ai
+ \expandafter\expandafter\expandafter\gdef\expandafter
+ \csname\number\@currbox @float\endcsname{\thispagestyle{#1}}\relax
+ }
+%% Modify |\x@float| - ordinary floats
\def\@xfloat #1[#2]{%
\@nodocument
\def \@captype {#1}%
@@ -106,7 +100,7 @@
\advance \@tempcnta \@tempcntb
\global \count\@currbox \@tempcnta
\expandafter\expandafter\expandafter\gdef\expandafter
- \csname\number\@currbox @float\endcsname{\at@float@page}\relax
+ \csname\number\@currbox @float\endcsname{\at@float@page}\relax
}%
\@fltovf
\fi
@@ -117,47 +111,55 @@
\hsize\columnwidth
\@parboxrestore
\@floatboxreset
-}%
-%
-% 2e rotating.sty v. 2.10:
+ }
+%% 2e rotating.sty v. 2.10:
\def\e@xrotfloat#1[#2]{%
\@float{#1}[#2]%
\thisfloatpagestyle{\@r@f@pagestyle}%
\begin{lrbox}\rot@float@box
\begin{minipage}\textheight
- }
-
-% 2.09 rotating.sty v. 1.6
-\def\n@xrotfloat#1[#2]{\ifhmode \@bsphack\@floatpenalty -\@Mii\else
- \@floatpenalty-\@Miii\fi\def\@captype{#1}\ifinner
- \@parmoderr\@floatpenalty\z@
- \else\@next\@currbox\@freelist{\@tempcnta\csname ftype@#1\endcsname
- \multiply\@tempcnta\@xxxii\advance\@tempcnta\sixt@@n
- \@tfor \@tempa :=#2\do
- {\if\@tempa h\advance\@tempcnta \@ne\fi
- \if\@tempa t\advance\@tempcnta \tw@\fi
- \if\@tempa b\advance\@tempcnta 4\relax\fi
- \if\@tempa p\advance\@tempcnta 8\relax\fi
- }\global\count\@currbox\@tempcnta}\@fltovf\fi
- \expandafter\expandafter\expandafter\gdef\expandafter\csname\number\@currbox
- @float\endcsname{\at@rotfloat@page}\relax
- \global\setbox\@currbox\vbox\bgroup
- \hsize\textheight \@parboxrestore
-}%
-%
-% Tikrinam, kokia rotating versija: 2e ar 209:
-% 1999.02.08 Tikriname dokumento pradzioje, t.y. neaisku
-% kada rotating stilius buvo pakrautas:
+ }
+%% 2.09 rotating.sty v. 1.6
+\def\n@xrotfloat#1[#2]{%
+ \ifhmode
+ \@bsphack
+ \@floatpenalty -\@Mii
+ \else
+ \@floatpenalty-\@Miii
+ \fi
+ \def\@captype{#1}%
+ \ifinner
+ \@parmoderr\@floatpenalty\z@
+ \else
+ \@next\@currbox\@freelist{\@tempcnta\csname ftype@#1\endcsname
+ \multiply\@tempcnta\@xxxii\advance\@tempcnta\sixt@@n
+ \@tfor \@tempa :=#2\do{%
+ \if\@tempa h\advance\@tempcnta \@ne\fi
+ \if\@tempa t\advance\@tempcnta \tw@\fi
+ \if\@tempa b\advance\@tempcnta 4\relax\fi
+ \if\@tempa p\advance\@tempcnta 8\relax\fi
+ }%
+ \global\count\@currbox\@tempcnta
+ }%
+ \@fltovf
+ \fi
+ \expandafter\expandafter\expandafter\gdef\expandafter
+ \csname\number\@currbox @float\endcsname{\at@rotfloat@page}\relax
+ \global\setbox\@currbox\vbox\bgroup
+ \hsize\textheight
+ \@parboxrestore
+ }
+%% Check for |rotating| version: 2e ar 209:
+%% 1999.02.08 To be sure check at begin document.
\AtBeginDocument{%
\@ifpackageloaded{rotating}%
{\let\@xrotfloat\e@xrotfloat\let\n@xrotfloat\relax}%
{\let\@xrotfloat\n@xrotfloat\let\e@xrotfloat\relax}}%
-%
-%% "Kablys" output proceduroje ivykdantis komanda
-\def\spec@float #1{\expandafter\csname\number#1@float\endcsname
- \expandafter\expandafter\expandafter\gdef\expandafter\csname\number#1@float\endcsname{}}
-
-\def\@vtryfc #1{%
+%% "Hook" in the output procedure.
+\def\spec@float#1{\expandafter\csname\number#1@float\endcsname
+ \expandafter\expandafter\expandafter\gdef\expandafter\csname\number#1@float\endcsname{}%
+ }
+\def\@vtryfc#1{%
\global\setbox\@outputbox\vbox{}%
\let\@elt\@wtryfc
\@flsucceed
@@ -167,9 +169,12 @@
\vskip \@fptop
\vskip -\@fpsep
\unvbox \@outputbox
- \vskip \@fpbot}%
+ \vskip \@fpbot
+ }%
\let\@elt\relax
- \xdef #1{\@failedlist\@flfail}%
- \xdef\@freelist{\@freelist\@flsucceed}}
-
+ \xdef#1{\@failedlist\@flfail}%
+ \xdef\@freelist{\@freelist\@flsucceed}%
+ }
\endinput
+%%
+%% End of file `floatpag.sty'.
diff --git a/Master/texmf-dist/tex/latex/sttools/flushend.sty b/Master/texmf-dist/tex/latex/sttools/flushend.sty
index 83e3186a6c6..486986bd6e2 100644
--- a/Master/texmf-dist/tex/latex/sttools/flushend.sty
+++ b/Master/texmf-dist/tex/latex/sttools/flushend.sty
@@ -1,49 +1,30 @@
-%% flushend.sty
-%% Copyright 1997 Sigitas Tolu\v sis
+%%
+%% This is file `flushend.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% flushend.dtx (with options: `package')
+%%
+%% Copyright (C) 1997-2012 by Sigitas Tolu\v{s}is <sigitas@vtex.lt>
%% VTeX Ltd., Akademijos 4, Vilnius, Lithuania
-%% e-mail sigitas@vtex.lt
%% http://www.vtex.lt/tex/download/macros/
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
-% This program can redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or (at your option) any later version.
-%
-% PURPOSE: Balanced columns on last page in twocolumn mode.
-%
-% SHORT DESCRIPTION:
-%
-% \flushend (loaded by default)
-% ---------
-% Switches on column balancing at last page
-%
-% \raggedend
-% ----------
-% Switches off column balancing at last page
-%
-% \atColsBreak={#1}
-% ------------------
-% Adds #1 in place of original column break (without balancing)
-% Example: \atColsBreak{\vskip-2pt}
-%
-% \showcolsendrule
-% ----------------
-% Adds rule to the bottom of columns (just for debugging)
-%
-% P.S. To stretch right column by #1 add command \vskip-#1 just before
-% command \end{document}.
-% TO shrink right column by #1 add command \vskip#1 just before
-% command \end{document}.
-% Example: \vskip-10pt
-% \end{document}
-%
-% \changes{1997/05/16}{first version}
-% \changes{1997/09/09}{support for compatibility with cuted.sty}
-% \changes{1997/10/01}{\vipersep changed to \stripsep for compatibility with cuted.sty}
-%
+%% PURPOSE: Balanced columns on last page in twocolumn mode.
+%%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{flushend}
+ [2012/05/29 v1.1 Balancing columns at last page]
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{flushend}[1997/10/01]
-%
\newbox\@aaa
\newbox\@ccc
\@ifundefined{@viper}{\newbox\@viper}{}
@@ -61,56 +42,78 @@
\@tempdima\ht\@leftcolumn
\splittopskip\topskip\splitmaxdepth\maxdepth
\setbox\@tempboxa\vbox{%
- \unvbox\@leftcolumn\setbox0\lastbox\unskip%
- \the\atColsBreak%
- \unvbox\@outputbox\setbox0\lastbox\unskip}%
- \@tempdimb .5\ht\@tempboxa%
- \loop
- \setbox\@aaa\copy\@tempboxa%
- \setbox\@ccc\vbox to\@tempdimb{%
- \vsplit\@aaa to\@tempdimb\vss\vsplit\@aaa to\@tempdimb}%
- \wlog{Extra height:\the\ht\@aaa\space when \the\@tempdimb}%
- \ifvoid\@aaa \else \advance\@tempdimb 1pt \repeat%
- \loop
- \setbox\@aaa\copy\@tempboxa%
- \setbox\@ccc\vbox to\@tempdimb{%
- \vsplit\@aaa to\@tempdimb\vss}%
- \wlog{(2)Left:\the\ht\@ccc\space Right:\the\ht\@aaa\space Output:\the\@tempdimb}%
- \ifdim \ht\@ccc<\ht\@aaa \@tempdimb \the\ht\@aaa \repeat%
- \wlog{- LAST -^^JExtra skip:\the\@extra@skip^^JLeft:\the\ht\@ccc^^JRight:\the\ht\@aaa^^JOutput:\the\@tempdimb}%
- \setbox\@ccc\vbox to\@tempdimb{%
- \vsplit\@tempboxa to\@tempdimb\vss}%
- \setbox\@leftcolumn\vbox to\@tempdima{%
- \vbox to\@tempdimb{\unvbox\@ccc}%
- \hrule\@height\@nd@page@rule%
- \vss}%
- \setbox\@outputbox\vbox to\@tempdima{%
- \vbox to\@tempdimb{\unvbox\@tempboxa\vfilneg\vskip\@extra@skip}%
- \hrule\@height\@nd@page@rule%
- \vss}%
- \setbox\@outputbox \vbox {%
- \hb@xt@\textwidth {%
- \hb@xt@\columnwidth {%
- \box\@leftcolumn \hss}%
- \hfil
- \vrule \@width\columnseprule
- \hfil
- \hb@xt@\columnwidth {%
- \box\@outputbox \hss}%
- }%
- }%
+ \unvbox\@leftcolumn\setbox0\lastbox\unskip
+ \the\atColsBreak
+ \unvbox\@outputbox\setbox0\lastbox\unskip
+ }%
+ \@tempdimb .5\ht\@tempboxa
+ \loop
+ \setbox\@aaa\copy\@tempboxa
+ \setbox\@ccc\vbox to\@tempdimb{%
+ \vsplit\@aaa to\@tempdimb
+ \vss
+ \vsplit\@aaa to\@tempdimb
+ }%
+ \wlog{Extra height:\the\ht\@aaa\space when \the\@tempdimb}%
+ \ifvoid\@aaa
+ \else
+ \advance\@tempdimb 1\p@
+ \repeat
+ \loop
+ \setbox\@aaa\copy\@tempboxa
+ \setbox\@ccc\vbox to\@tempdimb{%
+ \vsplit\@aaa to\@tempdimb
+ \vss
+ }%
+ \wlog{(2)Left:\the\ht\@ccc\space
+ Right:\the\ht\@aaa\space
+ Output:\the\@tempdimb
+ }%
+ \ifdim \ht\@ccc<\ht\@aaa
+ \@tempdimb \the\ht\@aaa
+ \repeat
+ \wlog{- LAST -^^JExtra skip:\the\@extra@skip
+ ^^JLeft:\the\ht\@ccc
+ ^^JRight:\the\ht\@aaa
+ ^^JOutput:\the\@tempdimb
+ }%
+ \setbox\@ccc\vbox to\@tempdimb{%
+ \vsplit\@tempboxa to\@tempdimb
+ \vss
+ }%
+ \setbox\@leftcolumn\vbox to\@tempdima{%
+ \vbox to\@tempdimb{\unvbox\@ccc}%
+ \hrule\@height\@nd@page@rule
+ \vss
+ }%
+ \setbox\@outputbox\vbox to\@tempdima{%
+ \vbox to\@tempdimb{%
+ \unvbox\@tempboxa
+ \vfilneg
+ \vskip\@extra@skip
+ }%
+ \hrule\@height\@nd@page@rule
+ \vss
+ }%
+ \setbox\@outputbox \vbox {%
+ \hb@xt@\textwidth {%
+ \hb@xt@\columnwidth {\box\@leftcolumn \hss}%
+ \hfil
+ \vrule \@width\columnseprule
+ \hfil
+ \hb@xt@\columnwidth {\box\@outputbox \hss}%
+ }%
+ }%
\else
- \setbox\@outputbox \vbox {%
- \hb@xt@\textwidth {%
- \hb@xt@\columnwidth {%
- \box\@leftcolumn \hss}%
- \hfil
- \vrule \@width\columnseprule
- \hfil
- \hb@xt@\columnwidth {%
- \box\@outputbox \hss}%
- }%
- }%
+ \setbox\@outputbox \vbox {%
+ \hb@xt@\textwidth {%
+ \hb@xt@\columnwidth {\box\@leftcolumn \hss}%
+ \hfil
+ \vrule \@width\columnseprule
+ \hfil
+ \hb@xt@\columnwidth {\box\@outputbox \hss}%
+ }%
+ }%
\fi
\ifvoid\hold@viper
\else
@@ -122,20 +125,34 @@
\@dblfloatplacement
\@startdblcolumn
\@whilesw\if@fcolmade \fi
- {\@outputpage
- \@startdblcolumn}%
+ {\@outputpage \@startdblcolumn}%
\ifvoid\@viper
\else
\global\setbox\@viper\vbox{%
- \vskip-\stripsep\unvbox\@viper}\@viperoutput
+ \vskip-\stripsep
+ \unvbox\@viper
+ }%
+ \@viperoutput
\fi
\endgroup
\fi
}
\let\prev@enddocument\enddocument
\newif\if@lastpage \@lastpagefalse
-\def\enddocument{\global\@lastpagetrue\let\@outputdblcol\last@outputdblcol\prev@enddocument}
+\def\enddocument{%
+ \global\@lastpagetrue
+ \let\@outputdblcol\last@outputdblcol
+ \prev@enddocument
+ }
\def\raggedend{\global\let\enddocument\prev@enddocument}
-\def\flushend{\gdef\enddocument{\global\@lastpagetrue\let\@outputdblcol\last@outputdblcol\prev@enddocument}}
+\def\flushend{%
+ \gdef\enddocument{%
+ \global\@lastpagetrue
+ \let\@outputdblcol\last@outputdblcol
+ \prev@enddocument
+ }%
+ }
\def\showcolsendrule{\global\@nd@page@rule=.4pt}
\endinput
+%%
+%% End of file `flushend.sty'.
diff --git a/Master/texmf-dist/tex/latex/sttools/marginal.sty b/Master/texmf-dist/tex/latex/sttools/marginal.sty
index 58b2fb373ce..40378958876 100644
--- a/Master/texmf-dist/tex/latex/sttools/marginal.sty
+++ b/Master/texmf-dist/tex/latex/sttools/marginal.sty
@@ -1,53 +1,54 @@
-%% marginal.sty
-%% Copyright 1997 Sigitas Tolu\v sis
+%%
+%% This is file `marginal.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% marginal.dtx (with options: `package')
+%%
+%% Copyright (C) 1997-2012 by Sigitas Tolu\v{s}is <sigitas@vtex.lt>
%% VTeX Ltd., Akademijos 4, Vilnius, Lithuania
-%% e-mail sigitas@vtex.lt
%% http://www.vtex.lt/tex/download/macros/
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% PURPOSE: Enlarge free and show lost marginal inserts.
%%
-% This program can redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or (at your option) any later version.
-%
-% PURPOSE: Enlarge free and show lost marginal inserts
-%
-% SHORT DESCRIPTION:
-%
-% \showlostmarginals
-% ------------------
-% Outputs lost marginal notes at the left of page
-%
-% \enlargefreelist
-% ----------------
-% Adds more(34) free inserts to freelist
-%
-% \onesidemarginals
-% -----------------
-% Outputs marginal notes only on one side. It saves one half
-% of the available free inserts.
-%
-\ProvidesPackage{marginal}[1997/04/01]
-%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{marginal}
+ [2012/05/29 v1.1 Enlarge free and show lost marginal inserts]
\newif\if@mparlost \@mparlostfalse
-%
\newbox\@mparlostbox
\setbox\@mparlostbox\vbox{}
-%
-\gdef\@fltovfpar{\global\@mparlosttrue%
- \@latex@warning{Too many unprocessed (marginal)floats}\relax}
+\gdef\@fltovfpar{\global\@mparlosttrue
+ \@latex@warning{Too many unprocessed (marginal)floats}\relax
+ }
\gdef\@fltovfmess{%
- \@latex@error{Too many unprocessed floats}\@ehb}
-%
-\def\marginpar{\ifhmode \@bsphack\@floatpenalty -\@Mii\else
- \@floatpenalty-\@Miii\fi\ifinner
- \@parmoderr\@floatpenalty\z@
- \else\@next\@currbox\@freelist{}{}\@next\@marbox\@freelist{\global
- \count\@marbox\m@ne}{\@floatpenalty\z@ \@fltovfmess
- \def\@currbox{\@tempboxa}\def\@marbox{\@tempboxa}}\fi
- \@ifnextchar [\@xmpar\@ympar}
-%
-\long\def \@savemarbox #1#2{%
- \global\setbox #1%
+ \@latex@error{Too many unprocessed floats}\@ehb
+ }
+\def\marginpar{%
+ \ifhmode
+ \@bsphack\@floatpenalty -\@Mii
+ \else
+ \@floatpenalty-\@Miii
+ \fi
+ \ifinner
+ \@parmoderr\@floatpenalty\z@
+ \else
+ \@next\@currbox\@freelist{}{}%
+ \@next\@marbox\@freelist{\global\count\@marbox\m@ne}{\@floatpenalty\z@
+ \@fltovfmess \def\@currbox{\@tempboxa}\def\@marbox{\@tempboxa}}%
+ \fi
+ \@ifnextchar[\@xmpar\@ympar
+ }
+\long\def\@savemarbox#1#2{%
+ \global\setbox#1%
\color@vbox
\vtop{%
\hsize\marginparwidth
@@ -57,75 +58,48 @@
\global\@minipagefalse
\outer@nobreak
}%
- \color@endbox%
- \if@mparlost\global\setbox\@mparlostbox\vbox{\unvbox\@mparlostbox\copy#1}%
- \global\@mparlostfalse\fi
-}
-%
-% \showlostmarginals - outputs lost marginal notes at the left of the page
-%
+ \color@endbox
+ \if@mparlost
+ \global\setbox\@mparlostbox\vbox{\unvbox\@mparlostbox\copy#1}%
+ \global\@mparlostfalse
+ \fi
+ }
\def\showlostmarginals{%
\global\let\old@textbottom\@textbottom
- \gdef\@textbottom{\vtop to\z@{\hbox to\z@{\kern-\wd\@mparlostbox\vbox
- to\z@{\kern-\ht\@mparlostbox\box\@mparlostbox\vfill}}}\old@textbottom}%
- \global\let\@fltovfmess\@fltovfpar}
-%
-% \enlargefreelist - Adds more(34) free inserts to freelist
-%
+ \gdef\@textbottom{%
+ \vtop to\z@{%
+ \hbox to\z@{\kern-\wd\@mparlostbox
+ \vbox to\z@{\kern-\ht\@mparlostbox
+ \box\@mparlostbox
+ \vfill
+ }%
+ }%
+ }%
+ \old@textbottom
+ }%
+ \global\let\@fltovfmess\@fltovfpar
+ }
\def\enlargefreelist{%
-\newinsert\bx@S
-\newinsert\bx@T
-\newinsert\bx@U
-\newinsert\bx@V
-\newinsert\bx@W
-\newinsert\bx@X
-\newinsert\bx@Y
-\newinsert\bx@Z
-\newinsert\bx@a
-\newinsert\bx@b
-\newinsert\bx@c
-\newinsert\bx@d
-\newinsert\bx@e
-\newinsert\bx@f
-\newinsert\bx@g
-\newinsert\bx@h
-\newinsert\bx@i
-\newinsert\bx@j
-\newinsert\bx@k
-\newinsert\bx@l
-\newinsert\bx@m
-\newinsert\bx@n
-\newinsert\bx@o
-\newinsert\bx@p
-\newinsert\bx@q
-\newinsert\bx@r
-\newinsert\bx@s
-\newinsert\bx@t
-\newinsert\bx@u
-\newinsert\bx@v
-\newinsert\bx@w
-\newinsert\bx@x
-\newinsert\bx@y
-\newinsert\bx@z
-\gdef\@freelist{\@elt\bx@A\@elt\bx@B\@elt\bx@C\@elt\bx@D\@elt\bx@E
- \@elt\bx@F\@elt\bx@G\@elt\bx@H\@elt\bx@I\@elt\bx@J
- \@elt\bx@K\@elt\bx@L\@elt\bx@M\@elt\bx@N
- \@elt\bx@O\@elt\bx@P\@elt\bx@Q\@elt\bx@R
- \@elt\bx@S\@elt\bx@T\@elt\bx@U\@elt\bx@V
- \@elt\bx@W\@elt\bx@X\@elt\bx@Y\@elt\bx@Z
- \@elt\bx@a\@elt\bx@b\@elt\bx@c\@elt\bx@d\@elt\bx@e
- \@elt\bx@f\@elt\bx@g\@elt\bx@h\@elt\bx@i\@elt\bx@j
- \@elt\bx@k\@elt\bx@l\@elt\bx@m\@elt\bx@n
- \@elt\bx@o\@elt\bx@p\@elt\bx@q\@elt\bx@r
- \@elt\bx@s\@elt\bx@t\@elt\bx@u\@elt\bx@v
- \@elt\bx@w\@elt\bx@x\@elt\bx@y\@elt\bx@z}%
-}
-%
-% \onesidemarginals - outputs marginals only on one side
-%
+ \@for\curr@option:={S,T,U,W,X,Y,Z,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}%
+ \do{\expandafter\newinsert\csname bx@\curr@option\endcsname}%
+ \gdef\@freelist{%
+ \@elt\bx@A \@elt\bx@B \@elt\bx@C \@elt\bx@D \@elt\bx@E \@elt\bx@F
+ \@elt\bx@G \@elt\bx@H \@elt\bx@I \@elt\bx@J \@elt\bx@K \@elt\bx@L
+ \@elt\bx@M \@elt\bx@N \@elt\bx@O \@elt\bx@P \@elt\bx@Q \@elt\bx@R
+ \@elt\bx@S \@elt\bx@T \@elt\bx@U \@elt\bx@V \@elt\bx@W \@elt\bx@X
+ \@elt\bx@Y \@elt\bx@Z
+ \@elt\bx@a \@elt\bx@b \@elt\bx@c \@elt\bx@d \@elt\bx@e \@elt\bx@f
+ \@elt\bx@g \@elt\bx@h \@elt\bx@i \@elt\bx@j \@elt\bx@k \@elt\bx@l
+ \@elt\bx@m \@elt\bx@n \@elt\bx@o \@elt\bx@p \@elt\bx@q \@elt\bx@r
+ \@elt\bx@s \@elt\bx@t \@elt\bx@u \@elt\bx@v \@elt\bx@w \@elt\bx@x
+ \@elt\bx@y \@elt\bx@z
+ }%
+ }%
+%% \onesidemarginals - outputs marginals only on one side
\def\onesidemarginals{%
-\newbox\@marbox
-\gdef\@addmarginpar{\@cons\@freelist\@currbox
+ \newbox\@marbox
+ \gdef\@addmarginpar{\@cons\@freelist\@currbox
\@tempdima\@mparbottom
\advance\@tempdima -\@pageht
\advance\@tempdima\ht\@currbox
@@ -139,9 +113,8 @@
\global\advance\@mparbottom\dp\@currbox
\global\advance\@mparbottom\marginparpush
\advance\@tempdima -\ht\@currbox
- \global\setbox \@currbox
- \vbox {\vskip \@tempdima
- \box \@currbox}%
+ \global\setbox\@currbox
+ \vbox {\vskip\@tempdima \box\@currbox}%
\global \ht\@currbox \z@
\global \dp\@currbox \z@
\kern -\@pagedp
@@ -149,23 +122,33 @@
\hb@xt@\columnwidth
{\hskip\columnwidth \hskip\marginparsep \box\@currbox \hss}%
\nointerlineskip
- \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}}%
-%
-\gdef\marginpar{\ifhmode \@bsphack\@floatpenalty -\@Mii\else
- \@floatpenalty-\@Miii\fi\ifinner\@parmoderr\@floatpenalty\z@
- \else\@next\@currbox\@freelist{\global
- \count\@currbox\m@ne}{\@floatpenalty\z@ \@fltovfmess
- \def\@currbox{\@tempboxa}}\fi
- \@ifnextchar [\@xmpar\@ympar}%
-%
-\long\gdef\@xmpar[##1]##2{\@savemarbox\@currbox{##2}\@xympar}%
-\long\gdef\@ympar##1{\@savemarbox\@currbox{##1}\@xympar}%
-\def \@xympar{%
-% \ifnum\@floatpenalty <\z@\@cons\@currlist\@marbox\fi
- \setbox\@tempboxa
- \color@vbox
- \vbox \bgroup
- \end@float
- \global \@ignorefalse \@esphack}%
-}
+ \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}%
+ }%
+ \gdef\marginpar{%
+ \ifhmode
+ \@bsphack\@floatpenalty -\@Mii
+ \else
+ \@floatpenalty-\@Miii
+ \fi
+ \ifinner
+ \@parmoderr\@floatpenalty\z@
+ \else
+ \@next\@currbox\@freelist{\global\count\@currbox\m@ne}{\@floatpenalty\z@
+ \@fltovfmess \def\@currbox{\@tempboxa}}%
+ \fi
+ \@ifnextchar[\@xmpar\@ympar
+ }%
+ \long\gdef\@xmpar[##1]##2{\@savemarbox\@currbox{##2}\@xympar}%
+ \long\gdef\@ympar##1{\@savemarbox\@currbox{##1}\@xympar}%
+ \def\@xympar{%
+ \ifnum\@floatpenalty<\z@ \@cons\@currlist\@marbox \fi
+ \setbox\@tempboxa
+ \color@vbox
+ \vbox\bgroup
+ \end@float
+ \global\@ignorefalse \@esphack
+ }%
+ }
\endinput
+%%
+%% End of file `marginal.sty'.
diff --git a/Master/texmf-dist/tex/latex/sttools/midfloat.sty b/Master/texmf-dist/tex/latex/sttools/midfloat.sty
index d9d11129ee7..93f6248a549 100644
--- a/Master/texmf-dist/tex/latex/sttools/midfloat.sty
+++ b/Master/texmf-dist/tex/latex/sttools/midfloat.sty
@@ -1,72 +1,55 @@
-%% midfloat.sty
-%% Copyright 1997 Sigitas Tolu\v sis
+%%
+%% This is file `midfloat.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% midfloat.dtx (with options: `package')
+%%
+%% Copyright (C) 1997-2012 by Sigitas Tolu\v{s}is <sigitas@vtex.lt>
%% VTeX Ltd., Akademijos 4, Vilnius, Lithuania
-%% e-mail sigitas@vtex.lt
%% http://www.vtex.lt/tex/download/macros/
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% PURPOSE: Insert some material in full-width on double-column page.
%%
-% This program can redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or (at your option) any later version.
-%
-% PURPOSE: Insert some material in full-width on double-column page.
-%
-% SHORT DESCRIPTION:
-%
-% It is denoted to place some material (from the left column)
-% in full-width at any place (but not at the top) on double-column
-% page (\twocolumn mode). Existing text remains as it was before
-% insert. Placement is restricted to one page. (It is some kind of
-% dbfloat intext).
-%
-% Provides new environment:
-%
-% \begin{strip}[#1/#2] ... \end{strip}
-% -----------------------------
-%
-% Puts \vbox{...} in full-width on double-column page.
-% Parameters #1 and #2 are optional.
-% By default #1=0pt and #2=0pt.
-% The material on the right column under strip is stretched down
-% by #1 and below strip is moved down by #2.
-%
-% It can be problems with floats and footnotes. In the case of
-% problems with footnotes it is possible to correct the situation
-% using commands \footnotemark and \footnotetext.
-%
-% \changes{1997/10/01}{some names}
-%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{midfloat}
+ [2012/05/29 v1.1 Insert some material in full-width on double-column page]
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{midfloat}[1997/10/01]
-%
\newif\if@vihproof \@vihprooftrue
-\newtoks\juo@sar \juo@sar={}
-\def\@ca#1#2#3#4{}
-\@ifundefined{stripsep}{\newskip\stripsep\stripsep 15pt}{}
-%
-\newskip\m@addvipersep
-\m@addvipersep\z@
-\newskip\c@addvipersep
-\c@addvipersep\z@
+\newtoks\juo@sar \juo@sar={}
+\@ifundefined{stripsep}{\newskip\stripsep \stripsep 15\p@}{}
+\newskip\m@addvipersep \m@addvipersep\z@
+\newskip\c@addvipersep \c@addvipersep\z@
\newdimen\ht@strip
\newdimen\right@cor
-\newdimen\cor@height \cor@height=0pt
+\newdimen\cor@height \cor@height=\z@
\newdimen\juo@pr
\newdimen\juo@ht
-\newbox\@viper
-\newcount\juo@sk
\newdimen\c@colht
+\newbox\@viper
\newbox\@rightcolumn
-
-\def\add@strip#1#2#3#4{\begingroup%
- \xdef\ex@{\global\noexpand\juo@sar{\the\juo@sar\noexpand\@ca{#1}{#2}{#3}{#4}}}\ex@%
-\endgroup}
-
+\newcount\juo@sk
+\def\@ca#1#2#3#4{}
+\def\add@strip#1#2#3#4{%
+ \begingroup
+ \xdef\ex@{\global\noexpand\juo@sar{\the\juo@sar\noexpand\@ca{#1}{#2}{#3}{#4}}}%
+ \ex@
+ \endgroup
+ }
\def\remove@strip#1{\ifx#1\@empty\global\juo@sk=0\else
\global\advance\juo@sk by-1\expandafter\next@item\the #1\@@#1\fi}
\def\next@item \@ca #1#2#3#4#5\@@#6{\global #6={#5}\global\juo@pr=#1\global\juo@ht=#2%
\global\cor@height=#3\global\m@addvipersep=#4}
-
\def\strip{\@ifnextsymb[{\@strip}{\@strip[0pt/0pt]}}
\def\@strip[#1/#2]{\global\@tempdima=#1\global\@tempdimb=#2%
\global \setbox\@viper\vbox\bgroup%
@@ -148,7 +131,7 @@
\global\advance\@colht by -\ht\@rightcolumn
\global\advance\@colht by\cor@height
\global\cor@height=0pt
- \else
+ \else
\global\advance\c@colht by-\ht\@rightcolumn
\global\@colht\c@colht
\fi
@@ -184,7 +167,6 @@
\fi
\fi
}
-
\def \@cflt{%
\let \@elt \@comflelt
\setbox\@tempboxa \vbox{}%
@@ -206,7 +188,6 @@
\xdef\@freelist{\@freelist\@toplist}%
\global\let\@toplist\@empty
}
-
\def\@ifnextsymb#1#2#3{%
\let\reserved@d=#1%
\def\reserved@a{#2}\def\reserved@b{#3}%
@@ -222,5 +203,7 @@
\fi
\fi
\reserved@c}
-
+%%
\endinput
+%%
+%% End of file `midfloat.sty'.
diff --git a/Master/texmf-dist/tex/latex/sttools/stabular.sty b/Master/texmf-dist/tex/latex/sttools/stabular.sty
index a408878b419..4342182a174 100644
--- a/Master/texmf-dist/tex/latex/sttools/stabular.sty
+++ b/Master/texmf-dist/tex/latex/sttools/stabular.sty
@@ -1,44 +1,43 @@
-%% stabular.sty
-%% Copyright 1998 Sigitas Tolu\v sis
+%%
+%% This is file `stabular.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% stabular.dtx (with options: `package')
+%%
+%% Copyright (C) 1998-2012 by Sigitas Tolu\v{s}is <sigitas@vtex.lt>
%% VTeX Ltd., Akademijos 4, Vilnius, Lithuania
-%% e-mail sigitas@vtex.lt
%% http://www.vtex.lt/tex/download/macros/
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
-% This program can redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or (at your option) any later version.
-%
-% PURPOSE: Improve tabular environment.
-%
-% SHORT DESCRIPTION:
-%
-% Changed internal commands: \@mkpream, \@addamp, \@xhline
-%
-% Provides new commands in tabular (used after command \\):
-% \emptyrow[#1]
-% -------------
-% Adds empty row, #1 - height of the row
-%
-% \tabrow{#1}[#2]
-% ---------------
-% Adds row of natural height: #1\\[#2]
-%
-% Provides new environments: stabular and stabular*
-% -------- ---------
-% One more multi-page version of tabular
-%
+%% PURPOSE: Improve tabular environment.
+%%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{stabular}
+ [2012/05/29 v1.1 Improve tabular environment]
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{stabular}[1998/03/19]
-%
\def\empty@finalstrut#1{%
- \unskip\ifhmode\nobreak\fi\vrule\@width\z@\@height\z@\@depth\z@}
-\def\no@strut{\global\setbox\@arstrutbox\hbox{%
+ \unskip
+ \ifhmode\nobreak\fi
+ \vrule\@width\z@\@height\z@\@depth\z@
+ }
+\def\no@strut{%
+ \global\setbox\@arstrutbox\hbox{%
\vrule \@height\z@
\@depth\z@
- \@width\z@}%
- \gdef\@endpbox{\empty@finalstrut\@arstrutbox\par\egroup\hfil}%
-}%
+ \@width\z@
+ }%
+ \gdef\@endpbox{\empty@finalstrut\@arstrutbox\par\egroup\hfil}%
+ }%
\def\yes@strut{\global\setbox\@arstrutbox\hbox{%
\vrule \@height\arraystretch \ht\strutbox
\@depth\arraystretch \dp\strutbox
@@ -48,8 +47,10 @@
\def\@mkpream#1{\@firstamptrue\@lastchclass6
\let\@preamble\@empty\def\empty@preamble{\add@ins}%
\let\protect\@unexpandable@protect
- \let\@sharp\relax\let\add@ins\relax
- \let\@startpbox\relax\let\@endpbox\relax
+ \let\@sharp\relax
+ \let\add@ins\relax
+ \let\@startpbox\relax
+ \let\@endpbox\relax
\@expast{#1}%
\expandafter\@tfor \expandafter
\@nextchar \expandafter:\expandafter=\reserved@a\do
@@ -57,7 +58,8 @@
\ifcase \@chclass \@classz \or \@classi \or \@classii \or \@classiii
\or \@classiv \or\@classv \fi\@lastchclass\@chclass}%
\ifcase \@lastchclass \@acol
- \or \or \@preamerr \@ne\or \@preamerr \tw@\or \or \@acol \fi}
+ \or \or \@preamerr \@ne\or \@preamerr \tw@\or \or \@acol \fi
+ }
\def\@addamp{%
\if@firstamp
\@firstampfalse
@@ -65,52 +67,78 @@
\else
\edef\@preamble{\@preamble &}%
\edef\empty@preamble{\expandafter\noexpand\empty@preamble &\add@ins}%
- \fi}
+ \fi
+ }
\newif\iftw@hlines \tw@hlinesfalse
-\def\@xhline{\ifx\reserved@a\hline
- \tw@hlinestrue
- \else\ifx\reserved@a\Hline
- \tw@hlinestrue
- \else
- \tw@hlinesfalse
- \fi\fi
- \iftw@hlines
- \aftergroup\do@after
- \fi
- \ifnum0=`{\fi}%
-}
+\def\@xhline{%
+ \ifx\reserved@a\hline
+ \tw@hlinestrue
+ \else
+ \ifx\reserved@a\Hline
+ \tw@hlinestrue
+ \else
+ \tw@hlinesfalse
+ \fi
+ \fi
+ \iftw@hlines
+ \aftergroup\do@after
+ \fi
+ \ifnum0=`{\fi}%
+ }
\def\do@after{\emptyrow[\the\doublerulesep]}
-\def\emptyrow{\noalign\bgroup\@ifnextchar[\@emptyrow{\@emptyrow[\z@]}}
-\def\@emptyrow[#1]{\no@strut\gdef\add@ins{\vrule \@height\z@ \@depth#1 \@width\z@}\egroup%
-\empty@preamble\\
-\noalign{\yes@strut\gdef\add@ins{\vrule \@height\z@ \@depth\z@ \@width\z@}}%
-}
-\def\tabrow#1{\noalign\bgroup\@ifnextchar[{\@tabrow{#1}}{\@tabrow{#1}[]}}
-\def\@tabrow#1[#2]{\no@strut\egroup#1\ifx.#2.\\\else\\[#2]\fi\noalign{\yes@strut}}
-%
-\def\endstabular{\crcr\egroup\egroup \egroup}
-\expandafter \let \csname endstabular*\endcsname = \endstabular
+\def\emptyrow{\noalign\bgroup
+ \@ifnextchar[\@emptyrow{\@emptyrow[\z@]}%
+ }
+\def\@emptyrow[#1]{%
+ \no@strut
+ \gdef\add@ins{\vrule \@height\z@ \@depth#1 \@width\z@}%
+ \egroup
+ \empty@preamble\\
+ \noalign{%
+ \yes@strut
+ \gdef\add@ins{\vrule \@height\z@ \@depth\z@ \@width\z@}%
+ }%
+ }
+\def\tabrow#1{\noalign\bgroup
+ \@ifnextchar[{\@tabrow{#1}}{\@tabrow{#1}[]}%
+ }
+\def\@tabrow#1[#2]{\no@strut\egroup
+ #1\ifx.#2.\\\else\\[#2]\fi
+ \noalign{\yes@strut}%
+ }
+\def\endstabular{\crcr\egroup\egroup\egroup}
+\expandafter\let\csname endstabular*\endcsname\endstabular
\def\stabular{\let\@halignto\@empty\@stabular}
\@namedef{stabular*}#1{\def\@halignto{to#1}\@stabular}
-\def\@stabular{\leavevmode \bgroup \let\@acol\@tabacol
- \let\@classz\@tabclassz
- \let\@classiv\@tabclassiv \let\\\@tabularcr\@stabarray}
+\def\@stabular{\leavevmode
+ \bgroup
+ \let\@acol\@tabacol
+ \let\@classz\@tabclassz
+ \let\@classiv\@tabclassiv
+ \let\\\@tabularcr
+ \@stabarray
+ }
\def\@stabarray{\m@th\@ifnextchar[\@sarray{\@sarray[c]}}
\def\@sarray[#1]#2{%
\bgroup
- \setbox\@arstrutbox\hbox{%
- \vrule \@height\arraystretch\ht\strutbox
- \@depth\arraystretch \dp\strutbox
- \@width\z@}%
+ \setbox\@arstrutbox\hbox{%
+ \vrule \@height\arraystretch\ht\strutbox
+ \@depth\arraystretch \dp\strutbox
+ \@width\z@
+ }%
\@mkpream{#2}%
\edef\@preamble{%
\ialign \noexpand\@halignto
- \bgroup \@arstrut \@preamble \tabskip\z@skip \cr}%
+ \bgroup \@arstrut \@preamble \tabskip\z@skip \cr
+ }%
\let\@startpbox\@@startpbox \let\@endpbox\@@endpbox
- \let\tabularnewline\\%
-% \let\par\@empty
- \let\@sharp##%
- \set@typeset@protect
- \lineskip\z@skip\baselineskip\z@skip
- \@preamble}
+ \let\tabularnewline\\
+ \let\par\@empty
+ \let\@sharp##%
+ \set@typeset@protect
+ \lineskip\z@skip \baselineskip\z@skip
+ \@preamble
+ }
\endinput
+%%
+%% End of file `stabular.sty'.
diff --git a/Master/texmf-dist/tex/latex/sttools/stfloats.sty b/Master/texmf-dist/tex/latex/sttools/stfloats.sty
index e13649e473d..d45913665ad 100644
--- a/Master/texmf-dist/tex/latex/sttools/stfloats.sty
+++ b/Master/texmf-dist/tex/latex/sttools/stfloats.sty
@@ -1,64 +1,33 @@
-%% stfloats.sty
-%% Copyright 1997, 1999 Sigitas Tolu\v sis
+%%
+%% This is file `stfloats.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% stfloats.dtx (with options: `package')
+%%
+%% Copyright (C) 1997-2012 by Sigitas Tolu\v{s}is <sigitas@vtex.lt>
%% VTeX Ltd., Akademijos 4, Vilnius, Lithuania
-%% e-mail sigitas@vtex.lt
%% http://www.vtex.lt/tex/download/macros/
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
-% This program can redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or (at your option) any later version.
-%
-% PURPOSE: Improve float mechanism and baselineskip settings
-%
-% SHORT DESCRIPTION:
-%
-% (It is rewritten version of stkernel package)
-%
-% Provides new commands:
-%
-% \dblfloatsatbottom, \dblfloatsattop (removed!)
-% -----------------------------------
-% Use instead optional parameters [b] and [t]
-% for dblfloat environments (default = [tbp]).
-%
-% \fnbelowfloat
-% -------------
-% Puts footnotes below the bottom floats
-%
-% \fnunderfloat (default and standard)
-% -------------
-% Puts footnotes under the bottom floats
-%
-% \setbaselinefloat
-% -----------------
-% Allows baselineskip to stretch and shrink if \baselineskip
-% is set with command \@setfontsize.
-% Example: \@setfontsize\normalsize\@xpt{12pt plus .1pt minus .1pt}%
-%
-% \setbaselinefixed (default and standard)
-% Disables baselineskip to stretch and shrink even if \baselineskip
-% is set with command \@setfontsize.
-% Example: \@setfontsize\normalsize\@xpt{12pt plus .1pt minus .1pt}%
-%
-% Allows to use optional parameters [t] or [b] for dblfloats.
-%
-% \changes{1997/08/25}{first version}
-% \changes{1997/09/10}{standard LaTeX2e macros are used for dblfloats at top}
-% \changes{1997/10/01}{new commands: \fnbelowfloat and \fnunderfloat}
-% \changes{1998/09/21}{new commands: \setbaselinefloat and \setbaselinefixed}
-% \changes{1999/10/04}{changed dblfloat's output}
-% \changes{1999/10/22}{changed \output for older LaTeX distributions}
-%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{stfloats}[1999/10/22]
-
+%% PURPOSE: Improve float mechanism and baselineskip settings
+%%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{stfloats}
+ [2012/05/29 v1.1 Improve float mechanism and baselineskip settings]
\gdef\@dblbotlist{}
\newcount\@dblbotnum
\newcount\c@dblbotnumber
\setcounter{dblbotnumber}{2}
\def\@dbflt#1{\@ifnextchar[{\@xdblfloat{#1}}{\@xdblfloat{#1}[tbp]}}
-
\def \@dblfloatplacement {%
\global \@dbltopnum \c@dbltopnumber
\global \@dblbotnum \c@dblbotnumber
@@ -69,9 +38,7 @@
\@fptop \@dblfptop
\@fpsep \@dblfpsep
\@fpbot \@dblfpbot
-}
-
-
+ }
\def\@addtodblcol{%
\begingroup
\@insertfalse
@@ -154,13 +121,11 @@
\fi
\fi
\endgroup
-}
-
+ }
\def\@combinedblfloats{%
- \ifx \@dbltoplist\@empty \else \@cdblflt \fi
- \ifx \@dblbotlist\@empty \else \@cdblflb \fi
-}
-
+ \ifx \@dbltoplist\@empty \else \@cdblflt \fi
+ \ifx \@dblbotlist\@empty \else \@cdblflb \fi
+ }
\def\@cdblflt{%
\setbox\@tempboxa \vbox{}%
\let \@elt \@comdblflelt
@@ -178,7 +143,6 @@
\unvbox \@outputbox
}%
}
-
\def\@cdblflb{%
\setbox\@tempboxa \vbox{}%
\let \@elt \@comdblflelt
@@ -197,9 +161,11 @@
\vskip -\dblfloatsep
}%
}
-
\def \@doclearpage {%
\ifvoid\footins
+ \ifvbox\@kludgeins
+ {\setbox \@tempboxa \box \@kludgeins}%
+ \fi
\setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa
\setbox\@tempboxa\box\@cclv
\xdef\@deferlist{\@toplist\@botlist\@deferlist}%
@@ -234,10 +200,11 @@
\@makecol\@opcol
\clearpage
\fi
-}
+ }
\global\let\org@makecol\@makecol
\gdef \fn@makecol {%
- \setbox\@outputbox \box\@cclv
+ \setbox\@outputbox \box\@cclv
+ \let\@elt\relax
\xdef\@freelist{\@freelist\@midlist}%
\global \let \@midlist \@empty
\@combinefloats
@@ -266,10 +233,9 @@
}%
\fi
\global \maxdepth \@maxdepth
-}
+ }
\def\fnbelowfloat{\global\let\@makecol\fn@makecol}
\def\fnunderfloat{\global\let\@makecol\org@makecol}
-
\def\set@floatfontsize#1#2#3{%
\@defaultunits\@tempdimb#2pt\relax\@nnil
\edef\f@size{\strip@pt\@tempdimb}%
@@ -277,7 +243,7 @@
\edef\f@baselineskip{\the\@tempskipa}%
\edef\f@linespread{#1}%
\let\baselinestretch\f@linespread
- \def\size@update{%
+ \def\size@update{%
\baselineskip\f@baselineskip
\@tempskipa\baselineskip\relax\baselineskip=1\baselineskip
\advance\@tempskipa by-\baselineskip\baselineskip\f@baselineskip
@@ -293,34 +259,11 @@
}
\let\set@@@fontsize\set@fontsize
\def\setbaselinefloat{\let\set@fontsize\set@floatfontsize}
-\def\setbaselinefixed{\@tempdima=\baselinestretch\p@
- \edef\baselinestretch{\strip@pt\@tempdima}\let\set@fontsize\set@@@fontsize}
-\output {%
- \let \par \@@par
- \ifnum \outputpenalty<-\@M
- \@specialoutput
- \else
- \@makecol
- \@opcol
- \@startcolumn
- \@whilesw \if@fcolmade \fi
- {%
- \@opcol\@startcolumn}%
- \fi
- \ifnum \outputpenalty>-\@Miv
- \ifdim \@colroom<1.5\baselineskip
- \ifdim \@colroom<\textheight
- \@latex@warning@no@line {Text page \thepage\space
- contains only floats}%
- \@emptycol
- \else
- \global \vsize \@colroom
- \fi
- \else
- \global \vsize \@colroom
- \fi
- \else
- \global \vsize \maxdimen
- \fi
-}
+\def\setbaselinefixed{%
+ \@tempdima=\baselinestretch\p@
+ \edef\baselinestretch{\strip@pt\@tempdima}%
+ \let\set@fontsize\set@@@fontsize
+ }
\endinput
+%%
+%% End of file `stfloats.sty'.
diff --git a/Master/texmf-dist/tex/latex/sttools/texsort.sty b/Master/texmf-dist/tex/latex/sttools/texsort.sty
index ff54e804ffb..a78fe40bed4 100644
--- a/Master/texmf-dist/tex/latex/sttools/texsort.sty
+++ b/Master/texmf-dist/tex/latex/sttools/texsort.sty
@@ -1,118 +1,79 @@
-%% texsort.sty
-%% Copyright 2000 Sigitas Tolu\v sis
+%%
+%% This is file `texsort.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% texsort.dtx (with options: `package')
+%%
+%% Copyright (C) 2000-2012 by Sigitas Tolu\v{s}is <sigitas@vtex.lt>
%% VTeX Ltd., Akademijos 4, Vilnius, Lithuania
-%% e-mail sigitas@vtex.lt
%% http://www.vtex.lt/tex/download/macros/
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
-% This program can redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or (at your option) any later version.
-%
-% PURPOSE: Sort/compress numerical lists
-%
-% SHORT DESCRIPTION:
-%
-% \initarray#1#2
-% --------------
-% Converts list #2 to array #1
-%
-% \outarray#1\sep#2
-% -----------------
-% Outputs array #1 elements separated by #2
-%
-% \getarrayitem#1#2\to#3
-% ----------------------
-% Gets #2'th element from array #1 to \csname#3\endcsname
-%
-% \setarrayitem#1#2#3
-% -------------------
-% Sets #2'th element from array #1 to numeric value #3
-%
-% \getarraylenght#1
-% -----------------
-% Gets array #1 elements count
-%
-% \setarraylenght#1
-% -----------------
-% Sets array #1 elements count to value #2
-%
-% \upheap#1#2; \insertheapelem#1#2; \downheap#1#2; \removetop#1\to#2
-% ------------------------------------------------------------------
-% Internal macros of sort algorithm
-%
-% \g@addto@macrobeg#1#2
-% ---------------------
-% Adds defs #2 to macro #1 begining
-%
-% \add@zero#1
-% -----------
-% Adds 0 before #1
-%
-% \sortlistarray#1\to#2
-% ---------------------
-% Sorts array #1 to array #2
-%
-% \sortlist#1\to#2\sep#3
-% ----------------------
-% Sorts list #1 and puts to macro #2; elements separated by #3
-%
-% \compresslist#1\to#2\sep#3#4
-% ----------------------------
-% Compress list #1 and puts to macro #2;
-% single elements separated by #3, multi by #4
-%
-% Changes:
-% \changes{2000/06/06}{alfa version}
-% \changes{2000/06/08}{added compression}
-%
+%% PURPOSE: Sort/compress numerical lists
+%%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{texsort}
+ [2012/05/29 v1.1 Sort/compress alphanumerical list]
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{texsort}[2000/06/08]
-%
+\ProvidesPackage{texsort}[2012/05/29]
\newcount\t@mp@r@a
\newcount\t@mp@r@b
\newcount\t@mp@r@c
-
\def\initarray#1#2{%
\bgroup
\@tempcnta=\z@
\@for\@@refb:=#2\do{%
\advance\@tempcnta by\@ne
\bgroup
- \setbox0\hbox{\expandafter\global\expandafter\t@mp@r@a\expandafter\add@zero\@@refb\relax}%
- \ifdim\wd0>\z@\relax\@latex@warning{Negrynas skaicius \@@refb!}\fi
- \expandafter\edef\csname @a@\endcsname{\expandafter\xdef\expandafter
- \noexpand\csname#1@\the\@tempcnta\endcsname{\the\t@mp@r@a}}\@a@
+ \setbox\z@\hbox{%
+ \expandafter\global\expandafter\t@mp@r@a\expandafter\add@zero\@@refb\relax
+ }%
+ \ifdim\wd0>\z@\relax
+ \@latex@warning{Not number \@@refb!}%
+ \fi
+ \expandafter\edef\csname @a@\endcsname{\expandafter\xdef\expandafter
+ \noexpand\csname#1@\the\@tempcnta\endcsname{\the\t@mp@r@a}}\@a@
\egroup
}%
\expandafter\xdef\csname #1@lenght\endcsname{\the\@tempcnta}%
\egroup
-}
+ }
\def\outarray#1\sep#2{%
\bgroup
\@tempcnta=\z@\relax
\@tempcntb=\getarraylenght{#1}%
\loop
- \ifnum\@tempcnta<\@tempcntb
- \advance\@tempcnta by1\relax
- \ifnum\@tempcnta>1\relax#2\fi\csname#1@\the\@tempcnta\endcsname
+ \ifnum\@tempcnta<\@tempcntb
+ \advance\@tempcnta by\@ne\relax
+ \ifnum\@tempcnta>\@ne\relax#2\fi
+ \csname#1@\the\@tempcnta\endcsname
\repeat
\egroup
-}
+ }
\def\add@zero#1{0#1}
\def\getarrayitem#1#2\to#3{\expandafter\xdef\csname#3\endcsname{\csname#1@#2\endcsname}}
\def\setarrayitem#1#2#3{%
\bgroup
- \setbox0\hbox{\expandafter\global\expandafter\t@mp@r@a\expandafter\add@zero#3\relax}%
- \ifdim\wd0>\z@\relax\@latex@warning{Negrynas skaicius #3!}\fi
- \expandafter\edef\csname @a@\endcsname{\expandafter\xdef\expandafter
- \noexpand\csname#1@#2\endcsname{\the\t@mp@r@a}}\@a@
+ \setbox0\hbox{%
+ \expandafter\global\expandafter\t@mp@r@a\expandafter\add@zero#3\relax
+ }%
+ \ifdim\wd0>\z@\relax
+ \@latex@warning{Not number #3!}%
+ \fi
+ \expandafter\xdef\csname#1@#2\endcsname{\the\t@mp@r@a}%
\egroup
-}
+ }
\def\getarraylenght#1{\@ifundefined{#1@lenght}{0}{\csname #1@lenght\endcsname}}
\def\setarraylenght#1#2{\expandafter\xdef\csname #1@lenght\endcsname{#2}}
-
-%#1 - masyvas, #2 - elemento nr.
\def\upheap#1#2{%
\bgroup
\getarrayitem{#1}{#2}\to{vara}%
@@ -121,27 +82,24 @@
\loop
\@tempcnta=\@tempcntb
\divide\@tempcnta by2\getarrayitem{#1}{\the\@tempcnta}\to{varb}%
- \ifnum\varb>\vara\relax\else
+ \ifnum\varb>\vara\relax
+ \else
\getarrayitem{#1}{\the\@tempcnta}\to{varb}%
\setarrayitem{#1}{\the\@tempcntb}{\varb}%
\divide\@tempcntb by2\relax
\repeat
\setarrayitem{#1}{\the\@tempcntb}{\vara}%
\egroup
-}
-
-%#1 - masyvas, #2 - dedama reiksme
+ }
\def\insertheapelem#1#2{%
- \bgroup
+ \bgroup
\@tempcnta=\getarraylenght{#1}\relax
\advance\@tempcnta by1\relax
\setarraylenght{#1}{\the\@tempcnta}\relax
\setarrayitem{#1}{\the\@tempcnta}{#2}%
\upheap{#1}{\the\@tempcnta}%
\egroup
-}
-
-%#1 - masyvas, #2 - elemento nr.
+ }
\newcount\@tempcntd
\def\downheap#1#2{%
\bgroup
@@ -151,9 +109,10 @@
\divide\@tempcntb by2\relax
\t@mp@r@b=\@tempcntb\relax
\@tempcntb=#2\relax
- \ifnum\@tempcntb>\t@mp@r@b\relax\else
+ \ifnum\@tempcntb>\t@mp@r@b\relax
+ \else
\loop
- \@tempcnta=\@tempcntb\advance\@tempcnta by\@tempcntb\relax
+ \@tempcnta=\@tempcntb \advance\@tempcnta by\@tempcntb\relax
\@tempcntd=\@tempcnta \advance\@tempcntd by1\relax
\ifnum\@tempcnta<\t@mp@r@c\relax
\getarrayitem{#1}{\the\@tempcnta}\to{temp@@a}%
@@ -176,7 +135,7 @@
\fi
\setarrayitem{#1}{\the\@tempcntb}{\vara}%
\egroup
-}
+ }
\def\removetop#1\to#2{%
\bgroup
@@ -190,46 +149,48 @@
\setarraylenght{#1}{\the\@tempcnta}%
\downheap{#1}{1}%
\egroup
-}
+ }
\long\def\g@addto@macrobeg#1#2{%
\begingroup
\def\@a@{#2}%
\toks@\expandafter\expandafter\expandafter{\expandafter\@a@#1}%
\xdef#1{\the\toks@}%
- \endgroup}
-
+ \endgroup
+ }
\def\sortlistarray#1\to#2{%
\bgroup
\@for\@@refb:=#1\do{%
\insertheapelem{@tempa@}{\@@refb}%
- }%
+ }%
\@tempcntb=\getarraylenght{@tempa@}%
\setarraylenght{#2}{\the\@tempcntb}%
\@for\@@refb:=#1\do{%
\removetop{@tempa@}\to{aka}%
\setarrayitem{#2}{\the\@tempcntb}{\aka}%
\advance\@tempcntb by-1\relax
- }%
+ }%
\egroup
-}
+ }
\def\sortlist#1\to#2\sep#3{%
\bgroup
\@for\@@refb:=#1\do{%
\insertheapelem{@tempa@}{\@@refb}%
- }%
+ }%
\@tempcntb=\getarraylenght{@tempa@}%
\expandafter\def\csname#2\endcsname{}%
\expandafter\def\expandafter\@a@\expandafter{\csname#2\endcsname}%
\@for\@@refb:=#1\do{%
\removetop{@tempa@}\to{aka}%
\advance\@tempcntb by-1\relax
- \expandafter\expandafter\expandafter\g@addto@macrobeg\expandafter\@a@\expandafter{\aka}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macrobeg\expandafter\@a@\expandafter{\aka}%
\ifnum\@tempcntb>0\relax
- \expandafter\expandafter\expandafter\g@addto@macrobeg\expandafter\@a@\expandafter{#3}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macrobeg\expandafter\@a@\expandafter{#3}%
\fi
- }%
+ }%
\egroup
-}
+ }
\def\compresslist#1\to#2\sep#3#4{%
\bgroup
\expandafter\def\csname#2\endcsname{}%
@@ -241,12 +202,15 @@
\t@mp@r@a=\@@refb\relax
\t@mp@r@b=\@@refb\relax
\t@mp@r@c=\@@refb\relax
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@a}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@a}%
\else
\t@mp@r@c=\@@refb\relax
\ifnum\t@mp@r@c=\t@mp@r@a\relax
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{#3}%
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@c}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{#3}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@c}%
\t@mp@r@b=\t@mp@r@c\relax
\else
\@tempcnta=\t@mp@r@b\relax
@@ -257,33 +221,46 @@
\@tempcnta=\t@mp@r@a\relax
\advance\@tempcnta by-\t@mp@r@b\relax
\ifnum\@tempcnta<-1\relax
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{#4}%
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@b}%
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{#3}%
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@c}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{#4}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@b}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{#3}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@c}%
\else
\ifnum\t@mp@r@a<\t@mp@r@b
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{#3}%
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@b}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{#3}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@b}%
\fi
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{#3}%
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@c}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{#3}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@c}%
\fi
\t@mp@r@a=\t@mp@r@c\relax
\t@mp@r@b=\t@mp@r@c\relax
\fi
\fi
\fi
- }%
+ }%
\ifnum\t@mp@r@a<\t@mp@r@c\relax
\advance\t@mp@r@a by-\t@mp@r@c\relax
\ifnum\t@mp@r@a<-1\relax
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{#4}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{#4}%
\else
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{#3}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{#3}%
\fi
- \expandafter\expandafter\expandafter\g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@c}%
+ \expandafter\expandafter\expandafter
+ \g@addto@macro\expandafter\@a@\expandafter{\the\t@mp@r@c}%
\fi
\egroup
-}
+ }
\endinput
+%%
+%% End of file `texsort.sty'.