summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx42
1 files changed, 21 insertions, 21 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
index c571516ea79..9e37e602bf8 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
@@ -41,7 +41,7 @@
% }^^A
% }
%
-% \date{Released 2017/05/29}
+% \date{Released 2017/07/15}
%
% \maketitle
%
@@ -58,8 +58,8 @@
% \cs{coffin_new:N} \meta{coffin}
% \end{syntax}
% Creates a new \meta{coffin} or raises an error if the name is
-% already taken. The declaration is global. The \meta{coffin} will
-% initially be empty.
+% already taken. The declaration is global. The \meta{coffin} is
+% initially empty.
% \end{function}
%
% \begin{function}[added = 2011-08-17]{\coffin_clear:N, \coffin_clear:c}
@@ -146,7 +146,7 @@
% ~~\Arg{pole} \Arg{offset}
% \end{syntax}
% Sets the \meta{pole} to run horizontally through the \meta{coffin}.
-% The \meta{pole} will be located at the \meta{offset} from the
+% The \meta{pole} is placed at the \meta{offset} from the
% bottom edge of the bounding box of the \meta{coffin}. The
% \meta{offset} should be given as a dimension expression.
% \end{function}
@@ -157,7 +157,7 @@
% \cs{coffin_set_vertical_pole:Nnn} \meta{coffin} \Arg{pole} \Arg{offset}
% \end{syntax}
% Sets the \meta{pole} to run vertically through the \meta{coffin}.
-% The \meta{pole} will be located at the \meta{offset} from the
+% The \meta{pole} is placed at the \meta{offset} from the
% left-hand edge of the bounding box of the \meta{coffin}. The
% \meta{offset} should be given as a dimension expression.
% \end{function}
@@ -201,7 +201,7 @@
% \end{syntax}
% This function joins <coffin_2> to <coffin_1> such that the bounding box
% of \meta{coffin_1} may expand. The new bounding
-% box will cover the area containing the bounding boxes of the two
+% box covers the area containing the bounding boxes of the two
% original coffins. The alignment is carried out by first calculating
% \meta{handle_1}, the point of intersection of \meta{coffin_1-pole_1} and
% \meta{coffin_1-pole_2}, and \meta{handle_2}, the point of intersection
@@ -265,7 +265,7 @@
% the \meta{poles} of the \meta{coffin} to give a set of
% \meta{handles}. It then prints the \meta{coffin} at the current
% location in the source, with the position of the \meta{handles}
-% marked on the coffin. The \meta{handles} will be labelled as part
+% marked on the coffin. The \meta{handles} are labelled as part
% of this process: the locations of the \meta{handles} and the labels
% are both printed in the \meta{color} specified.
% \end{function}
@@ -278,7 +278,7 @@
% This function first calculates the \meta{handle} for the
% \meta{coffin} as defined by the intersection of \meta{pole_1} and
% \meta{pole_2}. It then marks the position of the \meta{handle}
-% on the \meta{coffin}. The \meta{handle} will be labelled as part of
+% on the \meta{coffin}. The \meta{handle} are labelled as part of
% this process: the location of the \meta{handle} and the label are
% both printed in the \meta{color} specified.
% \end{function}
@@ -447,7 +447,7 @@
% structures.
%
% \begin{macro}[EXP, pTF]{\coffin_if_exist:N, \coffin_if_exist:c}
-% Several of the higher-level coffin functions will give multiple
+% Several of the higher-level coffin functions would give multiple
% errors if the coffin does not exist. A cleaner way to handle this
% is provided here: both the box and the coffin structure are
% checked.
@@ -470,7 +470,7 @@
% \end{macro}
%
% \begin{macro}{\@@_if_exist:NT}
-% Several of the higher-level coffin functions will give multiple
+% Several of the higher-level coffin functions would give multiple
% errors if the coffin does not exist. So a wrapper is provided to deal
% with this correctly, issuing an error on erroneous use.
% \begin{macrocode}
@@ -512,14 +512,14 @@
\cs_new_protected:Npn \coffin_new:N #1
{
\box_new:N #1
- \__chk_suspend_log:
+ \__debug_suspend_log:
\prop_clear_new:c { l_@@_corners_ \__int_value:w #1 _prop }
\prop_clear_new:c { l_@@_poles_ \__int_value:w #1 _prop }
\prop_gset_eq:cN { l_@@_corners_ \__int_value:w #1 _prop }
\c_@@_corners_prop
\prop_gset_eq:cN { l_@@_poles_ \__int_value:w #1 _prop }
\c_@@_poles_prop
- \__chk_resume_log:
+ \__debug_resume_log:
}
\cs_generate_variant:Nn \coffin_new:N { c }
% \end{macrocode}
@@ -910,7 +910,7 @@
% the intersection depends on the directions of the poles, which are
% given by $d / c$ and $d' / c'$. However, if one of the poles
% is either horizontal or vertical then one or more of $c$, $d$,
-% $c'$ and $d'$ will be zero and a special case is needed.
+% $c'$ and $d'$ are zero and a special case is needed.
% \begin{macrocode}
\cs_new_protected:Npn \@@_calculate_intersection:nnnnnnnn
#1#2#3#4#5#6#7#8
@@ -918,7 +918,7 @@
\dim_compare:nNnTF {#3} = { \c_zero_dim }
% \end{macrocode}
% The case where the first pole is vertical. So the $x$-component
-% of the interaction will be at $a$. There is then a test on the
+% of the interaction is at $a$. There is then a test on the
% second pole: if it is also vertical then there is an error.
% \begin{macrocode}
{
@@ -927,7 +927,7 @@
{ \bool_set_true:N \l_@@_error_bool }
% \end{macrocode}
% The second pole may still be horizontal, in which case the
-% $y$-component of the intersection will be $b'$. If not,
+% $y$-component of the intersection is $b'$. If not,
% \[
% y = \frac{d'}{c'} \left ( x - a' \right ) + b'
% \]
@@ -1078,7 +1078,7 @@
% }
% This command joins two coffins, using a horizontal and vertical pole
% from each coffin and making an offset between the two. The result
-% is stored as the as a third coffin, which will have all of its handles
+% is stored as the as a third coffin, which has all of its handles
% reset to standard values. First, the more basic alignment function is
% used to get things started.
% \begin{macrocode}
@@ -1090,7 +1090,7 @@
% Correct the placement of the reference point. If the $x$-offset
% is negative then the reference point of the second box is to the left
% of that of the first, which is corrected using a kern. On the right
-% side the first box might stick out, which will show up if it is wider
+% side the first box might stick out, which would show up if it is wider
% than the sum of the $x$-offset and the width of the second box.
% So a second kern may be needed.
% \begin{macrocode}
@@ -1115,7 +1115,7 @@
% \end{macrocode}
% The structures of the parent coffins are now transferred to the new
% coffin, which requires that the appropriate offsets are applied. That
-% will then depend on whether any shift was needed.
+% then depends on whether any shift was needed.
% \begin{macrocode}
\dim_compare:nNnTF \l_@@_offset_x_dim < \c_zero_dim
{
@@ -1192,7 +1192,7 @@
% storage area to be used for the second coffin. The `real' box
% offsets are then calculated, before using these to re-box the
% input coffins. The default poles are then set up, but the final result
-% will depend on how the bounding box is being handled.
+% depends on how the bounding box is being handled.
% \begin{macrocode}
\cs_new_protected:Npn \@@_align:NnnNnnnnN #1#2#3#4#5#6#7#8#9
{
@@ -1279,7 +1279,7 @@
% \begin{macro}{\@@_update_vertical_poles:NNN}
% \begin{macro}[aux]{\@@_update_T:nnnnnnnnN}
% \begin{macro}[aux]{\@@_update_B:nnnnnnnnN}
-% The \texttt{T} and \texttt{B} poles will need to be recalculated
+% The \texttt{T} and \texttt{B} poles need to be recalculated
% after alignment. These functions find the larger absolute value for
% the poles, but this is of course only logical when the poles are
% horizontal.
@@ -1331,7 +1331,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \coffin_typeset:Nnnnn #1#2#3#4#5
{
- \hbox_unpack:N \c_empty_box
+ \mode_leave_vertical:
\@@_align:NnnNnnnnN \c_empty_coffin { H } { l }
#1 {#2} {#3} {#4} {#5} \l_@@_aligned_coffin
\box_use:N \l_@@_aligned_coffin