summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base/ltoutput.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-11-04 23:35:12 +0000
committerKarl Berry <karl@freefriends.org>2014-11-04 23:35:12 +0000
commita60e31b8abec7099c8e6dc5004b173897e28f34f (patch)
tree8c27c6351041ec3a1b3d176f8246e9e4fd10f813 /Master/texmf-dist/source/latex/base/ltoutput.dtx
parentdbe0dfa8444b80708600bb095b9506d3c471a4a9 (diff)
latex2e multicol+doc (4nov14)
git-svn-id: svn://tug.org/texlive/trunk@35512 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base/ltoutput.dtx')
-rw-r--r--Master/texmf-dist/source/latex/base/ltoutput.dtx42
1 files changed, 21 insertions, 21 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltoutput.dtx b/Master/texmf-dist/source/latex/base/ltoutput.dtx
index f57aa19be91..5e2e7d6efb7 100644
--- a/Master/texmf-dist/source/latex/base/ltoutput.dtx
+++ b/Master/texmf-dist/source/latex/base/ltoutput.dtx
@@ -39,7 +39,7 @@
%<*driver>
% \fi
\ProvidesFile{ltoutput.dtx}
- [2014/04/24 v1.2n LaTeX Kernel (Output Routine)]
+ [2014/09/29 v1.2n LaTeX Kernel (Output Routine)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltoutput.dtx}
@@ -474,7 +474,7 @@
% 1 1 iff the float may go on the top of a page.
% 2 1 iff the float may go on the bottom of a page.
% 3 1 iff the float may go on a float page.
-% 4 1 unless the PLACEMENT incluses a !
+% 4 1 unless the PLACEMENT includes a !
% 5 1 iff a type 1 float
% 6 1 iff a type 2 float
% etc.
@@ -823,7 +823,7 @@
\newif \if@twocolumn \@twocolumnfalse
% \end{macrocode}
% Not sure about these: two questions.
-% Should things which must apply to a whole doument be local or
+% Should things which must apply to a whole document be local or
% global (they probably should be `preamble only' commands)?
% Are these three such things?
% \begin{macrocode}
@@ -1564,7 +1564,7 @@
% appropriate times.
%
% If |\@textbottom| ends with a box or rule of non-zero depth
-% then this skip adjustemnt should be done again after it.
+% then this skip adjustment should be done again after it.
%
% I think that the final boxing of the main text page could have a
% common ending which may make it simpler to see what is going on.
@@ -1573,7 +1573,7 @@
% case'.
% \task{CAR}{Further investigation of makecol}
%
-% Also, the |\boxmaxdepth| setting here affects what happens wthin
+% Also, the |\boxmaxdepth| setting here affects what happens within
% |\@texttop| and |\@textbottom|, should it? Is it needed at all?
% \changes{v1.0l}{1994/03/15}{Removed boxmaxdepth setting.}
%
@@ -1602,7 +1602,7 @@
% This is the code which reinserts the inserts. It puts them all
% in one place; this can make some of them come out on the wrong
% page.
-% It has been put into a separate macro to expidite experimentation.
+% It has been put into a separate macro to expedite experimentation.
% \begin{macrocode}
%<*2ekernel|def1|autoload>
\gdef \@reinserts{%
@@ -1924,7 +1924,7 @@
% \end{macrocode}
% This first bit has been moved inside the shipped out box.
%
-% Now the setup inside the shipped out box; this should conatin all
+% Now the setup inside the shipped out box; this should contain all
% the stuff that could only affect typesetting; other stuff may need
% to be reset for the writes also.
%
@@ -2048,7 +2048,7 @@
% The |\boxmaxdepth| setting here was not made local to
% a box so was dangerous. It is needed only within the box made
% by |\@cflt| (and not normally even there), so it has been
-% moved there; this also agrees with the original pseudcode.
+% moved there; this also agrees with the original pseudocode.
%
% \changes{v1.0h}{1993/12/12}{boxmaxdepth setting moved}
% \begin{macrocode}
@@ -2603,11 +2603,11 @@
% get the spacing correct by ad hoc commands.
%
% It is necessary to adjust for the addition of |\parskip| here in
-% case the float is added betweeen paragraphs (\ie when in vertical
+% case the float is added between paragraphs (\ie when in vertical
% mode).
%
% If the nobreak switch is true we need to reset it and clear
-% |\everypar| sionce the float may not reset the flag and cannot reset
+% |\everypar| since the float may not reset the flag and cannot reset
% the |\everypar| globally.
% \changes{v1.0l}{1994/03/15}{Changed \cs{addvspace} to \cs{vskip}}
% \changes{v1.1i}{1994/11/21}
@@ -3095,7 +3095,7 @@
% This part implements controllable floats and other changes
% to the float mechanism.
%
-% It provides, at the doument level, the following command for
+% It provides, at the document level, the following command for
% inclusion in \LaTeX2e{}.
%
% \begin{verbatim}
@@ -3129,7 +3129,7 @@
% commands described above.
%
%
-% In its current form, it also suplies a reasonably exhaustive, and
+% In its current form, it also supplies a reasonably exhaustive, and
% somewhat baroque, means of tracing some aspects of the float
% mechanism.
%
@@ -3455,7 +3455,7 @@
% It uses a local assignment to the normally global counter: a bit
% naughty, perhaps?
%
-% These assgnments are safe so long as the counter involved is only
+% These assignments are safe so long as the counter involved is only
% consulted once (\ie only for the `bang float') with the changed value.
% This is the case within |\@addtocurcol| because it is used only
% once within a call of the output routine (which forms a group).
@@ -3516,7 +3516,7 @@
% \begin{macro}{\@flcheckspace}
% \changes{v1.0f}{1993/12/05}{Command added}
% This ignores space restriction in case BANG; this is still slightly
-% conervative since it does not allow for the fact that, if there is
+% conservative since it does not allow for the fact that, if there is
% no text in the column then |\textfloatsep| is not needed.
% Sets |@tempswa| true if there is room for |\@currbox|.
%
@@ -3620,7 +3620,7 @@
% \item Two consecutive h floats are separated by twice |\intextsep|:
% this could be changed to one by use of |\addvspace|, OK?
% Note that it would also mean that less space is put in if an h
-% float immediaiely follows other spaces. This is also possibly
+% float immediately follows other spaces. This is also possibly
% too big a change, at least for compatibility mode?
% Or it may be simply wrong! It has not been changed.
% \item Now |\@addtocurcol| checks first for just p fps. I think
@@ -3657,13 +3657,13 @@
% One is to change
% |\maketitle| slightly to allow this. Another is to change
% |\@topnewpage| so that more than one |\twocolumn[]| command is
-% allowed; in this case |\maketitle\twoclumn[more text]| will work.
+% allowed; in this case |\maketitle\twocolumn[more text]| will work.
% The former is more robust from the user's viewpoint, but makes the
% code for |\maketitle| rather ad hoc (maybe it is already?).
% Another is to misuse the global twocolumn flag locally within
% |\@topnewpage|.
% Yet another is to move the column count register from the multicol
-% package into the kernel. This has beeen done.
+% package into the kernel. This has been done.
% \item Where should the reinserts be put to maximise the
% probability that footmotes come out on the correct page?
% Or should we go for as much compatibility as possible (but see
@@ -3684,7 +3684,7 @@
%
% It would perhaps be better to document that |\@textbottom|
% and |\@texttop| must have natural height 0pt.
-% \item I cannot see why the vskip adjustement for the depth
+% \item I cannot see why the vskip adjustment for the depth
% is needed if boxmaxdepth is used to ensure that there is never
% a too deep box.
% \item The value of |\boxmaxdepth| should be explicitly set
@@ -3797,7 +3797,7 @@
% The main purpose of this section is to ensure that all the
% float-placement parameters which need to be set in a class file or
% package have been declared. It also describes their use and sets
-% values for them which are reasonable for typical douments using
+% values for them which are reasonable for typical documents using
% US letter or A4 sized paper.
%
% \paragraph{Limits for the placement of floating objects}
@@ -3896,7 +3896,7 @@
% \begin{macro}{\textfloatsep}
% \begin{macro}{\intextsep}
% When a floating object is placed on a page with text, these
-% parameters control the seperation between the float and the other
+% parameters control the separation between the float and the other
% objects on the page. These parameters are used for both
% one-column mode and single-column floats in two-column mode.
% They are all rubber lengths.
@@ -3946,7 +3946,7 @@
% \begin{macro}{\@fptop}
% \begin{macro}{\@fpsep}
% \begin{macro}{\@fpbot}
-% When floating objects are placed on a seperate page or column,
+% When floating objects are placed on a separate page or column,
% called a `float page', the layout of the page is controlled by
% these parameters, which are rubber lengths.
%