diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty | 61 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/floatrow/floatrow.sty | 70 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/floatrow/listpen.sty | 45 |
3 files changed, 97 insertions, 79 deletions
diff --git a/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty b/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty index 59c5b73dad9..dca9cd27cf5 100644 --- a/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty +++ b/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{floatpagestyle} - [2005/07/15 v0.1g floating page style] + [2005/10/02 v0.1h floating page style] \newcommand\floatpagestyle[1]{\@ifundefined{ps@#1}\undefinedpagestyle {\begingroup \let\thepage\relax\let\protect\@unexpandable@protect @@ -37,61 +37,10 @@ \edef\reserved@a{floatpage@\romannumeral\the\c@page}% \@ifundefined{\reserved@a}{\relax}{\global\@specialpagetrue \gdef\@specialstyle{\csname\reserved@a\endcsname}}} -\def\@outputpage{% -\begingroup % the \endgroup is put in by \aftergroup - \let \protect \noexpand - \@resetactivechars - \global\let\@@if@newlist\if@newlist - \global\@newlistfalse - \@parboxrestore - \shipout \vbox{% - \set@typeset@protect - \aftergroup \endgroup - \aftergroup \set@typeset@protect - \@chkfloatpage %check float - \if@specialpage - \global\@specialpagefalse\@nameuse{ps@\@specialstyle}% - \fi - \if@twoside - \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot - \let\@themargin\oddsidemargin - \else \let\@thehead\@evenhead - \let\@thefoot\@evenfoot \let\@themargin\evensidemargin - \fi - \fi - \reset@font - \normalsize - \normalsfcodes - \let\label\@gobble - \let\index\@gobble - \let\glossary\@gobble - \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@ - \@begindvi - \vskip \topmargin - \moveright\@themargin \vbox {% - \setbox\@tempboxa \vbox to\headheight{% - \vfil - \color@hbox - \normalcolor - \hb@xt@\textwidth{\@thehead}% - \color@endbox - }% - \dp\@tempboxa \z@ - \box\@tempboxa - \vskip \headsep - \box\@outputbox - \baselineskip \footskip - \color@hbox - \normalcolor - \hb@xt@\textwidth{\@thefoot}% - \color@endbox - }% - }% - \global\let\if@newlist\@@if@newlist - \global \@colht \textheight - \stepcounter{page}% - \let\firstmark\botmark -} +\AtBeginDocument + {\@ifdefinable\FBori@outputpage{\let\FBori@outputpage\@outputpage} + \let\@outputpage\FB@outputpage} +\newcommand\FB@outputpage{\@chkfloatpage\FBori@outputpage} \endinput %% %% End of file `floatpagestyle.sty'. diff --git a/Master/texmf-dist/tex/latex/floatrow/floatrow.sty b/Master/texmf-dist/tex/latex/floatrow/floatrow.sty index ac754888e2c..7db9e3f96a6 100644 --- a/Master/texmf-dist/tex/latex/floatrow/floatrow.sty +++ b/Master/texmf-dist/tex/latex/floatrow/floatrow.sty @@ -22,17 +22,19 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{floatrow} - [2005/07/15 v0.1g floatrow package: the float package extension] -\@ifundefined{float@caption}{}% - {\PackageError{floatrow}{Do not use float package with floatrow}{}} -\@ifundefined{rotfloat@float}{}% - {\PackageError{floatrow}{Do not use rotfloat package with floatrow}{}} + [2006/07/24 v0.1j floatrow: float package extension] +\@ifundefined{float@caption}{% + \@ifundefined{rotfloat@float}{}% + {\PackageError{floatrow}{Do not use rotfloat package with floatrow}{}% + \@namedef{opt@floatrow.sty}{}\endinput}}% + {\PackageError{floatrow}{Do not use float package with floatrow}{}% + \@namedef{opt@floatrow.sty}{}\endinput} \@namedef{ver@float.sty}{2001/11/08 v1.3d (excerpt) Float enhancements (AL)} \@namedef{ver@rotfloat.sty}{2004/01/04 v1.2 (excerpt) Combining float+rotating package (AS)} \RequirePackage{keyval} -\RequirePackage{caption3} +\RequirePackage{caption3}[2006/01/12] \@ifdefinable\FR@flboxreset{\let\FR@flboxreset\@floatboxreset} \@ifdefinable\FR@makecaption{\let\FR@makecaption\@makecaption} \newcommand\FB@caption{% @@ -76,6 +78,7 @@ \adj@dim\hsize+\FBo@wadj=\hsize \fi \fi + \linewidth\hsize \normalsize \abovecaptionskip\z@\belowcaptionskip\z@ \FR@makecaption{#1}{#2}\egroup} @@ -157,7 +160,9 @@ \global\let\WF@box\@currbox \fi}% \@ifnextchar[\WF@wr{\WF@wr[]}}%] - \expandafter\let\csname endwrap#1\endcsname\endwrapfloat} + \@namedef{endwrap#1}{\endwrapfloat + \@ifundefined{FloatHBarrier}{}\FloatHBarrier + }} \@ifundefined{subfloat}{}{\@ifundefined{c@sub#1}{\newsubfloat{#1}}{}}} \@ifdefinable\float@exts{\newtoks\float@exts} \newcommand\newfloat{\@ifstar{\flrow@restylefloat{no}\newfloat@}% @@ -173,11 +178,16 @@ \def\@xfloat#1[{\@ifnextchar{H}{\@float@HH{#1}[}{\@float@Hx{#1}[}} \newsavebox\float@box \def\@float@HH#1[H]{% + \@ifundefined{FloatHBarrier}{}\FloatHBarrier \expandafter\let\csname end#1\endcsname\float@endH \let\@currbox\float@box + \flrow@setlist{{floatH}{#1H}}% \def\@captype{#1}\setbox\@floatcapt=\vbox{}% \setbox\@currbox\color@vbox\normalcolor - \vbox\bgroup \hsize\columnwidth \@parboxrestore + \vbox\bgroup + \hsize\columnwidth + \linewidth\columnwidth + \@parboxrestore \@floatboxreset \@setnobreak \ignorespaces} \newcommand\flrow@flboxreset{\FR@flboxreset @@ -198,7 +208,8 @@ \settowidth\@tempdimb{{\FBleftmargin}{\FBrightmargin}}% \advance\@tempdima-\@tempdimb \global\FBc@wd\@tempdima\global\FB@wd\@tempdima - \adj@dim\@tempdima-\FBo@wadj={\global\FBo@wd}\hsize\FBo@wd + \adj@dim\@tempdima-\FBo@wadj={\global\FBo@wd}% + \hsize\FBo@wd\linewidth\hsize \FBifcaptop \ifnum\FPOScnt=0\columnwidth\hsize\else\columnwidth\FBc@wd\fi \else @@ -225,7 +236,7 @@ \flrow@setwd\FB@wd\@tempdima\fi \adj@dim\@tempdima-\FBo@wadj={\global\FBo@wd}% \FC@ifc@wd\else\global\advance\FBc@wd-\FB@wd\fi - \hsize\FBo@wd\columnwidth\FBc@wd + \hsize\FBo@wd\linewidth\hsize\columnwidth\FBc@wd\linewidth\hsize \FCset@vpos} \newcommand\float@makebox[1]{% \FBifcapbeside\flrow@FC{#1}\else\flrow@FB{#1}\fi} @@ -249,7 +260,8 @@ \newcommand\FCo@box[1]{\def\@parboxto{}\ifx\FBoheight\relax\FC@bbox\else \def\@parboxto{to\FBoheight}\FC@bbox\vsize\FBoheight\fi#1\FC@ebox} \newcommand\FBafil{\vfill}\newcommand\FBbfil{\vfill} -\newcommand\FBw@box[1]{\hsize#1\columnwidth#1\normalfont\normalcolor} +\newcommand\FBw@box[1]{\hsize#1\columnwidth#1\linewidth#1% + \normalfont\normalcolor} \newcommand\FB@vbox[3]{\ifx#2\relax\vbox\bgroup\else \vbox to#2\bgroup\vsize#2\fi\FBw@box#1#3\vskip\z@\egroup} \newcommand\FB@vtop[3]{\ifx#2\relax\vtop\bgroup\else @@ -308,9 +320,10 @@ \global\setbox\@currbox\float@makebox\columnwidth \let\@endfloatbox\relax\fi \end@float} -\newcommand\float@endH{\@endfloatbox\vskip\intextsep +\newcommand\float@endH{\@endfloatbox\par + \addpenalty\@beginparpenalty\vskip\intextsep \ifFBbuild\setbox\@currbox\float@makebox\columnwidth\fi - \box\@currbox\vskip\intextsep\relax} + \box\@currbox\par\addpenalty\@endparpenalty\vskip\intextsep\relax} \newcommand\float@dblend{\ifFBbuild\@endfloatbox \global\setbox\@currbox\float@makebox\textwidth \let\@endfloatbox\relax\fi @@ -377,7 +390,7 @@ {\def\FR@tmp{\captionfootfont}\floatfoot@}} \newcommand\floatfoot@[1]{% \global\setbox\flrow@foot\vbox{% - \if@@FS\hsize\columnwidth\fi + \if@@FS\hsize\columnwidth\linewidth\columnwidth\fi \@parboxrestore\reset@font\color@begingroup \caption@settype{\@captype}% \caption@settype{floatfoot}% @@ -414,11 +427,16 @@ \newcommand\FR@loc@addcnt[2]{% \@ifundefined{c@#1}{\@nocounterr{#1}}% {\advance\csname c@#1\endcsname #2\relax}} +\newcommand\FR@loc@refcnt[1]{% + \@ifundefined{c@#1}{\@nocounterr{#1}}% + {\advance\csname c@#1\endcsname1\relax}} \newcommand\FR@loc@{\let\label\@gobble + \let\refstepcounter\FR@loc@refcnt\let\refsteponlycounter\FR@loc@refcnt \let\cl@@ckpt\empty\let\addtocounter\FR@loc@addcnt \def\sf@updatecaptionlist##1##2##3##4{}} \def\FBtmp@cap#1[#2]#3{\sbox\@tempboxa - {\caption@@@make{\csname fnum@\@captype \endcsname}{#3}}% + {\caption@@@make{\caption@lfmt{\@nameuse{\@captype name}}% + {\@nameuse{the\@captype}}}{#3}}% \global\@tempdimb\wd\@tempboxa} \newcommand\FBget@box[3]{% \FBiffloatrow\else @@ -447,15 +465,16 @@ \adj@dim\@tempdima-\FBo@wadj=\FBo@wd \FBiffloatrow\else\hsize\FBo@wd\fi \FBifcapbeside\hsize\FB@wd\fi + \linewidth\hsize \def\reserved@a{#1}\ifx\reserved@a\empty \else\FBget@@wd{#1}{#3}\fi - \hsize\FBo@wd + \hsize\FBo@wd\linewidth\hsize \FBifcapbeside \FC@ifc@wd\else\advance\FBc@wd-\FB@wd\fi \else \FBc@wd\FB@wd \fi - \setbox0\vbox{\FR@loc@\hsize\FBo@wd + \setbox0\vbox{\FR@loc@\hsize\FBo@wd\linewidth\hsize \FBifcaptop \ifnum\FPOScnt=0\columnwidth\hsize\else\columnwidth\FBc@wd\fi \else @@ -509,7 +528,6 @@ \FC@ifc@wd \ifx\FCwidth\relax \setbox1\vbox{\FR@loc@ - \let\refstepcounter\stepcounter \let\caption\FB@caption \let\@caption\FBtmp@cap #2}% @@ -632,7 +650,7 @@ \FBget@box{#1}{#2}{#4#5}% \FBifcapbeside\FCset@vpos\fi \FBiffloatrow\FR@floatbox{\@ifundefined{capstart}{}{\capstart}#4#5}\else - \adj@dim\FB@wd+\FB@wadj=\hsize + \adj@dim\FB@wd+\FB@wadj=\hsize\linewidth\hsize \ifx\FBB@wd\relax\edef\FBB@wd{\the\hsize}\fi \FBsetbox@obj{\@ifundefined{capstart}{}{\capstart}#4#5}\FBbuildtrue \FBifcapbeside\flrow@FC\FBB@wd\else\flrow@FB\FBB@wd\fi @@ -855,10 +873,10 @@ \newif\ifOADJ \DeclareFROpt{valign}{\@FB@vpos{#1}} \newcommand\@FB@vpos[1]{% - \if#1t\def\FBafil{}\def\FBbfil{\vfill}\else - \if#1b\def\FBafil{\vfill}\def\FBbfil{}\else - \if#1c\def\FBafil{\vfill}\def\FBbfil{\vfill}\else - \if#1s\def\FBafil{}\def\FBbfil{}% + \if#1t\def\FBafil{}\def\FBbfil{\vss}\else + \if#1b\def\FBafil{\vss}\def\FBbfil{}\else + \if#1c\def\FBafil{\vskip0ptplus1fillminus1000pt}\def\FBbfil{\vskip0ptplus1fillminus1000pt}\else + \if#1s\def\FBafil{\vskip0ptminus1000pt}\def\FBbfil{\vskip0ptminus1000pt}% \fi\fi\fi\fi} \DeclareFROpt{facing}[1]{\flrow@setbool{\FBiffacing}{#1}} \let\FBiffacing\iffalse @@ -1108,6 +1126,7 @@ \let\LT@array\flrow@LT@array}} \newcommand\flrow@LT@array{% \flrow@setlist{{table}{longtable}}\normalfont\floatfont + \belowcaptionskip\captionskip \FBifLTcapwidth \let\flrow@LT@make@row\LT@make@row \def\LT@make@row{% @@ -1132,9 +1151,14 @@ \@ifundefined{KV@#1@\CurrentOption}% {}% {% + \@ifundefined{KV@#1@\CurrentOption @default}{% + \PackageInfo{#1}{Global option `\CurrentOption' ignored}% + }{% + \PackageInfo{#1}{Global option `\CurrentOption' processed}% \edef\FR@tmp{\FR@tmp,\CurrentOption,}% \@expandtwoargs\@removeelement\CurrentOption \@unusedoptionlist\@unusedoptionlist + }% }% }% \edef\FR@tmp{% diff --git a/Master/texmf-dist/tex/latex/floatrow/listpen.sty b/Master/texmf-dist/tex/latex/floatrow/listpen.sty new file mode 100644 index 00000000000..8a84b2c29db --- /dev/null +++ b/Master/texmf-dist/tex/latex/floatrow/listpen.sty @@ -0,0 +1,45 @@ +%% +%% This is file `listpen.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% floatrow.dtx (with options: `listpen') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from listpen.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file floatrow.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +\NeedsTeXFormat{LaTeX2e}[1995/06/01] +\ProvidesPackage{listpen} + [2005/02/07 v0.1a list penalty managing] +\newcommand\allowprelistbreaks{\let\LP@penalty\@beginparpenalty + \@testopt{\LP@setlistbreaks}{-1}} +\newcommand\allowpostlistbreaks{\let\LP@penalty\@endparpenalty + \@testopt{\LP@setlistbreaks}{-1}} +\newcommand\allowitembreaks{\let\LP@penalty\@itempenalty + \@testopt{\LP@setlistbreaks}{-1}} +\@ifdefinable\LP@setlistbreaks{} +\def\LP@setlistbreaks[#1#2]{\def\tempa{-}\def\tempb{#1}\ifx\tempa\tempb + \LP@nolbk[#2]\else\LP@nolbk-[#1]\fi} +\@ifdefinable\LP@nolbk{}\@ifdefinable\LP@penalty{} +\def\LP@nolbk#1[#2]{% + \ifcase#2\LP@penalty\z@ + \or\LP@penalty#1\@lowpenalty + \or\LP@penalty#1\@medpenalty + \or\LP@penalty#1\@highpenalty + \or\LP@penalty#1\@M + \fi} +\endinput +%% +%% End of file `listpen.sty'. |