From a8b2929ce77f8fe3e7578994a6cdeadb778e5b5c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 25 Feb 2010 00:34:37 +0000 Subject: dblfloatfix doc update (24feb10) git-svn-id: svn://tug.org/texlive/trunk@17191 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/dblfloatfix/dblfloatfix.pdf | Bin 0 -> 228040 bytes .../doc/latex/dblfloatfix/dblfloatfix.tex | 62 +++++ .../tex/latex/dblfloatfix/dblfloatfix.sty | 249 +++++++++++++++++++++ .../texmf-dist/tex/latex/ltxmisc/dblfloatfix.sty | 249 --------------------- 4 files changed, 311 insertions(+), 249 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.pdf create mode 100644 Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.tex create mode 100644 Master/texmf-dist/tex/latex/dblfloatfix/dblfloatfix.sty delete mode 100644 Master/texmf-dist/tex/latex/ltxmisc/dblfloatfix.sty (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.pdf b/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.pdf new file mode 100644 index 00000000000..7cb544cc16d Binary files /dev/null and b/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.pdf differ diff --git a/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.tex b/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.tex new file mode 100644 index 00000000000..7198c6acf97 --- /dev/null +++ b/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.tex @@ -0,0 +1,62 @@ +\documentclass[DIV=8, pagesize=auto]{scrartcl} + +\usepackage{fixltx2e} +\usepackage{etex} +\usepackage{lmodern} +\usepackage[T1]{fontenc} +\usepackage{textcomp} +\usepackage[utf8]{inputenc} +\usepackage{microtype} +\usepackage[unicode=true]{hyperref} + +\newcommand*{\pkg}[1]{\textsf{#1}} +\newcommand*{\cs}[1]{\texttt{\textbackslash#1}} +\makeatletter +\newcommand*{\cmd}[1]{\cs{\expandafter\@gobble\string#1}} +\makeatother +\newcommand*{\opt}[1]{\texttt{#1}} + +\addtokomafont{title}{\rmfamily} + +\title{The \pkg{dblfloatfix} package\thanks{This manual corresponds to \pkg{dblfloatfix}~v1.0, dated~2003/11/18.}} +\author{Morten Høgholm, \href{mailto:moho01ab@student.cbs.dk}{\texttt{}}} +\date{2003/11/18} + + +\begin{document} + +\maketitle + +\noindent +This is the \LaTeX\ package \pkg{dblfloatfix} which solves two problems: +% +\renewcommand*{\theenumi}{\alph{enumi}}% +\renewcommand*{\labelenumi}{\theenumi)}% +\begin{enumerate} +\item floats in a \opt{twocolumn} document come out in the right order and +\item allowed float positions are now \texttt{[tbp]}. +\end{enumerate} +% +It may be distributed and/or modified under the +conditions of the \LaTeX\ Project Public License, either version~1.2 +of this license or (at your option) any later version. +The latest version of this license is in\\ +\url{http://www.latex-project.org/lppl.txt} + + +\section*{Usage:} + +This package redefines internals of the \LaTeX\ kernel by merging +the code of the packages \pkg{fixltx2e} (the \pkg{fix2col} part) and \pkg{stfloats}. + +If either of the packages \pkg{stfloats} or \pkg{fix2col} are loaded you will +get an error message and your document will probably not be able +to compile. So don't load them! + +When the new output routine for \LaTeX3 is done, this package will +be obsolete. The sooner the better\ldots + +If you're using the \pkg{subfigure} package this package will provide a +fix for \cmd{\end@dblfloat} by Steven Cochran (the author of \pkg{subfigure}). + +\end{document} diff --git a/Master/texmf-dist/tex/latex/dblfloatfix/dblfloatfix.sty b/Master/texmf-dist/tex/latex/dblfloatfix/dblfloatfix.sty new file mode 100644 index 00000000000..1dbb8cb391f --- /dev/null +++ b/Master/texmf-dist/tex/latex/dblfloatfix/dblfloatfix.sty @@ -0,0 +1,249 @@ +%% This is the LaTeX package dblfloatfix which solves two problems: +%% a)~floats in a twocolumn document come out in the right order and +%% b)~allowed float positions are now [tbp]. +%% +%% It may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.2 +%% 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 +\ProvidesPackage{dblfloatfix}[2003/11/18 v1.0 (MH)] +%% +%% USAGE: +%% +%% This package redefines internals of the LaTeX kernel by merging +%% the code of the packages fixltx2e (the fix2col part) and stfloats. +%% +%% If either of the packages stfloats or fix2col are loaded you will +%% get an error message and your document will probably not be able +%% to compile. So don't load them! +%% +%% When the new output routine for LaTeX3 is done, this package will +%% be obsolete. The sooner the better... +%% +%% If you're using the subfigure package this package will provide a +%% fix for \end@dblfloat by Steven Cochran (the author of subfigure). +%% +%% Morten H\o gholm, +\RequirePackage{fixltx2e} +%% An error message for those who didn't read the instructions. +\newcommand*{\DBLFIXerrormessage}[1]{% + \PackageError{dblfloatfix}{% + Don't use the #1 package!^^J% + Didn't you read the instructions in dblfloatfix.sty?!^^J% + You're in big trouble now...^^J% + Quit immediately (type `X') and correct the mistake}% + {Type `X' dammit!}% +} +%% A check for those users who don't read manuals. +\AtBeginDocument{% + \@ifpackageloaded{stfloats}{\DBLFIXerrormessage{stfloats}}{}% + \@ifpackageloaded{fix2col}{\DBLFIXerrormessage{fix2col}}{}% +%% Here's a fix by Steven Douglas Cochran (the author of subfigure). +%% It is needed in order to make subfigure work with this package as +%% both packages redefine \end@dblfloat. + \@ifpackageloaded{subfigure}{% + \typeout{Redefining \string\end@dblfloat\ for use with subfigure}% + \def\end@dblfloat{% + \if@twocolumn + \@listsubcaptions{\@captype}% + \@endfloatbox + \ifnum\@floatpenalty <\z@ + \@largefloatcheck + \global\dp\@currbox1sp % + \expandafter\@gobble\subfig@end@float + \fi + \else + \end@float + \fi}% + }{}% +} +%% Here we go... +\def\@dblbotlist{} +\newcount\@dblbotnum +\newcounter{dblbotnumber} +\setcounter{dblbotnumber}{2} +\def\@dbflt#1{\@ifnextchar[{\@xdblfloat{#1}}{\@xdblfloat{#1}[tbp]}} + +\def \@dblfloatplacement {% + \global \@dbltopnum \c@dbltopnumber + \global \@dblbotnum \c@dblbotnumber + \global \@dbltoproom \dbltopfraction\@colht + \@textmin \@colht + \advance \@textmin -\@dbltoproom + \@fpmin \dblfloatpagefraction\textheight + \@fptop \@dblfptop + \@fpsep \@dblfpsep + \@fpbot \@dblfpbot + \def\f@depth{1sp}% +} + +\def\@addtodblcol{% + \begingroup + \@insertfalse + \@setfloattypecounts + \@getfpsbit \tw@ + \ifodd\@tempcnta + \@flsetnum \@dbltopnum + \ifnum \@dbltopnum>\z@ + \@tempswafalse + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \else + \ifnum \@fpstype<\sixt@@n + \advance \@dbltoproom \@textmin + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \fi + \advance \@dbltoproom -\@textmin + \fi + \fi + \if@tempswa + \@bitor \@currtype \@deferlist + \@testwrongwidth\@currbox + \if@test + \else + \@bitor \@currtype \@dblbotlist + \if@test + \else + \@tempdima -\ht\@currbox + \advance\@tempdima + -\ifx \@dbltoplist\@empty \dbltextfloatsep + \else \dblfloatsep + \fi + \global \advance \@dbltoproom \@tempdima + \global \advance \@colht \@tempdima + \global \advance \@dbltopnum \m@ne + \@cons \@dbltoplist \@currbox + \@inserttrue + \fi + \fi + \fi + \fi + \fi + \if@insert + \else + \@getfpsbit 4\relax + \ifodd\@tempcnta + \@flsetnum \@dblbotnum + \ifnum \@dblbotnum>\z@ + \@tempswafalse + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \else + \ifnum \@fpstype<\sixt@@n + \advance \@dbltoproom \@textmin + \ifdim \@dbltoproom>\ht\@currbox + \@tempswatrue + \fi + \advance \@dbltoproom -\@textmin + \fi + \fi + \if@tempswa + \@bitor \@currtype \@deferlist + \if@test + \else + \@tempdima -\ht\@currbox + \advance\@tempdima + -\ifx \@dblbotlist\@empty \dbltextfloatsep + \else \dblfloatsep + \fi + \global \advance \@dbltoproom \@tempdima + \global \advance \@colht \@tempdima + \global \advance \@dblbotnum \m@ne + \@cons \@dblbotlist \@currbox + \@inserttrue + \fi + \fi + \fi + \fi + \fi + \if@insert + \else + \@cons\@deferlist\@currbox + \fi + \endgroup +} + +\def\@combinedblfloats{% + \ifx \@dbltoplist\@empty \else \@cdblflt \fi + \ifx \@dblbotlist\@empty \else \@cdblflb \fi +} + +\def\@cdblflt{% + \setbox\@tempboxa \vbox{}% + \let \@elt \@comdblflelt + \@dbltoplist + \let \@elt \relax + \xdef \@freelist {\@freelist\@dbltoplist}% + \global\let \@dbltoplist \@empty + \setbox\@outputbox \vbox% to\textheight + {%\boxmaxdepth\maxdepth %% probably not needed, CAR + \unvbox\@tempboxa\vskip-\dblfloatsep + \ifnum \@dbltopnum>\m@ne + \dblfigrule + \fi + \vskip \dbltextfloatsep + \unvbox \@outputbox + }% +} + +\def\@cdblflb{% + \setbox\@tempboxa \vbox{}% + \let \@elt \@comdblflelt + \@dblbotlist + \let \@elt \relax + \xdef \@freelist {\@freelist\@dblbotlist}% + \global\let \@dblbotlist \@empty + \setbox\@outputbox \vbox% to\textheight + {%\boxmaxdepth\maxdepth %% probably not needed, CAR + \unvbox\@outputbox + \vskip \dbltextfloatsep + \ifnum \@dblbotnum>\m@ne + \dblfigrule + \fi + \unvbox\@tempboxa + \vskip -\dblfloatsep + }% +} + +\def \@doclearpage {% + \ifvoid\footins + \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa + \setbox\@tempboxa\box\@cclv + \xdef\@deferlist{\@toplist\@botlist\@deferlist}% + \global \let \@toplist \@empty + \global \let \@botlist \@empty + \global \@colroom \@colht + \ifx \@currlist\@empty + \else + \@latexerr{Float(s) lost}\@ehb + \global \let \@currlist \@empty + \fi + \@makefcolumn\@deferlist + \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}% + \if@twocolumn + \if@firstcolumn + \xdef\@deferlist{\@dbltoplist\@dblbotlist\@deferlist}% + \global \let \@dbltoplist \@empty + \global \let \@dblbotlist \@empty + \global \@colht \textheight + \begingroup + \@dblfloatplacement + \@makefcolumn\@deferlist + \@whilesw\if@fcolmade \fi{\@outputpage + \@makefcolumn\@deferlist}% + \endgroup + \else + \vbox{}\clearpage + \fi + \fi + \ifx\@deferlist\@empty \else\clearpage \fi + \else + \setbox\@cclv\vbox{\box\@cclv\vfil}% + \@makecol\@opcol + \clearpage + \fi +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/ltxmisc/dblfloatfix.sty b/Master/texmf-dist/tex/latex/ltxmisc/dblfloatfix.sty deleted file mode 100644 index 1dbb8cb391f..00000000000 --- a/Master/texmf-dist/tex/latex/ltxmisc/dblfloatfix.sty +++ /dev/null @@ -1,249 +0,0 @@ -%% This is the LaTeX package dblfloatfix which solves two problems: -%% a)~floats in a twocolumn document come out in the right order and -%% b)~allowed float positions are now [tbp]. -%% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.2 -%% 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 -\ProvidesPackage{dblfloatfix}[2003/11/18 v1.0 (MH)] -%% -%% USAGE: -%% -%% This package redefines internals of the LaTeX kernel by merging -%% the code of the packages fixltx2e (the fix2col part) and stfloats. -%% -%% If either of the packages stfloats or fix2col are loaded you will -%% get an error message and your document will probably not be able -%% to compile. So don't load them! -%% -%% When the new output routine for LaTeX3 is done, this package will -%% be obsolete. The sooner the better... -%% -%% If you're using the subfigure package this package will provide a -%% fix for \end@dblfloat by Steven Cochran (the author of subfigure). -%% -%% Morten H\o gholm, -\RequirePackage{fixltx2e} -%% An error message for those who didn't read the instructions. -\newcommand*{\DBLFIXerrormessage}[1]{% - \PackageError{dblfloatfix}{% - Don't use the #1 package!^^J% - Didn't you read the instructions in dblfloatfix.sty?!^^J% - You're in big trouble now...^^J% - Quit immediately (type `X') and correct the mistake}% - {Type `X' dammit!}% -} -%% A check for those users who don't read manuals. -\AtBeginDocument{% - \@ifpackageloaded{stfloats}{\DBLFIXerrormessage{stfloats}}{}% - \@ifpackageloaded{fix2col}{\DBLFIXerrormessage{fix2col}}{}% -%% Here's a fix by Steven Douglas Cochran (the author of subfigure). -%% It is needed in order to make subfigure work with this package as -%% both packages redefine \end@dblfloat. - \@ifpackageloaded{subfigure}{% - \typeout{Redefining \string\end@dblfloat\ for use with subfigure}% - \def\end@dblfloat{% - \if@twocolumn - \@listsubcaptions{\@captype}% - \@endfloatbox - \ifnum\@floatpenalty <\z@ - \@largefloatcheck - \global\dp\@currbox1sp % - \expandafter\@gobble\subfig@end@float - \fi - \else - \end@float - \fi}% - }{}% -} -%% Here we go... -\def\@dblbotlist{} -\newcount\@dblbotnum -\newcounter{dblbotnumber} -\setcounter{dblbotnumber}{2} -\def\@dbflt#1{\@ifnextchar[{\@xdblfloat{#1}}{\@xdblfloat{#1}[tbp]}} - -\def \@dblfloatplacement {% - \global \@dbltopnum \c@dbltopnumber - \global \@dblbotnum \c@dblbotnumber - \global \@dbltoproom \dbltopfraction\@colht - \@textmin \@colht - \advance \@textmin -\@dbltoproom - \@fpmin \dblfloatpagefraction\textheight - \@fptop \@dblfptop - \@fpsep \@dblfpsep - \@fpbot \@dblfpbot - \def\f@depth{1sp}% -} - -\def\@addtodblcol{% - \begingroup - \@insertfalse - \@setfloattypecounts - \@getfpsbit \tw@ - \ifodd\@tempcnta - \@flsetnum \@dbltopnum - \ifnum \@dbltopnum>\z@ - \@tempswafalse - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \else - \ifnum \@fpstype<\sixt@@n - \advance \@dbltoproom \@textmin - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \fi - \advance \@dbltoproom -\@textmin - \fi - \fi - \if@tempswa - \@bitor \@currtype \@deferlist - \@testwrongwidth\@currbox - \if@test - \else - \@bitor \@currtype \@dblbotlist - \if@test - \else - \@tempdima -\ht\@currbox - \advance\@tempdima - -\ifx \@dbltoplist\@empty \dbltextfloatsep - \else \dblfloatsep - \fi - \global \advance \@dbltoproom \@tempdima - \global \advance \@colht \@tempdima - \global \advance \@dbltopnum \m@ne - \@cons \@dbltoplist \@currbox - \@inserttrue - \fi - \fi - \fi - \fi - \fi - \if@insert - \else - \@getfpsbit 4\relax - \ifodd\@tempcnta - \@flsetnum \@dblbotnum - \ifnum \@dblbotnum>\z@ - \@tempswafalse - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \else - \ifnum \@fpstype<\sixt@@n - \advance \@dbltoproom \@textmin - \ifdim \@dbltoproom>\ht\@currbox - \@tempswatrue - \fi - \advance \@dbltoproom -\@textmin - \fi - \fi - \if@tempswa - \@bitor \@currtype \@deferlist - \if@test - \else - \@tempdima -\ht\@currbox - \advance\@tempdima - -\ifx \@dblbotlist\@empty \dbltextfloatsep - \else \dblfloatsep - \fi - \global \advance \@dbltoproom \@tempdima - \global \advance \@colht \@tempdima - \global \advance \@dblbotnum \m@ne - \@cons \@dblbotlist \@currbox - \@inserttrue - \fi - \fi - \fi - \fi - \fi - \if@insert - \else - \@cons\@deferlist\@currbox - \fi - \endgroup -} - -\def\@combinedblfloats{% - \ifx \@dbltoplist\@empty \else \@cdblflt \fi - \ifx \@dblbotlist\@empty \else \@cdblflb \fi -} - -\def\@cdblflt{% - \setbox\@tempboxa \vbox{}% - \let \@elt \@comdblflelt - \@dbltoplist - \let \@elt \relax - \xdef \@freelist {\@freelist\@dbltoplist}% - \global\let \@dbltoplist \@empty - \setbox\@outputbox \vbox% to\textheight - {%\boxmaxdepth\maxdepth %% probably not needed, CAR - \unvbox\@tempboxa\vskip-\dblfloatsep - \ifnum \@dbltopnum>\m@ne - \dblfigrule - \fi - \vskip \dbltextfloatsep - \unvbox \@outputbox - }% -} - -\def\@cdblflb{% - \setbox\@tempboxa \vbox{}% - \let \@elt \@comdblflelt - \@dblbotlist - \let \@elt \relax - \xdef \@freelist {\@freelist\@dblbotlist}% - \global\let \@dblbotlist \@empty - \setbox\@outputbox \vbox% to\textheight - {%\boxmaxdepth\maxdepth %% probably not needed, CAR - \unvbox\@outputbox - \vskip \dbltextfloatsep - \ifnum \@dblbotnum>\m@ne - \dblfigrule - \fi - \unvbox\@tempboxa - \vskip -\dblfloatsep - }% -} - -\def \@doclearpage {% - \ifvoid\footins - \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa - \setbox\@tempboxa\box\@cclv - \xdef\@deferlist{\@toplist\@botlist\@deferlist}% - \global \let \@toplist \@empty - \global \let \@botlist \@empty - \global \@colroom \@colht - \ifx \@currlist\@empty - \else - \@latexerr{Float(s) lost}\@ehb - \global \let \@currlist \@empty - \fi - \@makefcolumn\@deferlist - \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}% - \if@twocolumn - \if@firstcolumn - \xdef\@deferlist{\@dbltoplist\@dblbotlist\@deferlist}% - \global \let \@dbltoplist \@empty - \global \let \@dblbotlist \@empty - \global \@colht \textheight - \begingroup - \@dblfloatplacement - \@makefcolumn\@deferlist - \@whilesw\if@fcolmade \fi{\@outputpage - \@makefcolumn\@deferlist}% - \endgroup - \else - \vbox{}\clearpage - \fi - \fi - \ifx\@deferlist\@empty \else\clearpage \fi - \else - \setbox\@cclv\vbox{\box\@cclv\vfil}% - \@makecol\@opcol - \clearpage - \fi -} - -\endinput -- cgit v1.2.3