[latex3-commits] [l3svn] r7310 - Rephrase future tense to present tense in l3kernel
noreply at latex-project.org
noreply at latex-project.org
Mon Jun 26 06:00:29 CEST 2017
Author: bruno
Date: 2017-06-26 06:00:28 +0200 (Mon, 26 Jun 2017)
New Revision: 7310
Modified:
trunk/l3kernel/README.md
trunk/l3kernel/expl3.dtx
trunk/l3kernel/interface3.tex
trunk/l3kernel/l3basics.dtx
trunk/l3kernel/l3bootstrap.dtx
trunk/l3kernel/l3box.dtx
trunk/l3kernel/l3candidates.dtx
trunk/l3kernel/l3clist.dtx
trunk/l3kernel/l3coffins.dtx
trunk/l3kernel/l3color.dtx
trunk/l3kernel/l3deprecation.dtx
trunk/l3kernel/l3doc.dtx
trunk/l3kernel/l3docstrip.dtx
trunk/l3kernel/l3drivers.dtx
trunk/l3kernel/l3expan.dtx
trunk/l3kernel/l3file.dtx
trunk/l3kernel/l3final.dtx
trunk/l3kernel/l3flag.dtx
trunk/l3kernel/l3fp-aux.dtx
trunk/l3kernel/l3fp-basics.dtx
trunk/l3kernel/l3fp-convert.dtx
trunk/l3kernel/l3fp-expo.dtx
trunk/l3kernel/l3fp-extended.dtx
trunk/l3kernel/l3fp-logic.dtx
trunk/l3kernel/l3fp-parse.dtx
trunk/l3kernel/l3fp-random.dtx
trunk/l3kernel/l3fp-round.dtx
trunk/l3kernel/l3fp-trig.dtx
trunk/l3kernel/l3fp.dtx
trunk/l3kernel/l3int.dtx
trunk/l3kernel/l3keys.dtx
trunk/l3kernel/l3luatex.dtx
trunk/l3kernel/l3msg.dtx
trunk/l3kernel/l3names.dtx
trunk/l3kernel/l3prg.dtx
trunk/l3kernel/l3prop.dtx
trunk/l3kernel/l3quark.dtx
trunk/l3kernel/l3regex.dtx
trunk/l3kernel/l3seq.dtx
trunk/l3kernel/l3skip.dtx
trunk/l3kernel/l3sort.dtx
trunk/l3kernel/l3str.dtx
trunk/l3kernel/l3styleguide.tex
trunk/l3kernel/l3sys.dtx
trunk/l3kernel/l3tl-analysis.dtx
trunk/l3kernel/l3tl.dtx
trunk/l3kernel/l3token.dtx
trunk/l3kernel/source3.tex
Log:
Rephrase future tense to present tense in l3kernel
I may have gone a bit overboard. Basically I used present
tense to describe what a function does at time of use, and
future for its longer-term effect. For instance see the
description of \cs_new_protected:Npn, which now says roughly
"an error is raised if the cs already exists" and "the cs
will not expand in x-type expansion".
Modified: trunk/l3kernel/README.md
===================================================================
--- trunk/l3kernel/README.md 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/README.md 2017-06-26 04:00:28 UTC (rev 7310)
@@ -30,15 +30,14 @@
The `l3kernel` bundle requires the e-TeX extensions and additional functionality
to support string comparisons, expandable character generation with arbitrary
category codes (for Unicode engines) and PDF support primitives (where direct
-PDF generation is used). The bundle will therefore only work with the following
-engines:
+PDF generation is used). The bundle only works with the following engines:
* pdfTeX v1.40 or later
* XeTeX v0.9994 or later
* LuaTeX v0.70 or later
* e-(u)pTeX from mid-2012 onward
pdfTeX v1.40 was released in 2007, and so any recent TeX distribution
-will support `l3kernel`. Both XeTeX and LuaTeX have developed more
+supports `l3kernel`. Both XeTeX and LuaTeX have developed more
actively over the past few years, and for this reason only recent
releases of these engines are supported.
Modified: trunk/l3kernel/expl3.dtx
===================================================================
--- trunk/l3kernel/expl3.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/expl3.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -97,7 +97,7 @@
% The \pkg{expl3} bundle provides this new programming interface for
% \LaTeX{}. To make programming systematic, \LaTeX3 uses some very
% different conventions to \LaTeXe{} or plain \TeX{}. As a result,
-% programmers starting with \LaTeX3 will need to become familiar with
+% programmers starting with \LaTeX3 need to become familiar with
% the syntax of the new language.
%
% The next section shows where this language fits into a complete
@@ -239,11 +239,11 @@
% \subsection{Formal naming syntax}
%
% We shall now look in more detail at the syntax of these names. A
-% function name in \LaTeX3 will have a name consisting of three parts:
+% function name in \LaTeX3 has a name consisting of three parts:
% \begin{quote}
% |\|\meta{module}|_|\meta{description}|:|\meta{arg-spec}
% \end{quote}
-% while a variable will have (up to) four distinct parts to its name:
+% while a variable has (up to) four distinct parts to its name:
% \begin{quote}
% |\|\meta{scope}|_|\meta{module}|_|\meta{description}|_|\meta{type}
% \end{quote}
@@ -262,7 +262,8 @@
% as needed; the programmer can choose any unused name, consisting
% of letters only, for a module. In general, the module name and module
% prefix should be related: for example, the kernel module containing
-% \texttt{box} functions is called \texttt{l3box}.
+% \texttt{box} functions is called \texttt{l3box}. Module names and
+% programmers' contact details are listed in \pkg{l3prefixes.csv}.
%
% The \emph{description} gives more detailed information about the
% function or parameter, and provides a unique name for it. It should
@@ -351,7 +352,7 @@
% \tl_new:N \l_@@_my_tl
% % \end{macrocode}
% \end{verbatim}
-% will be converted by \pkg{l3docstrip} to
+% is converted by \pkg{l3docstrip} to
% \begin{verbatim}
% \cs_new:Npn \__foo_function:n #1
% ...
@@ -383,7 +384,7 @@
% stack.\footnote{See \emph{The \TeX{}book}, p.\,301, for further
% information.}
%
-% The \meta{type} will be in the list of available
+% The \meta{type} is in the list of available
% \emph{data-types};\footnote{Of course, if a totally new data type is
% needed then this will not be the case. However, it is hoped that only
% the kernel team will need to create new data types.} these include the
@@ -537,7 +538,7 @@
% \begin{quote}
% \cs{seq_gpush:Nn} |\g_ior_file_name_seq| |\l_ior_curr_file_tl|
% \end{quote}
-% we will not get the value of the variable pushed onto the stack,
+% we do not get the value of the variable pushed onto the stack,
% only the variable name itself. Instead a suitable number of
% \cs{exp_after:wN} would be necessary (together with extra braces) to
% change the order of expansion,\footnote{\cs{exp_after:wN} is
@@ -588,7 +589,7 @@
% \end{quote}
% Remember that \texttt{c} arguments are \emph{fully expanded} by
% \TeX{} when creating csnames. This means that (a) the entire
-% argument must be expandable and (b) any variables will be
+% argument must be expandable and (b) any variables are
% converted to their content. So the preceding examples are also
% equivalent to
% \begin{quote}
@@ -629,7 +630,7 @@
% list.\\ Almost the same as the |x| type except here the token list
% is expanded fully until the first unexpandable token is found and
% the rest is left unchanged. Note that if this function finds a
-% space at the beginning of the argument it will gobble it and not
+% space at the beginning of the argument it gobbles it and does not
% expand the next token.
% \end{description}
%
@@ -691,21 +692,21 @@
% within its second argument, according to our conventions. Such a
% function takes two normal \enquote{\texttt{n}} arguments and operates
% on token lists: it might reasonably be named |\tl_test_in:nn|. Thus
-% the variant function we need will be defined with the appropriate
-% argument types and its name will be |\tl_test_in:cV|. Now this code
-% fragment will be simply:
+% the variant function we need would be defined with the appropriate
+% argument types and its name would be |\tl_test_in:cV|. Now this code
+% fragment would be simply:
% \begin{verbatim}
% \tl_test_in:cV { sym #3 } \group at list
% \end{verbatim}
% This code could be improved further by using a sequence |\l_group_seq|
% rather than the bare token list |\group at list|. Note that, in addition
-% to the lack of \tn{expandafter}, the space after the~|}| will be
+% to the lack of \tn{expandafter}, the space after the~|}| is
% silently ignored since all white space is ignored in this programming
% environment.
%
% \subsection{New functions from old}
%
-% For many common functions the \LaTeX3 kernel will provide variants
+% For many common functions the \LaTeX3 kernel provides variants
% with a range of argument forms, and similarly it is expected that
% extension packages providing new functions will make them available in
% all the commonly needed forms.
@@ -761,7 +762,7 @@
%
% This extension mechanism is written so that if the same new form of
% some existing command is implemented by two extension packages then the
-% two definitions will be identical and thus no conflict will occur.
+% two definitions are identical and thus no conflict occurs.
%
% \section{The distribution}
%
@@ -836,7 +837,7 @@
% }
% \explpkg{l3quark}{
% A \enquote{quark} is a command that is defined to expand to
-% itself! Therefore they must never be expanded as this will generate
+% itself! Therefore they must never be expanded as this would generate an
% infinite recursion; they do however have many uses, \emph{e.g.}~as
% special markers and delimiters within code.
% }
@@ -933,7 +934,7 @@
% are driver-dependent. Options available are
% \begin{itemize}[font = \texttt]
% \item[auto] Let \LaTeX3 determine the correct driver. With DVI output, this
-% will select the \texttt{dvips} back-end for \pdfTeX{} and \LuaTeX{}, and
+% selects the \texttt{dvips} back-end for \pdfTeX{} and \LuaTeX{}, and
% \texttt{dvipdfmx} for \pTeX{} and \upTeX{}. This is the standard setting.
% \item[latex2e] Use the \pkg{graphics} package to select the driver, rather
% than \LaTeX3 code.
@@ -952,17 +953,17 @@
% \begin{verbatim}
% \input expl3-generic %
% \end{verbatim}
-% This will enable the programming layer to work with the other formats.
+% This enables the programming layer to work with the other formats.
% As no options are available loading in this way, the \enquote{native}
% drivers are automatically used. If this \enquote{generic} loader is
-% used with \LaTeXe{} the code will automatically switch to the appropriate
+% used with \LaTeXe{} the code automatically switches to the appropriate
% package route.
%
% After loading the programming layer using the generic interface, the
% commands \cs{ExplSyntaxOn} and \cs{ExplSyntaxOff} and the code-level
-% functions and variables detailed in \pkg{interface3} will be available.
-% Note that other \LaTeXe{} packages \emph{using} \pkg{expl3} will not
-% be loadable: package loading is dependent on the \LaTeXe{} package-management
+% functions and variables detailed in \pkg{interface3} are available.
+% Note that other \LaTeXe{} packages \emph{using} \pkg{expl3} are not
+% loadable: package loading is dependent on the \LaTeXe{} package-management
% mechanism.
%
% \section{Engine/primitive requirements}
@@ -1238,7 +1239,7 @@
% \end{macrocode}
% \end{macro}
%
-% Load the business end: this will leave \cs{expl3} syntax on.
+% Load the business end: this leaves \cs{expl3} syntax on.
% \begin{macrocode}
\input{expl3-code.tex}
% \end{macrocode}
@@ -1268,7 +1269,7 @@
% \begin{variable}[int]{\l__expl_native_drivers_bool}
% With the code now loaded, options can be handled using a real key--value
% interpreter. The \enquote{faked} options are also included so that any
-% erroneous input will be mopped up (\emph{e.g.}~\texttt{log-function =
+% erroneous input is mopped up (\emph{e.g.}~\texttt{log-function =
% foo}). The checks on driver choice are set up here, so when actually
% the driver it's a straight forward operation.
% \begin{macrocode}
@@ -1588,7 +1589,7 @@
% \end{macrocode}
% The \cs{relax} stops \cs{RequirePackage} from scanning for a date
% argument. Putting \tn{endinput} \emph{after} loading the package is
-% crucial, as otherwise \tn{endinput} will close the file
+% crucial, as otherwise \tn{endinput} would close the file
% \file{expl3.sty} at the end of its first line: indeed, as long as
% \file{expl3.sty} is open it is impossible to close the file
% \file{expl3-generic.tex}.
@@ -1668,7 +1669,7 @@
% \end{macro}
% \end{macro}
%
-% Load the business end: this will leave \cs{expl3} syntax on.
+% Load the business end: this leaves \cs{expl3} syntax on.
% \begin{macrocode}
\input expl3-code.tex %
% \end{macrocode}
Modified: trunk/l3kernel/interface3.tex
===================================================================
--- trunk/l3kernel/interface3.tex 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/interface3.tex 2017-06-26 04:00:28 UTC (rev 7310)
@@ -37,9 +37,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% This document will typeset the LaTeX3 interface descriptions a single
-% document. This will produce quite a large file (more than 170 pages
-% currently).
+% This document typesets the LaTeX3 interface descriptions a single document.
+% This produces quite a large file (more than 170 pages currently).
%
% There is also a full version of the sources (source3.tex) which additionally
% also typesets the command implementations.
Modified: trunk/l3kernel/l3basics.dtx
===================================================================
--- trunk/l3kernel/l3basics.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3basics.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -98,11 +98,11 @@
% \end{syntax}
% Adds \meta{token} to the list of \meta{tokens} to be inserted
% when the current group level ends. The list of \meta{tokens} to be
-% inserted will be empty at the beginning of a group: multiple
+% inserted is empty at the beginning of a group: multiple
% applications of \cs{group_insert_after:N} may be used to build
% the inserted list one \meta{token} at a time. The current group
% level may be closed by a \cs{group_end:} function or by a token
-% with category code $2$ (close-group). The later will be a ^^A{
+% with category code $2$ (close-group), namely a ^^A{
% |}| if standard category codes apply.
% \end{function}
%
@@ -115,7 +115,7 @@
% arguments absorbed by the function. In the following, \meta{code}
% is therefore used as a shorthand for \enquote{replacement text}.
%
-% Functions which are not \enquote{protected} will be fully expanded
+% Functions which are not \enquote{protected} are fully expanded
% inside an \texttt{x} expansion. In contrast, \enquote{protected}
% functions are not expanded within \texttt{x} expansions.
%
@@ -124,7 +124,7 @@
% Functions can be created with no requirement that they are declared
% first (in contrast to variables, which must always be declared).
% Declaring a function before setting up the code means that the name
-% chosen will be checked and an error raised if it is already in use.
+% chosen is checked and an error raised if it is already in use.
% The name of a function can be checked at the point of definition using
% the \cs[no-index]{cs_new\ldots} functions: this is recommended for all
% functions which are defined for the first time.
@@ -136,17 +136,17 @@
% \begin{description}
% \item[\texttt{new}]
% Create a new function with the \texttt{new} scope,
-% such as \cs{cs_new:Npn}. The definition is global and will result in
+% such as \cs{cs_new:Npn}. The definition is global and results in
% an error if it is already defined.
% \item[\texttt{set}]
% Create a new function with the \texttt{set} scope,
% such as \cs{cs_set:Npn}. The definition is restricted to the current
-% \TeX{} group and will not result in an error if the function is already
+% \TeX{} group and does not result in an error if the function is already
% defined.
% \item[\texttt{gset}]
% Create a new function with the \texttt{gset} scope,
% such as \cs{cs_gset:Npn}. The definition is global and
-% will not result in an error if the function is already defined.
+% does not result in an error if the function is already defined.
% \end{description}
%
% Within each set of scope there are different ways to define a function.
@@ -193,7 +193,7 @@
% Creates \meta{function} to expand to \meta{code} as replacement text.
% Within the \meta{code}, the \meta{parameters} (|#1|, |#2|,
% \emph{etc.}) will be replaced by those absorbed by the function.
-% The definition is global and an error will result if the
+% The definition is global and an error results if the
% \meta{function} is already defined.
% \end{function}
%
@@ -210,7 +210,7 @@
% \emph{etc.}) will be replaced by those absorbed by the function.
% When the \meta{function} is used the \meta{parameters} absorbed
% cannot contain \cs{par} tokens. The definition is global and
-% an error will result if the \meta{function} is already defined.
+% an error results if the \meta{function} is already defined.
% \end{function}
%
% \begin{function}
@@ -225,7 +225,7 @@
% Within the \meta{code}, the \meta{parameters} (|#1|, |#2|,
% \emph{etc.}) will be replaced by those absorbed by the function.
% The \meta{function} will not expand within an \texttt{x}-type
-% argument. The definition is global and an error will result if the
+% argument. The definition is global and an error results if the
% \meta{function} is already defined.
% \end{function}
%
@@ -243,7 +243,7 @@
% When the \meta{function} is used the \meta{parameters} absorbed
% cannot contain \cs{par} tokens. The \meta{function} will not
% expand within an \texttt{x}-type argument. The definition is global
-% and an error will result if the \meta{function} is already defined.
+% and an error results if the \meta{function} is already defined.
% \end{function}
%
% \begin{function}{\cs_set:Npn, \cs_set:cpn, \cs_set:Npx, \cs_set:cpx}
@@ -388,7 +388,7 @@
% automatically from the function signature. These \meta{parameters}
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. The definition is global and
-% an error will result if the \meta{function} is already defined.
+% an error results if the \meta{function} is already defined.
% \end{function}
%
% \begin{function}
@@ -405,7 +405,7 @@
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. When the \meta{function} is used the \meta{parameters}
% absorbed cannot contain \cs{par} tokens. The definition is global and
-% an error will result if the \meta{function} is already defined.
+% an error results if the \meta{function} is already defined.
% \end{function}
%
% \begin{function}
@@ -422,7 +422,7 @@
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. The \meta{function} will not expand within an \texttt{x}-type
% argument. The definition is global and
-% an error will result if the \meta{function} is already defined.
+% an error results if the \meta{function} is already defined.
% \end{function}
%
% \begin{function}
@@ -440,7 +440,7 @@
% function. When the \meta{function} is used the \meta{parameters}
% absorbed cannot contain \cs{par} tokens. The \meta{function} will not
% expand within an \texttt{x}-type argument. The definition is global and
-% an error will result if the \meta{function} is already defined.
+% an error results if the \meta{function} is already defined.
% \end{function}
%
% \begin{function}
@@ -670,8 +670,7 @@
% \cs{cs_meaning:N} \meta{control sequence}
% \end{syntax}
% This function expands to the \emph{meaning} of the \meta{control sequence}
-% control sequence. This will show the \meta{replacement text} for a
-% macro.
+% control sequence. For a macro, this includes the \meta{replacement text}.
% \begin{texnote}
% This is \TeX{}'s \tn{meaning} primitive.
% The \texttt{c} variant correctly reports undefined arguments.
@@ -710,8 +709,8 @@
% The content for \meta{control sequence name} may be literal
% material or from other expandable functions. The
% \meta{control sequence name} must, when fully expanded, consist
-% of character tokens which are not active: typically, they will
-% be of category code $10$ (space), $11$ (letter)
+% of character tokens which are not active: typically
+% of category code $10$ (space), $11$ (letter)
% or $12$ (other), or a mixture of these.
% \end{function}
%
@@ -752,8 +751,8 @@
% The content for \meta{control sequence name} may be literal
% material or from other expandable functions. The
% \meta{control sequence name} must, when fully expanded, consist
-% of character tokens which are not active: typically, they will
-% be of category code $10$ (space), $11$ (letter)
+% of character tokens which are not active: typically
+% of category code $10$ (space), $11$ (letter)
% or $12$ (other), or a mixture of these.
% \begin{texnote}
% These are the \TeX{} primitives \tn{csname} and \tn{endcsname}.
@@ -782,22 +781,22 @@
% \end{syntax}
% Converts the given \meta{control sequence} into a series of
% characters with category code $12$ (other), except spaces,
-% of category code $10$. The sequence will \emph{not} include
-% the current escape token, \emph{cf.}~\cs{token_to_str:N}.
+% of category code $10$. The result does \emph{not} include
+% the current escape token, contrarily to \cs{token_to_str:N}.
% Full expansion of this function requires exactly $2$ expansion
% steps, and so an \texttt{x}-type expansion, or two
-% \texttt{o}-type expansions will be required to
+% \texttt{o}-type expansions are required to
% convert the \meta{control sequence} to a sequence of characters
% in the input stream. In most cases, an \texttt{f}-expansion
-% will be correct as well, but this loses a space at the start
+% is correct as well, but this loses a space at the start
% of the result.
% \end{function}
%
% \section{Using or removing tokens and arguments}
%
% Tokens in the input can be read and used or read and discarded.
-% If one or more tokens are wrapped in braces then in absorbing them
-% the outer set will be removed. At the same time, the category code
+% If one or more tokens are wrapped in braces then when absorbing them
+% the outer set is removed. At the same time, the category code
% of each token is set when the token is read by a function (if it
% is read more than once, the category code is determined by
% the situation in force when first function absorbs the token).
@@ -809,21 +808,21 @@
% \cs{use:nnn} \Arg{group_1} \Arg{group_2} \Arg{group_3}
% \cs{use:nnnn} \Arg{group_1} \Arg{group_2} \Arg{group_3} \Arg{group_4}
% \end{syntax}
-% As illustrated, these functions will absorb between one and four
+% As illustrated, these functions absorb between one and four
% arguments, as indicated by the argument specifier. The braces
-% surrounding each argument will be removed leaving the remaining
-% tokens in the input stream. The category code of these tokens will
-% also be fixed by this process (if it has not already been by some
+% surrounding each argument are removed and the remaining tokens are
+% left in the input stream. The category code of these tokens is
+% also fixed by this process (if it has not already been by some
% other absorption). All of these functions require only a single
% expansion to operate, so that one expansion of
% \begin{verbatim}
% \use:nn { abc } { { def } }
% \end{verbatim}
-% will result in the input stream containing
+% results in the input stream containing
% \begin{verbatim}
% abc { def }
% \end{verbatim}
-% \emph{i.e.} only the outer braces will be removed.
+% \emph{i.e.} only the outer braces are removed.
% \end{function}
%
% \begin{function}[EXP]{\use_i:nn, \use_ii:nn}
@@ -836,7 +835,7 @@
% the first argument and leaves the content of the second argument in
% the input stream.
% The category code
-% of these tokens will also be fixed (if it has not already been by
+% of these tokens is also fixed (if it has not already been by
% some other absorption). A single expansion is needed for the
% functions to take effect.
% \end{function}
@@ -851,7 +850,7 @@
% \cs{use_ii:nnn} and \cs{use_iii:nnn} work similarly, leaving the
% content of second or third arguments in the input stream, respectively.
% The category code
-% of these tokens will also be fixed (if it has not already been by
+% of these tokens is also fixed (if it has not already been by
% some other absorption). A single expansion is needed for the
% functions to take effect.
% \end{function}
@@ -868,7 +867,7 @@
% \cs{use_ii:nnnn}, \cs{use_iii:nnnn} and \cs{use_iv:nnnn} work similarly,
% leaving the content of second, third or fourth arguments in the input
% stream, respectively. The category code
-% of these tokens will also be fixed (if it has not already been by
+% of these tokens is also fixed (if it has not already been by
% some other absorption). A single expansion is needed for the
% functions to take effect.
% \end{function}
@@ -877,20 +876,20 @@
% \begin{syntax}
% \cs{use_i_ii:nnn} \Arg{arg_1} \Arg{arg_2} \Arg{arg_3}
% \end{syntax}
-% This functions will absorb three arguments and leave the content of the
+% This function absorbs three arguments and leaves the content of the
% first and second in the input stream. The category code of
-% these tokens will also be fixed (if it has not already been by
+% these tokens is also fixed (if it has not already been by
% some other absorption). A single expansion is needed for the
-% functions to take effect. An example:
+% function to take effect. An example:
% \begin{verbatim}
% \use_i_ii:nnn { abc } { { def } } { ghi }
% \end{verbatim}
-% will result in the input stream containing
+% results in the input stream containing
% \begin{verbatim}
% abc { def }
% \end{verbatim}
-% \emph{i.e.} the outer braces will be removed and the third group
-% will be removed.
+% \emph{i.e.} the outer braces are removed and the third group
+% is removed.
% \end{function}
%
% \begin{function}[EXP]
@@ -974,17 +973,17 @@
% \begin{quote}
% |\cs_if_free:cTF {abc}| \Arg{true code} \Arg{false code}
% \end{quote}
-% a function that will turn the first argument into a control sequence
+% a function that turns the first argument into a control sequence
% (since it's marked as |c|) then checks whether this control sequence
-% is still free and then depending on the result carry out the code in
+% is still free and then depending on the result carries out the code in
% the second argument (true case) or in the third argument (false
% case).
%
% These type of functions are known as \enquote{conditionals};
-% whenever a |TF| function is defined it will usually be accompanied by
+% whenever a |TF| function is defined it is usually accompanied by
% |T| and |F| functions as well. These are provided for convenience when
% the branch only needs to go a single way. Package writers are free to
-% choose which types to define but the kernel definitions will always
+% choose which types to define but the kernel definitions always
% provide all three versions.
%
% Important to note is that these branching conditionals with \meta{true
@@ -993,7 +992,7 @@
% the input stream.
%
% These conditional functions may or may not be fully expandable, but if
-% they are expandable they will be accompanied by a \enquote{predicate}
+% they are expandable they are accompanied by a \enquote{predicate}
% for the same test as described below.
%
% \item[Predicates]
@@ -1016,8 +1015,8 @@
% \Arg{true code} \Arg{false code}
% \end{quote}
%
-% For each predicate defined, a \enquote{branching conditional} will
-% also exist that behaves like a conditional described above.
+% For each predicate defined, a \enquote{branching conditional}
+% also exists that behaves like a conditional described above.
%
% \item[Primitive conditionals]
% There is a third variety of conditional, which is the original
@@ -1052,7 +1051,7 @@
% \end{syntax}
% Tests whether the \meta{control sequence} is currently defined
% (whether as a function or another control sequence type). Any
-% valid definition of \meta{control sequence} will evaluate as
+% valid definition of \meta{control sequence} evaluates as
% \texttt{true}.
% \end{function}
%
@@ -1062,7 +1061,7 @@
% \cs{cs_if_free:NTF} \meta{control sequence} \Arg{true code} \Arg{false code}
% \end{syntax}
% Tests whether the \meta{control sequence} is currently free to
-% be defined. This test will be \texttt{false} if the
+% be defined. This test is \texttt{false} if the
% \meta{control sequence} currently exists (as defined by
% \cs{cs_if_exist:N}).
% \end{function}
@@ -1071,13 +1070,13 @@
%
% The \eTeX{} engine itself provides many different conditionals. Some
% expand whatever comes after them and others don't. Hence the names
-% for these underlying functions will often contain a |:w| part but
+% for these underlying functions often contains a |:w| part but
% higher level functions are often available. See for instance
% \cs{int_compare_p:nNn} which is a wrapper for \cs{if_int_compare:w}.
%
% Certain conditionals deal with specific data types like boxes and
% fonts and are described there. The ones described below are either
-% the universal conditionals or deal with control sequences. We will
+% the universal conditionals or deal with control sequences. We
% prefix primitive conditionals with |\if_|.
%
% \begin{function}[EXP]
@@ -1116,7 +1115,7 @@
% "\if:w" <token_1> <token_2> <true code> "\else:" <false code> "\fi:" \\
% "\if_catcode:w" <token_1> <token_2> <true code> "\else:" <false code> "\fi:"
% \end{syntax}
-% These conditionals will expand any following tokens until two
+% These conditionals expand any following tokens until two
% unexpandable tokens are left. If you wish to prevent this expansion,
% prefix the token in question with "\exp_not:N". "\if_catcode:w"
% tests if the category codes of the two tokens are the same whereas
@@ -1216,7 +1215,7 @@
% \meta{processor} function in three parts: the \meta{name}, the
% \meta{signature} and a logic token indicating if a colon was found
% (to differentiate variables from function names). The \meta{name}
-% will not include the escape character, and both the \meta{name} and
+% does not include the escape character, and both the \meta{name} and
% \meta{signature} are made up of tokens with category code $12$
% (other). The \meta{processor} should be a function with argument
% specification \texttt{:nnN} (plus any trailing arguments needed).
@@ -1291,7 +1290,7 @@
%
% Having given all the \TeX{} primitives a consistent name, we need to
% give sensible names to the ones we actually want to use.
-% These will be defined as needed in the appropriate modules, but
+% These will be defined as needed in the appropriate modules, but we
% do a few now, just to get started.\footnote{This renaming gets expensive
% in terms of csname usage, an alternative scheme would be to just use
% the \cs[no-index]{tex_\ldots:D} name in the cases where no good alternative exists.}
@@ -1633,7 +1632,7 @@
% following the |:| in the name. Although we could define functions to
% remove ten arguments or more using separate calls of
% \cs{use_none:nnnnn}, this is very non-intuitive to the programmer
-% who will assume that expanding such a function once will take care
+% who will assume that expanding such a function once takes care
% of gobbling all the tokens in one go.
% \begin{macrocode}
\cs_set:Npn \use_none:n #1 { }
@@ -1673,9 +1672,9 @@
% interface.
%
% \begin{macro}[EXP]{\prg_return_true:, \prg_return_false:}
-% The idea here is that \cs{exp:w} will expand fully any
-% \cs{else:} and the \cs{fi:} that are waiting to be discarded,
-% before reaching the \cs{exp_end:} which will leave the expansion null.
+% The idea here is that \cs{exp:w} expands fully any
+% \cs{else:} and \cs{fi:} that are waiting to be discarded,
+% before reaching the \cs{exp_end:} which leaves an empty expansion.
% The code can then leave either the first or second argument in the
% input stream. This means that all of the branching code has to contain
% at least two tokens: see how the logical tests are actually implemented
@@ -1688,7 +1687,7 @@
% \end{macrocode}
% An extended state space could be implemented by including a more
% elaborate function in place of \cs{use_i:nn}/\cs{use_ii:nn}. Provided
-% two arguments are absorbed then the code will work.
+% two arguments are absorbed then the code would work.
% \end{macro}
%
% \begin{macro}
@@ -1853,7 +1852,7 @@
% text (or empty), 6: replacement. Remember that the logic-returning
% functions expect two arguments to be present after \cs{exp_end:}:
% notice the construction of the different variants relies on this,
-% and that the |TF| variant will be slightly faster than the |T|
+% and that the |TF| and |F| variants will be slightly faster than the |T|
% version. The |p| form is only valid for expandable tests, we check
% for that by making sure that the second argument is empty.
% \begin{macrocode}
@@ -2478,8 +2477,8 @@
% stands for csname argument, see the expansion module). Global
% versions are also provided.
%
-% \cs{cs_set_nopar:cpn}\meta{string}\meta{rep-text} will turn \meta{string}
-% into a csname and then assign \meta{rep-text} to it by using
+% \cs{cs_set_nopar:cpn}\meta{string}\meta{rep-text} turns \meta{string}
+% into a csname and then assigns \meta{rep-text} to it by using
% \cs{cs_set_nopar:Npn}. This means that there might be a parameter
% string between the two arguments.
% \begin{macrocode}
Modified: trunk/l3kernel/l3bootstrap.dtx
===================================================================
--- trunk/l3kernel/l3bootstrap.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3bootstrap.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -24,10 +24,9 @@
% \begin{macro}{\GetIdInfo}
% \begin{macro}[aux]{\GetIdInfoAuxI, \GetIdInfoAuxII, \GetIdInfoAuxIII}
% The idea here is to extract out the information needed from a standard
-% \textsc{svn} \texttt{Id} line, but without a line that will get
-% changed when the file is checked in. Hence the fact that there is
-% not a line which includes both a dollar sign and the \texttt{Id}
-% keyword together!
+% \textsc{svn} \texttt{Id} line, but to avoid a line that would get
+% changed when the file is checked in. Hence the fact that none of the
+% lines here include both a dollar sign and the \texttt{Id} keyword!
%
% At this stage, no test has taken place for the \eTeX{} extensions, and
% so using \tn{protected} could give an error. To avoid that, it is used
@@ -80,7 +79,7 @@
% Here, |#1| is |Id|, |#2| is the file name, |#3| is the extension,
% |#4| is the version, |#5| is the check in date and |#6| is the check in
% time and user, plus some trailing spaces. If |#4| is the marker |-1| value
-% then |#5| and |#6| will be empty.
+% then |#5| and |#6| are empty.
% \begin{macrocode}
\csname protected\endcsname\gdef\GetIdInfoAuxII$#1 #2.#3 #4 #5 #6$%
{%
@@ -339,7 +338,7 @@
% \end{macrocode}
% As the user might be making a custom format, no assumption is made about
% matching package mode with only loading the \Lua{} code once. Instead, a
-% query to \Lua{} will reveal what mode is in operation.
+% query to \Lua{} reveals what mode is in operation.
% \begin{macrocode}
\ifnum 0%
\directlua{
@@ -579,7 +578,7 @@
% \begin{macro}{\ExplSyntaxOff}
% Before changing any category codes, in package mode we need to save
% the situation before loading. Note the set up here means that once applied
-% \cs{ExplSyntaxOff} will be a \enquote{do nothing} command until
+% \cs{ExplSyntaxOff} becomes a \enquote{do nothing} command until
% \cs{ExplSyntaxOn} is used. For format mode, there is no need to save
% category codes so that step is skipped.
% \begin{macrocode}
@@ -629,7 +628,7 @@
% The idea here is that multiple \cs{ExplSyntaxOn} calls are not
% going to mess up category codes, and that multiple calls to
% \cs{ExplSyntaxOff} are also not wasting time. Applying
-% \cs{ExplSyntaxOn} will alter the definition of \cs{ExplSyntaxOff}
+% \cs{ExplSyntaxOn} alters the definition of \cs{ExplSyntaxOff}
% and so in package mode this function should not be used until after
% the end of the loading process!
% \begin{macrocode}
Modified: trunk/l3kernel/l3box.dtx
===================================================================
--- trunk/l3kernel/l3box.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3box.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -58,8 +58,8 @@
% \cs{box_new:N} \meta{box}
% \end{syntax}
% Creates a new \meta{box} or raises an error if the name is
-% already taken. The declaration is global. The \meta{box} will
-% initially be void.
+% already taken. The declaration is global. The \meta{box} is
+% initially void.
% \end{function}
%
% \begin{function}{\box_clear:N, \box_clear:c, \box_gclear:N, \box_gclear:c}
@@ -274,7 +274,7 @@
% \end{syntax}
% Sets the \meta{box} equal to the last item (box) added to the current
% partial list, removing the item from the list at the same time. When
-% applied to the main vertical list, the \meta{box} will always be void as
+% applied to the main vertical list, the \meta{box} is always void as
% it is not possible to recover the last added item.
% \end{function}
%
@@ -338,7 +338,7 @@
% \section{Boxes and color}
%
% All \LaTeX{}3 boxes are \enquote{color safe}: a color set inside the box
-% will not apply after the end of the box has occurred.
+% stops applying after the end of the box has occurred.
%
% \section{Horizontal mode boxes}
%
@@ -393,8 +393,7 @@
% \cs{hbox_overlap_right:n} \Arg{contents}
% \end{syntax}
% Typesets the \meta{contents} into a horizontal box of zero width
-% such that material will protrude to the right of the insertion
-% point.
+% such that material protrudes to the right of the insertion point.
% \end{function}
%
% \begin{function}[updated = 2017-04-05]{\hbox_overlap_left:n}
@@ -402,8 +401,7 @@
% \cs{hbox_overlap_left:n} \Arg{contents}
% \end{syntax}
% Typesets the \meta{contents} into a horizontal box of zero width
-% such that material will protrude to the left of the insertion
-% point.
+% such that material protrudes to the left of the insertion point.
% \end{function}
%
% \begin{function}[updated = 2017-04-05]
@@ -466,11 +464,11 @@
% Vertical boxes inherit their baseline from their contents. The
% standard case is that the baseline of the box is at the same position
% as that of the last item added to the box. This means that the box
-% will have no depth unless the last item added to it had depth. As a
+% has no depth unless the last item added to it had depth. As a
% result most vertical boxes have a large height value and small or
% zero depth. The exception are |_top| boxes, where the reference point
% is that of the first item added. These tend to have a large depth and
-% small height, although the latter will typically be non-zero.
+% small height, although the latter is typically non-zero.
%
% \begin{function}[updated = 2017-04-05]{\vbox:n}
% \begin{syntax}
@@ -486,7 +484,7 @@
% \end{syntax}
% Typesets the \meta{contents} into a vertical box of natural height
% and includes this box in the current list for typesetting. The
-% baseline of the box will be equal to that of the \emph{first}
+% baseline of the box is equal to that of the \emph{first}
% item added to the box.
% \end{function}
%
@@ -522,7 +520,7 @@
% \cs{vbox_set_top:Nn} \meta{box} \Arg{contents}
% \end{syntax}
% Typesets the \meta{contents} at natural height and then stores the
-% result inside the \meta{box}. The baseline of the box will be equal
+% result inside the \meta{box}. The baseline of the box is equal
% to that of the \emph{first} item added to the box.
% \end{function}
%
@@ -622,13 +620,13 @@
% Resizes the \meta{box} to fit within the given \meta{x-size} (horizontally)
% and \meta{y-size} (vertically); both of the sizes are dimension
% expressions. The \meta{y-size} is the height only: it does not include any
-% depth. The updated \meta{box} will be an |hbox|, irrespective of the nature
+% depth. The updated \meta{box} is an |hbox|, irrespective of the nature
% of the \meta{box} before the resizing is applied. The final size of the
-% \meta{box} will be the smaller of \Arg{x-size} and \Arg{y-size},
-% \emph{i.e.}~the result will fit within the dimensions specified. Negative
-% sizes will cause the material in the \meta{box} to be reversed in direction,
-% but the reference point of the \meta{box} will be unchanged. Thus a negative
-% \meta{y-size} will result in the \meta{box} having a depth dependent on the
+% \meta{box} is the smaller of \Arg{x-size} and \Arg{y-size},
+% \emph{i.e.}~the result fits within the dimensions specified. Negative
+% sizes cause the material in the \meta{box} to be reversed in direction,
+% but the reference point of the \meta{box} is unchanged. Thus a negative
+% \meta{y-size} results in the \meta{box} having a depth dependent on the
% height of the original and \emph{vice versa}. The resizing applies within
% the current \TeX{} group level.
% \end{function}
@@ -641,13 +639,13 @@
% Resizes the \meta{box} to fit within the given \meta{x-size} (horizontally)
% and \meta{y-size} (vertically); both of the sizes are dimension
% expressions. The \meta{y-size} is the total vertical size (height plus
-% depth). The updated \meta{box} will be an |hbox|, irrespective of the nature
+% depth). The updated \meta{box} is an |hbox|, irrespective of the nature
% of the \meta{box} before the resizing is applied. The final size of the
-% \meta{box} will be the smaller of \Arg{x-size} and \Arg{y-size},
-% \emph{i.e.}~the result will fit within the dimensions specified. Negative
-% sizes will cause the material in the \meta{box} to be reversed in direction,
-% but the reference point of the \meta{box} will be unchanged. Thus a negative
-% \meta{y-size} will result in the \meta{box} having a depth dependent on the
+% \meta{box} is the smaller of \Arg{x-size} and \Arg{y-size},
+% \emph{i.e.}~the result fits within the dimensions specified. Negative
+% sizes cause the material in the \meta{box} to be reversed in direction,
+% but the reference point of the \meta{box} is unchanged. Thus a negative
+% \meta{y-size} results in the \meta{box} having a depth dependent on the
% height of the original and \emph{vice versa}. The resizing applies within
% the current \TeX{} group level.
% \end{function}
@@ -660,11 +658,11 @@
% Resizes the \meta{box} to \meta{y-size} (vertically), scaling the horizontal
% size by the same amount; \meta{y-size} is a dimension expression. The
% \meta{y-size} is the height only: it does not include any depth. The updated
-% \meta{box} will be an |hbox|, irrespective of the nature of the \meta{box}
-% before the resizing is applied. A negative \meta{y-size} will cause the
+% \meta{box} is an |hbox|, irrespective of the nature of the \meta{box}
+% before the resizing is applied. A negative \meta{y-size} causes the
% material in the \meta{box} to be reversed in direction, but the reference
-% point of the \meta{box} will be unchanged. Thus a negative \meta{y-size}
-% will result in the \meta{box} having a depth dependent on the height of the
+% point of the \meta{box} is unchanged. Thus a negative \meta{y-size}
+% results in the \meta{box} having a depth dependent on the height of the
% original and \emph{vice versa}. The resizing applies within the current
% \TeX{} group level.
% \end{function}
@@ -677,11 +675,11 @@
% Resizes the \meta{box} to \meta{y-size} (vertically), scaling the horizontal
% size by the same amount; \meta{y-size} is a dimension expression. The
% \meta{y-size} is the total vertical size (height plus depth). The updated
-% \meta{box} will be an |hbox|, irrespective of the nature of the \meta{box}
-% before the resizing is applied. A negative \meta{y-size} will cause
+% \meta{box} is an |hbox|, irrespective of the nature of the \meta{box}
+% before the resizing is applied. A negative \meta{y-size} causes
% the material in the \meta{box} to be reversed in direction, but the
-% reference point of the \meta{box} will be unchanged. Thus a negative
-% \meta{y-size} will result in the \meta{box} having a depth dependent on the
+% reference point of the \meta{box} is unchanged. Thus a negative
+% \meta{y-size} results in the \meta{box} having a depth dependent on the
% height of the original and \emph{vice versa}. The resizing applies within
% the current \TeX{} group level.
% \end{function}
@@ -692,11 +690,11 @@
% \end{syntax}
% Resizes the \meta{box} to \meta{x-size} (horizontally), scaling the vertical
% size by the same amount; \meta{x-size} is a dimension expression. The updated
-% \meta{box} will be an |hbox|, irrespective of the nature of the \meta{box}
-% before the resizing is applied. A negative \meta{x-size} will cause the
+% \meta{box} is an |hbox|, irrespective of the nature of the \meta{box}
+% before the resizing is applied. A negative \meta{x-size} causes the
% material in the \meta{box} to be reversed in direction, but the reference
-% point of the \meta{box} will be unchanged. Thus a negative \meta{x-size}
-% will result in the \meta{box} having a depth dependent on the height of the
+% point of the \meta{box} is unchanged. Thus a negative \meta{x-size}
+% results in the \meta{box} having a depth dependent on the height of the
% original and \emph{vice versa}. The resizing applies within the current
% \TeX{} group level.
% \end{function}
@@ -709,10 +707,10 @@
% Resizes the \meta{box} to \meta{x-size} (horizontally) and \meta{y-size}
% (vertically): both of the sizes are dimension expressions. The
% \meta{y-size} is the height only and does not include any depth. The updated
-% \meta{box} will be an |hbox|, irrespective of the nature of the \meta{box}
-% before the resizing is applied. Negative sizes will cause the material in
+% \meta{box} is an |hbox|, irrespective of the nature of the \meta{box}
+% before the resizing is applied. Negative sizes cause the material in
% the \meta{box} to be reversed in direction, but the reference point of the
-% \meta{box} will be unchanged. Thus a negative \meta{y-size} will result in
+% \meta{box} is unchanged. Thus a negative \meta{y-size} results in
% the \meta{box} having a depth dependent on the height of the original and
% \emph{vice versa}. The resizing applies within the current \TeX{} group
% level.
@@ -726,10 +724,10 @@
% Resizes the \meta{box} to \meta{x-size} (horizontally) and \meta{y-size}
% (vertically): both of the sizes are dimension expressions. The
% \meta{y-size} is the total vertical size (height plus depth). The updated
-% \meta{box} will be an |hbox|, irrespective of the nature of the \meta{box}
-% before the resizing is applied. Negative sizes will cause the material in
+% \meta{box} is an |hbox|, irrespective of the nature of the \meta{box}
+% before the resizing is applied. Negative sizes cause the material in
% the \meta{box} to be reversed in direction, but the reference point of the
-% \meta{box} will be unchanged. Thus a negative \meta{y-size} will result in
+% \meta{box} is unchanged. Thus a negative \meta{y-size} results in
% the \meta{box} having a depth dependent on the height of the original and
% \emph{vice versa}. The resizing applies within the current \TeX{} group
% level.
@@ -740,9 +738,9 @@
% \cs{box_rotate:Nn} \meta{box} \Arg{angle}
% \end{syntax}
% Rotates the \meta{box} by \meta{angle} (in degrees) anti-clockwise about
-% its reference point. The reference point of the updated box will be moved
+% its reference point. The reference point of the updated box is moved
% horizontally such that it is at the left side of the smallest rectangle
-% enclosing the rotated material. The updated \meta{box} will be an |hbox|,
+% enclosing the rotated material. The updated \meta{box} is an |hbox|,
% irrespective of the nature of the \meta{box} before the rotation is applied.
% The rotation applies within the current \TeX{} group level.
% \end{function}
@@ -753,11 +751,11 @@
% \end{syntax}
% Scales the \meta{box} by factors \meta{x-scale} and \meta{y-scale} in
% the horizontal and vertical directions, respectively (both scales are
-% integer expressions). The updated \meta{box} will be an |hbox|, irrespective
+% integer expressions). The updated \meta{box} is an |hbox|, irrespective
% of the nature of the \meta{box} before the scaling is applied. Negative
-% scalings will cause the material in the \meta{box} to be reversed in
-% direction, but the reference point of the \meta{box} will be unchanged.
-% Thus a negative \meta{y-scale} will result in the \meta{box} having a depth
+% scalings cause the material in the \meta{box} to be reversed in
+% direction, but the reference point of the \meta{box} is unchanged.
+% Thus a negative \meta{y-scale} results in the \meta{box} having a depth
% dependent on the height of the original and \emph{vice versa}. The resizing
% applies within the current \TeX{} group level.
% \end{function}
@@ -1524,8 +1522,8 @@
}
}
% \end{macrocode}
-% The edges of the box are then recorded: the left edge will
-% always be at zero. Rotation of the four edges then takes place: this is
+% The edges of the box are then recorded: the left edge is
+% always at zero. Rotation of the four edges then takes place: this is
% most efficiently done on a quadrant by quadrant basis.
% \begin{macrocode}
\cs_new_protected:Npn \@@_rotate:N #1
@@ -1590,7 +1588,7 @@
% The position of the box edges are now known, but the box at this
% stage be misplaced relative to the current \TeX{} reference point. So the
% content of the box is moved such that the reference point of the
-% rotated box will be in the same place as the original.
+% rotated box is in the same place as the original.
% \begin{macrocode}
\hbox_set:Nn \l_@@_internal_box { \box_use:N #1 }
\hbox_set:Nn \l_@@_internal_box
@@ -1929,8 +1927,8 @@
% \end{macro}
%
% \begin{macro}[aux]{\@@_resize_common:N}
-% The main resize function places in input into a box which will start
-% of with zero width, and includes the handles for engine rescaling.
+% The main resize function places its input into a box which start
+% off with zero width, and includes the handles for engine rescaling.
% \begin{macrocode}
\cs_new_protected:Npn \@@_resize_common:N #1
{
Modified: trunk/l3kernel/l3candidates.dtx
===================================================================
--- trunk/l3kernel/l3candidates.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3candidates.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -91,11 +91,11 @@
% \cs{box_clip:N} \meta{box}
% \end{syntax}
% Clips the \meta{box} in the output so that only material inside the
-% bounding box is displayed in the output. The updated \meta{box} will be an
+% bounding box is displayed in the output. The updated \meta{box} is an
% hbox, irrespective of the nature of the \meta{box} before the clipping is
% applied. The clipping applies within the current \TeX{} group level.
%
-% \textbf{These functions require the \LaTeX3 native drivers: they will
+% \textbf{These functions require the \LaTeX3 native drivers: they do
% not work with the \LaTeXe{} \pkg{graphics} drivers!}
%
% \begin{texnote}
@@ -113,9 +113,9 @@
% Adjusts the bounding box of the \meta{box} \meta{left} is removed from
% the left-hand edge of the bounding box, \meta{right} from the right-hand
% edge and so fourth. All adjustments are \meta{dimension expressions}.
-% Material output of the bounding box will still be displayed in the output
+% Material outside of the bounding box is still displayed in the output
% unless \cs{box_clip:N} is subsequently applied.
-% The updated \meta{box} will be an
+% The updated \meta{box} is an
% hbox, irrespective of the nature of the \meta{box} before the trim
% operation is applied. The adjustment applies within the current \TeX{}
% group level. The behavior of the operation where the trims requested is
@@ -129,10 +129,10 @@
% Adjusts the bounding box of the \meta{box} such that it has lower-left
% co-ordinates (\meta{llx}, \meta{lly}) and upper-right co-ordinates
% (\meta{urx}, \meta{ury}). All four co-ordinate positions are
-% \meta{dimension expressions}. Material output of the bounding box will
-% still be displayed in the output unless \cs{box_clip:N} is
+% \meta{dimension expressions}. Material outside of the bounding box is
+% still displayed in the output unless \cs{box_clip:N} is
% subsequently applied.
-% The updated \meta{box} will be an
+% The updated \meta{box} is an
% hbox, irrespective of the nature of the \meta{box} before the viewport
% operation is applied. The adjustment applies within the current \TeX{}
% group level.
@@ -152,7 +152,7 @@
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
-% will not expand further when appearing in an \texttt{x}-type
+% does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -172,8 +172,8 @@
% \cs{coffin_rotate:Nn} \meta{coffin} \Arg{angle}
% \end{syntax}
% Rotates the \meta{coffin} by the given \meta{angle} (given in
-% degrees counter-clockwise). This process will rotate both the
-% coffin content and poles. Multiple rotations will not result in
+% degrees counter-clockwise). This process rotates both the
+% coffin content and poles. Multiple rotations do not result in
% the bounding box of the coffin growing unnecessarily.
% \end{function}
%
@@ -283,7 +283,7 @@
% \begin{verbatim}
% \prop_map_tokens:Nn \l_my_prop { \str_if_eq:nnT { mykey } }
% \end{verbatim}
-% will expand to the value corresponding to \texttt{mykey}: for each
+% expands to the value corresponding to \texttt{mykey}: for each
% pair in |\l_my_prop| the function \cs{str_if_eq:nnT} receives
% \texttt{mykey}, the \meta{key} and the \meta{value} as its three
% arguments. For that specific task, \cs{prop_item:Nn} is faster.
@@ -301,7 +301,7 @@
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{value}
-% will not expand further when appearing in an \texttt{x}-type
+% does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -318,9 +318,9 @@
% \end{syntax}
% Applies \meta{function} to every pair of items
% \meta{seq_1-item}--\meta{seq_2-item} from the two sequences, returning
-% items from both sequences from left to right. The \meta{function} will
-% receive two \texttt{n}-type arguments for each iteration. The mapping
-% will terminate when
+% items from both sequences from left to right. The \meta{function}
+% receives two \texttt{n}-type arguments for each iteration. The mapping
+% terminates when
% the end of either sequence is reached (\emph{i.e.}~whichever sequence has
% fewer items determines how many iterations
% occur).
@@ -331,13 +331,13 @@
% \cs{seq_set_filter:NNn} \meta{sequence_1} \meta{sequence_2} \Arg{inline boolexpr}
% \end{syntax}
% Evaluates the \meta{inline boolexpr} for every \meta{item} stored
-% within the \meta{sequence_2}. The \meta{inline boolexpr} will
-% receive the \meta{item} as |#1|. The sequence of all \meta{items}
+% within the \meta{sequence_2}. The \meta{inline boolexpr}
+% receives the \meta{item} as |#1|. The sequence of all \meta{items}
% for which the \meta{inline boolexpr} evaluated to \texttt{true}
% is assigned to \meta{sequence_1}.
% \begin{texnote}
% Contrarily to other mapping functions, \cs{seq_map_break:} cannot
-% be used in this function, and will lead to low-level \TeX{} errors.
+% be used in this function, and would lead to low-level \TeX{} errors.
% \end{texnote}
% \end{function}
%
@@ -355,7 +355,7 @@
% in \meta{inline function} should be expandable.
% \begin{texnote}
% Contrarily to other mapping functions, \cs{seq_map_break:} cannot
-% be used in this function, and will lead to low-level \TeX{} errors.
+% be used in this function, and would lead to low-level \TeX{} errors.
% \end{texnote}
% \end{function}
%
@@ -369,7 +369,7 @@
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
-% will not expand further when appearing in an \texttt{x}-type
+% does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -438,8 +438,8 @@
% \cs{sys_if_shell_p:}
% \cs{sys_if_shell:TF} \Arg{true code} \Arg{false code}
% \end{syntax}
-% Performs a check for whether shell escape is enabled. This will
-% return true if either of restricted or unrestircted shell escape
+% Performs a check for whether shell escape is enabled. This
+% returns true if either of restricted or unrestricted shell escape
% is enabled.
% \end{function}
%
@@ -458,7 +458,7 @@
% \cs{sys_if_shell_restricted:TF} \Arg{true code} \Arg{false code}
% \end{syntax}
% Performs a check for whether \emph{restricted} shell escape is
-% enabled. This will return false if unrestricted shell escape is
+% enabled. This returns false if unrestricted shell escape is
% enabled. Unrestricted shell escape is not considered a superset
% of restricted shell escape in this case. To find whether any
% shell escape is enabled use \cs{sys_if_shell:}.
@@ -495,8 +495,8 @@
% \cs{tl_reverse_tokens:n} \Arg{tokens}
% \end{syntax}
% This function, which works directly on \TeX{} tokens, reverses
-% the order of the \meta{tokens}: the first will be the last and
-% the last will become first. Spaces are preserved. The reversal
+% the order of the \meta{tokens}: the first becomes the last and
+% the last becomes first. Spaces are preserved. The reversal
% also operates within brace groups, but the braces themselves
% are not exchanged, as this would lead to an unbalanced token
% list. For instance, \cs{tl_reverse_tokens:n} |{a~{b()}}|
@@ -505,7 +505,7 @@
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the token
-% list will not expand further when appearing in an \texttt{x}-type
+% list does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -534,7 +534,7 @@
% These functions are intended to be applied to input which may be
% regarded broadly as \enquote{text}. They traverse the \meta{tokens} and
% change the case of characters as discussed below. The character code of
-% the characters replaced may be arbitrary: the replacement characters will
+% the characters replaced may be arbitrary: the replacement characters
% have standard document-level category codes ($11$ for letters, $12$ for
% letter-like characters which can also be case-changed). Begin-group and
% end-group characters in the \meta{tokens} are normalized and become |{|
@@ -547,16 +547,16 @@
% \end{function}
%
% The functions perform expansion on the input in most cases. In particular,
-% input in the form of token lists or expandable functions will be expanded
+% input in the form of token lists or expandable functions is expanded
% \emph{unless} it falls within one of the special handling classes described
% below. This expansion approach means that in general the result of case
-% changing will match the \enquote{natural} outcome expected from a
+% changing matches the \enquote{natural} outcome expected from a
% \enquote{functional} approach to case modification. For example
% \begin{verbatim}
% \tl_set:Nn \l_tmpa_tl { hello }
% \tl_upper_case:n { \l_tmpa_tl \c_space_tl world }
% \end{verbatim}
-% will produce
+% produces
% \begin{verbatim}
% HELLO WORLD
% \end{verbatim}
@@ -566,11 +566,11 @@
% from the \pkg{etoolbox} package.
%
% \begin{variable}{\l_tl_case_change_math_tl}
-% Case changing will not take place within math mode material so for example
+% Case changing does not take place within math mode material so for example
% \begin{verbatim}
% \tl_upper_case:n { Some~text~$y = mx + c$~with~{Braces} }
% \end{verbatim}
-% will become
+% becomes
% \begin{verbatim}
% SOME TEXT $y = mx + c$ WITH {BRACES}
% \end{verbatim}
@@ -682,7 +682,7 @@
% engine treats input outside of this range as east Asian.
%
% Context-sensitive mappings are enabled: language-dependent cases are
-% discussed below. Context detection will expand input but treats any
+% discussed below. Context detection expands input but treats any
% unexpandable control sequences as \enquote{failures} to match a context.
%
% Language-sensitive conversions are enabled using the \meta{language}
@@ -755,7 +755,7 @@
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
-% will not expand further when appearing in an \texttt{x}-type
+% does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -778,7 +778,7 @@
% \iow_term:x { \tl_range:nnn { abcdef } { -2 } { -1 } }
% \iow_term:x { \tl_range:nnn { abcdef } { 0 } { -1 } }
% \end{verbatim}
-% will print \texttt{{b}{c}{d}{e}}, \texttt{{c}{d}{e}{f}}, \texttt{{e}{f}}, and an empty
+% prints \texttt{{b}{c}{d}{e}}, \texttt{{c}{d}{e}{f}}, \texttt{{e}{f}}, and an empty
% line to the terminal. The \meta{start index} must always be smaller than
% or equal to the \meta{end index}: if this is not the case then no output
% is generated. Thus
@@ -790,7 +790,7 @@
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
-% will not expand further when appearing in an \texttt{x}-type
+% does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -802,7 +802,7 @@
% \cs{peek_N_type:TF} \Arg{true code} \Arg{false code}
% \end{syntax}
% Tests if the next \meta{token} in the input stream can be safely
-% grabbed as an \texttt{N}-type argument. The test will be \meta{false}
+% grabbed as an \texttt{N}-type argument. The test is \meta{false}
% if the next \meta{token} is either an explicit or implicit
% begin-group or end-group token (with any character code), or
% an explicit or implicit space character (with character code $32$
@@ -810,9 +810,9 @@
% and \meta{true} in all other cases.
% Note that a \meta{true} result ensures that the next \meta{token} is
% a valid \texttt{N}-type argument. However, if the next \meta{token}
-% is for instance \cs{c_space_token}, the test will take the
+% is for instance \cs{c_space_token}, the test takes the
% \meta{false} branch, even though the next \meta{token} is in fact
-% a valid \texttt{N}-type argument. The \meta{token} will be left
+% a valid \texttt{N}-type argument. The \meta{token} is left
% in the input stream after the \meta{true code} or \meta{false code}
% (as appropriate to the result of the test).
% \end{function}
@@ -1355,7 +1355,7 @@
\prop_map_inline:cn { l_@@_poles_ \__int_value:w #1 _prop }
{ \@@_scale_pole:Nnnnnn #1 {##1} ##2 }
% \end{macrocode}
-% Negative $x$-scaling values will place the poles in the wrong
+% Negative $x$-scaling values place the poles in the wrong
% location: this is corrected here.
% \begin{macrocode}
\fp_compare:nNnT \l_@@_scale_x_fp < \c_zero_fp
@@ -1767,10 +1767,10 @@
% usual |{ ? \__prg_break: } { }| to the end of each one. This is
% most conveniently done in two steps using an auxiliary function.
% The mapping then throws away the first tokens of |#2| and |#5|,
-% which for items in the sequences will both be \cs{s_@@}
-% \cs{@@_item:n}. The function to be mapped will then be applied to
+% which for items in both sequences are \cs{s_@@}
+% \cs{@@_item:n}. The function to be mapped are then be applied to
% the two entries. When the code hits the end of one of the
-% sequences, the break material will stop the entire loop and tidy up.
+% sequences, the break material stops the entire loop and tidy up.
% This avoids needing to find the count of the two sequences, or
% worrying about which is longer.
% \begin{macrocode}
@@ -1943,8 +1943,8 @@
% \end{variable}
%
% \begin{macro}[EXP, pTF]{\sys_if_shell:}
-% Performs a check for whether shell escape is enabled. This will
-% return true if either of restricted or unrestricted shell escape
+% Performs a check for whether shell escape is enabled. This
+% returns true if either of restricted or unrestricted shell escape
% is enabled.
% \begin{macrocode}
\prg_new_conditional:Nnn \sys_if_shell: { p , T , F , TF }
@@ -1975,7 +1975,7 @@
%
% \begin{macro}[EXP, pTF]{\sys_if_shell_unrestricted:}
% Performs a check for whether \emph{restricted} shell escape is
-% enabled. This will return false if unrestricted shell escape is
+% enabled. This returns false if unrestricted shell escape is
% enabled. Unrestricted shell escape is not considered a superset
% of restricted shell escape in this case. To find whether any
% shell escape is enabled use \cs{sys_if_shell:}.
@@ -2407,8 +2407,8 @@
% be either the standard case-changing one or the mixed-case alternative,
% it is not hard-coded into the math loop but is rather passed as argument
% |#3| to \cs{@@_change_case_math:NNNnnn}. If no close-math token is found
-% then the final clean-up will be forced (\emph{i.e.}~there is no assumption
-% of \enquote{well-behaved} code in terms of math mode).
+% then the final clean-up is forced (\emph{i.e.}~there is no assumption
+% of \enquote{well-behaved} input in terms of math mode).
% \begin{macrocode}
\cs_new:Npn \@@_change_case_N_type:NNNnnn #1#2#3
{
@@ -2663,7 +2663,7 @@
% now expanded material. The test for expandablity has to check for
% end-of-recursion as it is needed by the look-ahead code which might hit
% the end of the input. The test is done in two parts as \cs{bool_if:nTF}
-% will choke if |#1| is |(|!
+% would choke if |#1| was |(|!
% \begin{macrocode}
\cs_new:Npn \@@_change_case_if_expandable:NTF #1
{
@@ -3040,10 +3040,10 @@
% \begin{macro}[EXP, aux]{\__unicode_codepoint_to_UTFviii_auxi:n}
% \begin{macro}[EXP, aux]{\__unicode_codepoint_to_UTFviii_auxii:Nnn}
% \begin{macro}[EXP, aux]{\__unicode_codepoint_to_UTFviii_auxiii:n}
-% This code will convert a codepoint into the correct UTF-8 representation.
+% This code converts a codepoint into the correct UTF-8 representation.
% As there are a variable number of octets, the result starts with the
% numeral |1|--|4| to indicate the nature of the returned value. Note that
-% this code will cover the full range even though at this stage it is not
+% this code covers the full range even though at this stage it is not
% required here. Also note that longer-term this is likely to need a public
% interface and/or moving to \pkg{l3str} (see experimental string
% conversions). In terms of the algorithm itself, see
Modified: trunk/l3kernel/l3clist.dtx
===================================================================
--- trunk/l3kernel/l3clist.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3clist.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -66,7 +66,7 @@
% \clist_put_right:Nn \l_my_clist { , ~ , , }
% \clist_if_empty:NTF \l_my_clist { true } { false }
% \end{verbatim}
-% will leave \texttt{true} in the input stream. To include an item
+% leaves \texttt{true} in the input stream. To include an item
% which contains a comma, or starts or ends with a space,
% surround it with braces. The sequence data type should be preferred
% to comma lists if items are to contain |{|, |}|, or |#| (assuming the
@@ -79,8 +79,8 @@
% \cs{clist_new:N} \meta{comma list}
% \end{syntax}
% Creates a new \meta{comma list} or raises an error if the name is
-% already taken. The declaration is global. The \meta{comma list} will
-% initially contain no items.
+% already taken. The declaration is global. The \meta{comma list}
+% initially contains no items.
% \end{function}
%
% \begin{function}[added = 2014-07-05]
@@ -93,7 +93,7 @@
% \end{syntax}
% Creates a new constant \meta{clist~var} or raises an error
% if the name is already taken. The value of the
-% \meta{clist~var} will be set globally to the
+% \meta{clist~var} is set globally to the
% \meta{comma list}.
% \end{function}
%
@@ -158,7 +158,7 @@
% \end{syntax}
% Concatenates the content of \meta{comma list_2} and \meta{comma list_3}
% together and saves the result in \meta{comma list_1}. The items in
-% \meta{comma list_2} will be placed at the left side of the new comma list.
+% \meta{comma list_2} are placed at the left side of the new comma list.
% \end{function}
%
% \begin{function}[EXP, pTF, added=2012-03-03]
@@ -250,7 +250,7 @@
% This function iterates through every item in the \meta{comma list} and
% does a comparison with the \meta{items} already checked. It is therefore
% relatively slow with large comma lists.
-% Furthermore, it will not work if any of the items in the
+% Furthermore, it does not work if any of the items in the
% \meta{comma list} contains |{|, |}|, or |#|
% (assuming the usual \TeX{} category codes apply).
% \end{texnote}
@@ -292,7 +292,7 @@
% reverse order. Braces and spaces are preserved by this process.
% \begin{texnote}
% The result is returned within \tn{unexpanded}, which means that the
-% comma list will not expand further when appearing in an
+% comma list does not expand further when appearing in an
% \texttt{x}-type argument expansion.
% \end{texnote}
% \end{function}
@@ -380,7 +380,7 @@
% \cs{clist_map_function:NN} \meta{comma list} \meta{function}
% \end{syntax}
% Applies \meta{function} to every \meta{item} stored in the
-% \meta{comma list}. The \meta{function} will receive one argument for
+% \meta{comma list}. The \meta{function} receives one argument for
% each iteration. The \meta{items} are returned from left to right.
% The function \cs{clist_map_inline:Nn} is in general more efficient
% than \cs{clist_map_function:NN}.
@@ -394,7 +394,7 @@
% \end{syntax}
% Applies \meta{inline function} to every \meta{item} stored
% within the \meta{comma list}. The \meta{inline function} should
-% consist of code which will receive the \meta{item} as |#1|.
+% consist of code which receives the \meta{item} as |#1|.
% One in line mapping can be nested inside another. The \meta{items}
% are returned from left to right.
% \end{function}
@@ -406,7 +406,7 @@
% \end{syntax}
% Stores each entry in the \meta{comma list} in turn in the
% \meta{tl~var.}\ and applies the \meta{function using tl~var.}
-% The \meta{function} will usually consist of code making use of
+% The \meta{function} usually consists of code making use of
% the \meta{tl~var.}, but this is not enforced. One variable
% mapping can be nested inside another. The \meta{items}
% are returned from left to right.
@@ -417,8 +417,8 @@
% \cs{clist_map_break:}
% \end{syntax}
% Used to terminate a |\clist_map_...| function before all
-% entries in the \meta{comma list} have been processed. This will
-% normally take place within a conditional statement, for example
+% entries in the \meta{comma list} have been processed. This
+% normally takes place within a conditional statement, for example
% \begin{verbatim}
% \clist_map_inline:Nn \l_my_clist
% {
@@ -429,12 +429,12 @@
% }
% }
% \end{verbatim}
-% Use outside of a |\clist_map_...| scenario will lead to low
+% Use outside of a |\clist_map_...| scenario leads to low
% level \TeX{} errors.
% \begin{texnote}
% When the mapping is broken, additional tokens may be inserted by the
% internal macro \cs{__prg_break_point:Nn} before further items are taken
-% from the input stream. This will depend on the design of the mapping
+% from the input stream. This depends on the design of the mapping
% function.
% \end{texnote}
% \end{function}
@@ -445,8 +445,8 @@
% \end{syntax}
% Used to terminate a |\clist_map_...| function before all
% entries in the \meta{comma list} have been processed, inserting
-% the \meta{tokens} after the mapping has ended. This will
-% normally take place within a conditional statement, for example
+% the \meta{tokens} after the mapping has ended. This
+% normally takes place within a conditional statement, for example
% \begin{verbatim}
% \clist_map_inline:Nn \l_my_clist
% {
@@ -457,13 +457,13 @@
% }
% }
% \end{verbatim}
-% Use outside of a |\clist_map_...| scenario will lead to low
+% Use outside of a |\clist_map_...| scenario leads to low
% level \TeX{} errors.
% \begin{texnote}
% When the mapping is broken, additional tokens may be inserted by the
% internal macro \cs{__prg_break_point:Nn} before the \meta{tokens} are
% inserted into the input stream.
-% This will depend on the design of the mapping function.
+% This depends on the design of the mapping function.
% \end{texnote}
% \end{function}
%
@@ -474,7 +474,7 @@
% \end{syntax}
% Leaves the number of items in the \meta{comma list} in the input
% stream as an \meta{integer denotation}. The total number of items
-% in a \meta{comma list} will include those which are duplicates,
+% in a \meta{comma list} includes those which are duplicates,
% \emph{i.e.}~every item in a \meta{comma list} is unique.
% \end{function}
%
@@ -492,7 +492,7 @@
% the comma list has exactly two items, then they are placed in the input
% stream separated by the \meta{separator between two}. If the comma
% list has a single item, it is placed in the input stream, and a comma
-% list with no items produces no output. An error will be raised if
+% list with no items produces no output. An error is raised if
% the variable does not exist or if it is invalid.
%
% For example,
@@ -500,13 +500,13 @@
% \clist_set:Nn \l_tmpa_clist { a , b , , c , {de} , f }
% \clist_use:Nnnn \l_tmpa_clist { ~and~ } { ,~ } { ,~and~ }
% \end{verbatim}
-% will insert \enquote{\texttt{a, b, c, de, and f}} in the input
+% inserts \enquote{\texttt{a, b, c, de, and f}} in the input
% stream. The first separator argument is not used in this case
% because the comma list has more than $2$ items.
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{items}
-% will not expand further when appearing in an \texttt{x}-type
+% do not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -518,7 +518,7 @@
% Places the contents of the \meta{clist~var} in the input stream,
% with the \meta{separator} between the items. If the comma
% list has a single item, it is placed in the input stream, and a comma
-% list with no items produces no output. An error will be raised if
+% list with no items produces no output. An error is raised if
% the variable does not exist or if it is invalid.
%
% For example,
@@ -526,12 +526,12 @@
% \clist_set:Nn \l_tmpa_clist { a , b , , c , {de} , f }
% \clist_use:Nn \l_tmpa_clist { ~and~ }
% \end{verbatim}
-% will insert \enquote{\texttt{a and b and c and de and f}} in the input
+% inserts \enquote{\texttt{a and b and c and de and f}} in the input
% stream.
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{items}
-% will not expand further when appearing in an \texttt{x}-type
+% do not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -552,8 +552,8 @@
% Stores the left-most item from a \meta{comma list} in the
% \meta{token list variable} without removing it from the
% \meta{comma list}. The \meta{token list variable} is assigned locally.
-% If the \meta{comma list} is empty the \meta{token list variable} will
-% contain the marker value \cs{q_no_value}.
+% If the \meta{comma list} is empty the \meta{token list variable}
+% is set to the marker value \cs{q_no_value}.
% \end{function}
%
% \begin{function}[TF, added = 2012-05-14]{\clist_get:NN, \clist_get:cN}
@@ -638,17 +638,17 @@
% \cs{clist_item:Nn} \meta{comma list} \Arg{integer expression}
% \end{syntax}
% Indexing items in the \meta{comma list} from~$1$ at the top (left), this
-% function will evaluate the \meta{integer expression} and leave the
+% function evaluates the \meta{integer expression} and leaves the
% appropriate item from the comma list in the input stream. If the
% \meta{integer expression} is negative, indexing occurs from the
% bottom (right) of the comma list. When the \meta{integer expression}
% is larger than the number of items in the \meta{comma list} (as
-% calculated by \cs{clist_count:N}) then the function will expand to
+% calculated by \cs{clist_count:N}) then the function expands to
% nothing.
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
-% will not expand further when appearing in an \texttt{x}-type
+% does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -1404,7 +1404,7 @@
% by blank spaces (besides, this particular variant of
% the emptiness test is optimized). If the item of the
% comma list is blank, grab the next one. As soon as one
-% item is non-blank, exit: the second auxiliary will grab
+% item is non-blank, exit: the second auxiliary grabs
% \cs{prg_return_false:} as |#2|, unless every item in
% the comma list was blank and the loop actually got broken
% by the trailing |\q_mark \prg_return_false:| item.
Modified: trunk/l3kernel/l3coffins.dtx
===================================================================
--- trunk/l3kernel/l3coffins.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3coffins.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -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}
@@ -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.
Modified: trunk/l3kernel/l3color.dtx
===================================================================
--- trunk/l3kernel/l3color.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3color.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -70,7 +70,7 @@
% \begin{syntax}
% \cs{color_ensure_current:}
% \end{syntax}
-% Ensures that material inside a box will use the foreground color
+% Ensures that material inside a box uses the foreground color
% at the point where the box is set, rather than that in force when the
% box is used. This function should usually be used within a
% \cs{color_group_begin:} \ldots \cs{color_group_end:} group.
Modified: trunk/l3kernel/l3deprecation.dtx
===================================================================
--- trunk/l3kernel/l3deprecation.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3deprecation.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -74,7 +74,7 @@
% \end{macrocode}
%
% \begin{macro}[aux]{\@@_error:Nnn}
-% The \tn{outer} definition here ensures the command will not appear
+% The \tn{outer} definition here ensures the command cannot appear
% in an argument. Use this auxiliary on all commands that have been
% removed since 2015.
% \begin{macrocode}
Modified: trunk/l3kernel/l3doc.dtx
===================================================================
--- trunk/l3kernel/l3doc.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3doc.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -96,7 +96,7 @@
% Use at own risk!}
%
% It is written as a \enquote{self-contained} docstrip file: executing
-% |latex l3doc.dtx| will generate the \file{l3doc.cls} file and typeset
+% |latex l3doc.dtx| generates the \file{l3doc.cls} file and typesets
% this documentation; execute |tex l3doc.dtx| to only generate
% \file{l3doc.cls}.
%
@@ -233,7 +233,7 @@
% Use |\begin{documentation}...\end{documentation}| around the
% documentation, and |\begin{implementation}...\end{implementation}|
% around the implementation. The
-% \cs{EnableDocumentation}/\cs{EnableImplementation} will cause them to
+% \cs{EnableDocumentation}/\cs{EnableImplementation} causes them to
% be typeset when the \file{.dtx} file is \cs{DocInput}; use
% \cs{DisableDocumentation}/\cs{DisableImplementation} to omit the
% contents of those environments.
@@ -259,7 +259,7 @@
% recommended.
%
% These commands are aware of the |@@| \pkg{l3docstrip} syntax and
-% will replace such instances correctly in the typeset documentation.
+% replace such instances correctly in the typeset documentation.
% This only happens after a |%<@@=|\meta{module}|>| declaration.
%
% Additionally, commands can be used in the argument of \cs{cs}. For
@@ -269,10 +269,10 @@
% The \meta{options} are a key--value list which can contain the
% following keys:
% \begin{itemize}
-% \item |index=|\meta{name}: the \meta{csname} will be indexed as if
+% \item |index=|\meta{name}: the \meta{csname} is indexed as if
% one had written \cs{cs}\Arg{name}.
-% \item |no-index|: the \meta{csname} will not be indexed.
-% \item |module=|\meta{module}: the \meta{csname} will be indexed in
+% \item |no-index|: the \meta{csname} is not indexed.
+% \item |module=|\meta{module}: the \meta{csname} is indexed in
% the list of commands from the \meta{module}; the \meta{module}
% can in particular be |TeX| for \enquote{\TeX{} and \LaTeXe{}}
% commands, or empty for commands which should be placed in the
@@ -289,7 +289,7 @@
% \cs{tn} \oarg{options} \marg{csname}
% \end{syntax}
% Analoguous to \cs{cs} but intended for \enquote{traditional} \TeX{}
-% or \LaTeXe{} commands; they will be indexed accordingly. This is in
+% or \LaTeXe{} commands; they are indexed accordingly. This is in
% fact equivalent to \cs{cs} |[module=TeX, replace=false,|
% \meta{options}|]| \Arg{csname}.
% \end{function}
@@ -415,22 +415,25 @@
% necessary to highlight it as much and you also don't need to check it
% for, say, having a test function and having a documentation chunk
% earlier in a \env{function} environment. In this case, write
-% |\begin{macro}[aux]| and it will be marked as such; its margin
-% call-out will be printed in grey.
+% |\begin{macro}[aux]| to mark it as such; its margin
+% call-out is then printed in grey.
%
% Similarly, an internal package function still requires documentation
-% but usually will not be documented for users to see; these can be
+% but usually is not documented for users to see; these can be
% marked as such with |\begin{macro}[int]|.
%
% For documenting \pkg{expl3}-type conditionals, you may also pass this
% environment a |TF| option (and omit it from the function name) to
% denote that the function is provided with |T|, |F|, and |TF| suffixes.
-% A similar |pTF| option will print both |TF| and |_p| predicate forms.
+% A similar |pTF| option prints both |TF| and |_p| predicate forms.
+% An option |noTF| prints both the |TF| forms and a form with neither
+% |T| nor |F|, to document functions such as \cs[no-index]{prop_get:NN}
+% which also have conditional forms (\cs[no-index]{prop_get:NNTF}).
%
%
% \DescribeMacro{\TestFiles}
% \cs{TestFiles}\marg{list of files} is used to indicate which test
-% files are used for the current code; they will be printed in the
+% files are used for the current code; they are printed in the
% documentation.
%
% \DescribeMacro{\UnitTested}
@@ -449,14 +452,14 @@
% \DescribeMacro{\TestMissing}
% If a function is missing a test, this may be flagged by writing (as
% many times as needed) \cs{TestMissing} \marg{explanation of test
-% required}. These missing tests will be summarised in the listing
+% required}. These missing tests are summarised in the listing
% printed at the end of the compilation run.
%
% \DescribeEnv{variable}
% When documenting variable definitions, use the \env{variable}
-% environment instead. It will, here, behave identically to the
+% environment instead. Here it behaves identically to the
% \env{macro} environment, except that if the class option |checktest|
-% is enabled, variables will not be required to have a test file.
+% is enabled, variables are not required to have a test file.
%
% \DescribeEnv{arguments}
% Within a \env{macro} environment, you may use the \env{arguments}
@@ -749,9 +752,9 @@
% }
% When analyzing a control sequence found within a \env{macrocode}
% environment, \cs{l_@@_index_macro_tl} holds the control sequence
-% (partially a string), \cs{l_@@_index_key_tl} holds what will be used
-% as a sort key in the index, and \cs{l_@@_index_module_tl} is the
-% subindex in which the control sequence will be listed. Finally,
+% (partially a string), \cs{l_@@_index_key_tl} holds the future
+% sort key in the index, and \cs{l_@@_index_module_tl} is the
+% subindex in which the control sequence should be listed. Finally,
% \cs{l_@@_index_internal_bool} indicates when the control sequence is
% internal and should be indexed in a slightly different subindex.
% \begin{macrocode}
@@ -939,7 +942,7 @@
%
% \begin{macro}[int,TF]{\@@_if_almost_str:n}
% Used to test if the argument of |\cmd| or other macros to be indexed
-% is almost a string or not: for instance this will be wrong if |#1|
+% is almost a string or not: for instance this is \texttt{false} if |#1|
% contains |\meta{...}|. The surprising |f|-expansion are there to
% cope with the case of |#1| starting with \cs{c_@@_backslash_tl}
% which should be expanded and considered to be \enquote{normal}.
@@ -3125,7 +3128,7 @@
% \end{macrocode}
% \end{macro}
%
-% Here are some definitions for additional markup that will help to
+% Here are some definitions for additional markup that helps to
% structure your documentation.
%
% \begin{environment}{danger}
Modified: trunk/l3kernel/l3docstrip.dtx
===================================================================
--- trunk/l3kernel/l3docstrip.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3docstrip.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -95,8 +95,8 @@
%
% To extract the code using \pkg{l3docstrip}, the \enquote{guard} concept
% used by \textsf{DocStrip} is extended by introduction of the syntax
-% \texttt{\%<@@=\meta{module}>}. The \meta{module} name will be used when the
-% code is extracted to replace the |@@|, so that
+% \texttt{\%<@@=\meta{module}>}. The \meta{module} name then replaces
+% the |@@| when the code is extracted, so that
% \begin{verbatim}
% %<*package>
% %<@@=foo>
@@ -107,7 +107,7 @@
% \tl_new:N \l_@@_internal_tl
% %</package>
% \end{verbatim}
-% will be extracted as
+% is extracted as
% \begin{verbatim}
% \cs_new_protected:Npn \__foo_some_function:nn #1#2
% {
@@ -170,8 +170,8 @@
%
% \begin{macro}{\moduleOption}
% In the case where the line starts |%<@|: the defined syntax requires that
-% this continues to |%<@@=|. At the moment, we assume that the syntax will
-% be correct and |#1| here is the module name for substitution into any
+% this continues to |%<@@=|. At the moment, we assume that the syntax is
+% correct and |#1| here is the module name for substitution into any
% internal functions in the extracted material.
% \begin{macrocode}
\def\moduleOption @@=#1>#2\endLine{%
@@ -186,7 +186,7 @@
% Here, we set up to do the search-and-replace when doing the extraction.
% The argument (|#1|) is the replacement text to use, or if empty an
% indicator that no replacement should be done. The search material is
-% one of |__@@|, |_@@| or |@@|, done in order such that all three will end
+% one of |__@@|, |_@@| or |@@|, done in order such that all three end
% up the same in the output. The string |@@@@| is hidden from these
% replacements by temporarily turning it into a pair of letters with
% different category codes, not produced by \pkg{docstrip}; this allows to
Modified: trunk/l3kernel/l3drivers.dtx
===================================================================
--- trunk/l3kernel/l3drivers.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3drivers.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -81,7 +81,7 @@
% \cs{__driver_box_use_clip:N} \meta{box}
% \end{syntax}
% Inserts the content of the \meta{box} at the current insertion point
-% such that any material outside of the bounding box will not be displayed
+% such that any material outside of the bounding box is not displayed
% by the driver. The material in the \meta{box} is still placed in the
% output stream: the clipping takes place at a driver level.
%
@@ -156,7 +156,7 @@
% \meta{content}
% \cs{__driver_draw_end:}
% \end{syntax}
-% Defines a drawing environment. This will be a scope for the purposes of
+% Defines a drawing environment. This is a scope for the purposes of
% the graphics state. Depending on the driver, other set up may or may not
% take place here. The natural size of the \meta{content} should be zero
% from the \TeX{} perspective: allowance for the size of the content must
@@ -186,7 +186,7 @@
% \cs{__driver_draw_move:nn} \Arg{x} \Arg{y}
% \end{syntax}
% Moves the current drawing reference point to (\meta{x}, \meta{y});
-% any active transformation matrix will apply.
+% any active transformation matrix applies.
% \end{function}
%
% \begin{function}{\__driver_draw_lineto:nn}
@@ -194,7 +194,7 @@
% \cs{__driver_draw_lineto:nn} \Arg{x} \Arg{y}
% \end{syntax}
% Adds a path from the current drawing reference point to
-% (\meta{x}, \meta{y}); any active transformation matrix will apply. Note
+% (\meta{x}, \meta{y}); any active transformation matrix applies. Note
% that nothing is drawn until a fill or stroke operation is applied, and that
% the path may be discarded or used as a clip without appearing itself.
% \end{function}
@@ -207,7 +207,7 @@
% Adds a Bezier curve path from the current drawing reference point to
% (\meta{x_3}, \meta{y_3}), using (\meta{x_1}, \meta{y_1}) and
% (\meta{x_2}, \meta{y_2}) as control points; any active transformation
-% matrix will apply. Note that nothing is drawn until a fill or stroke
+% matrix applies. Note that nothing is drawn until a fill or stroke
% operation is applied, and that the path may be discarded or used as a clip
% without appearing itself.
% \end{function}
@@ -217,7 +217,7 @@
% \cs{__driver_draw_rectangle:nnnn} \Arg{x} \Arg{y} \Arg{width} \Arg{height}
% \end{syntax}
% Adds rectangular path from (\meta{x_1}, \meta{y_1}) of \meta{height}
-% and \meta{width}; any active transformation matrix will apply. Note that
+% and \meta{width}; any active transformation matrix applies. Note that
% nothing is drawn until a fill or stroke operation is applied, and that the
% path may be discarded or used as a clip without appearing itself.
% \end{function}
@@ -239,8 +239,8 @@
% \meta{path construction}
% \cs{__driver_draw_stroke:}
% \end{syntax}
-% Draws a line alone the current path, which will also be closed when
-% \cs{__driver_draw_closestroke:} is used. The nature of the line drawn
+% Draws a line along the current path, which is also closed by
+% \cs{__driver_draw_closestroke:}. The nature of the line drawn
% is influenced by settings for
% \begin{itemize}
% \item Line thickness
@@ -259,8 +259,8 @@
% \cs{__driver_draw_fill:}
% \end{syntax}
% Fills the area surrounded by the current path: this will be closed prior
-% to filling if it is not already. The \texttt{fillstroke} version will also
-% stroke the path as described for \cs{__driver_draw_stroke:}. The fill is
+% to filling if it is not already. The \texttt{fillstroke} version also
+% strokes the path as described for \cs{__driver_draw_stroke:}. The fill is
% influenced by the setting for fill color (or the current color if no
% specific stroke color is set). The path may also be used for clipping.
% For paths which are self-intersecting or comprising multiple parts, the
@@ -325,7 +325,7 @@
% \texttt{3pt, 3pt}. An empty pattern yields a solid line.
%
% The \meta{phase} specifies an offset at the start of the cycle. For
-% example, with a pattern \texttt{3pt} a phase of \texttt{1pt} will mean
+% example, with a pattern \texttt{3pt} a phase of \texttt{1pt} means
% that the output is $2$\,pt on, $3$\,pt off, $3$\,pt on, $3$\,pt on,
% \emph{etc.}
% \end{function}
@@ -422,12 +422,12 @@
% \Arg{a} \Arg{b} \Arg{c} \Arg{d} \Arg{x} \Arg{y}
% \end{syntax}
% Inserts the \meta{box} as an hbox with the box reference point placed
-% at ($x$, $y$). The transformation matrix $[a b c d]$ will be applied
+% at ($x$, $y$). The transformation matrix $[a b c d]$ is applied
% to the box, allowing it to be in synchronisation with any scaling, rotation
% or skewing applying more generally. Note that \TeX{} material should not
-% be inserted directly into a drawing as it will not be in the correct
-% location. Also note that as for other drawing elements the box here will
-% have no size from a \TeX{} perspective.
+% be inserted directly into a drawing as it would not be in the correct
+% location. Also note that as for other drawing elements the box here
+% has no size from a \TeX{} perspective.
% \end{function}
%
% \subsection{Coordinate system transformations}
@@ -438,7 +438,7 @@
% \Arg{x} \Arg{y}
% \end{syntax}
% Applies the transformation matrix $[a b c d]$ and offset vector
-% ($x$, $y$) to the current graphic state. This will affect any subsequent
+% ($x$, $y$) to the current graphic state. This affects any subsequent
% items in the same scope but not those already given.
% \end{function}
%
@@ -1201,8 +1201,8 @@
%
% \begin{macro}[int]{\@@_draw_hbox:Nnnnnnn}
% Inside a picture |@beginspecial|/|@endspecial| are active, which is
-% normally a good thing but means that the position and scaling will be off
-% if the box is inserted directly. Instead, we need to reverse the effect of
+% normally a good thing but means that the position and scaling would be off
+% if the box was inserted directly. Instead, we need to reverse the effect of
% the (normally desirable) shift/scaling within the box. That requires
% knowing where the reference point for the drawing is: saved as |l3x|/|l3y|
% at the start of the picture. Transformation here is relative to the
@@ -1449,7 +1449,7 @@
% \begin{macrocode}
% Measuring the image is done by boxing up: for PDF images we could
% use |\pdftex_pdfximagebbox:D|, but if doesn't work for other types.
-% As the box will always start at $(0,0)$ there is no need to worry about
+% As the box always starts at $(0,0)$ there is no need to worry about
% the lower-left position.
% \begin{macrocode}
\cs_new_protected:Npn \@@_image_getbb_auxii:n #1
@@ -1559,7 +1559,7 @@
% \begin{macro}[int]{\@@_box_use_rotate:Nn}
% Rotating in \texttt{(x)}dvipdmfx can be implemented using either PDF or
% driver-specific code. The former approach however is not \enquote{aware}
-% of the content of boxes: this means that any links embded will not be
+% of the content of boxes: this means that any embedded links would not be
% adjusted by the rotation. As such, the driver-native approach is prefered:
% the code therefore is similar (though not identical) to the \texttt{dvips}
% version (notice the rotation angle here is positive). As for
@@ -2358,8 +2358,8 @@
% The driver here has built-in support for basic image inclusion (see
% \texttt{dvisvgm.def} for a more complex approach, needed if clipping,
% \emph{etc.}, is covered at the image driver level). The only issue is
-% that |#1| must be quoted corrected. The \texttt{dvisvgm:img} operation
-% will quote the file name, but if it is already quoted (contains spaces)
+% that |#1| must be quote-corrected. The \texttt{dvisvgm:img} operation
+% quotes the file name, but if it is already quoted (contains spaces)
% then we have an issue: we simply strip off any quotes as a result.
% \begin{macrocode}
\cs_new_protected:Npn \@@_image_include_png:n #1
@@ -2452,7 +2452,7 @@
% Once again, some work is needed to get path constructs correct. Rather
% then write the values as they are given, the entire path needs to be
% collected up before being output in one go. For that we use a dedicated
-% storage routine, which will add spaces as required. Since paths should
+% storage routine, which adds spaces as required. Since paths should
% be fully expanded there is no need to worry about the internal
% \texttt{x}-type expansion.
% \begin{macrocode}
Modified: trunk/l3kernel/l3expan.dtx
===================================================================
--- trunk/l3kernel/l3expan.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3expan.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -68,7 +68,7 @@
% |\exp_| module. They all look alike, an example would be
% \cs{exp_args:NNo}. This function has three arguments, the first and the
% second are a single tokens, while the third argument should be given
-% in braces. Applying \cs{exp_args:NNo} will expand the content of third
+% in braces. Applying \cs{exp_args:NNo} expands the content of third
% argument once before any expansion of the first and second arguments.
% If \cs{seq_gpush:No} was not defined it could be coded in the following way:
% \begin{verbatim}
@@ -118,24 +118,24 @@
% then used to define variants of the
% \meta{original argument specifier} where these are not already
% defined. For each \meta{variant} given, a function is created
-% which will expand its arguments as detailed and pass them
+% which expands its arguments as detailed and passes them
% to the \meta{parent control sequence}. So for example
% \begin{verbatim}
% \cs_set:Npn \foo:Nn #1#2 { code here }
% \cs_generate_variant:Nn \foo:Nn { c }
% \end{verbatim}
-% will create a new function |\foo:cn| which will expand its first
-% argument into a control sequence name and pass the result to
+% creates a new function |\foo:cn| which expands its first
+% argument into a control sequence name and passes the result to
% |\foo:Nn|. Similarly
% \begin{verbatim}
% \cs_generate_variant:Nn \foo:Nn { NV , cV }
% \end{verbatim}
-% would generate the functions |\foo:NV| and |\foo:cV| in the same
+% generates the functions |\foo:NV| and |\foo:cV| in the same
% way. The \cs{cs_generate_variant:Nn} function can only be applied if
% the \meta{parent control sequence} is already defined. Only |n|~and
% |N| arguments can be changed to other types. If the \meta{parent
% control sequence} is protected or if the \meta{variant} involves
-% |x|~arguments, then the \meta{variant control sequence} will also be
+% |x|~arguments, then the \meta{variant control sequence} is also
% protected. The \meta{variant} is created globally, as is any
% \cs[no-index]{exp_args:N\meta{variant}} function needed to carry out the
% expansion.
@@ -157,12 +157,12 @@
% \item
% Arguments that need full expansion (\emph{i.e.}, are denoted
% with |x|) should be avoided if possible as they can not be
-% processed expandably, \emph{i.e.}, functions of this type will
-% not work correctly in arguments that are themselves subject to |x|
+% processed expandably, \emph{i.e.}, functions of this type
+% cannot work correctly in arguments that are themselves subject to |x|
% expansion.
% \item
% In general, unless in the last position, multi-token arguments
-% |n|, |f|, and |o| will need special processing when more than
+% |n|, |f|, and |o| need special processing when more than
% one argument is being expanded. This special processing is not fast.
% Therefore it is best to use the optimized functions, namely
% those that contain only |N|, |c|, |V|, and |v|, and, in the last
@@ -206,7 +206,7 @@
% \begin{quote}
% |\example:f { \int_eval:n { 1 + 2 } , \int_eval:n { 3 + 4 } }|
% \end{quote}
-% will result in the call |\example:n { 3 , \int_eval:n { 3 + 4 } }|
+% results in the call |\example:n { 3 , \int_eval:n { 3 + 4 } }|
% while using |\example:x| instead results in |\example:n { 3 , 7 }|
% at the cost of being protected.
% If you use this type of expansion in conditional processing then
@@ -246,7 +246,7 @@
% the \meta{tokens}). The \meta{tokens} are expanded once, and the result
% is inserted in braces into the input stream \emph{after} reinsertion
% of the \meta{function}. Thus the \meta{function} may take more than
-% one argument: all others will be left unchanged.
+% one argument: all others are left unchanged.
% \end{function}
%
% \begin{function}[EXP]{\exp_args:Nc, \exp_args:cc}
@@ -256,10 +256,10 @@
% This function absorbs two arguments (the \meta{function} name and
% the \meta{tokens}). The \meta{tokens} are expanded until only characters
% remain, and are then turned into a control sequence. (An internal error
-% will occur if such a conversion is not possible). The result
+% occurs if such a conversion is not possible). The result
% is inserted into the input stream \emph{after} reinsertion
% of the \meta{function}. Thus the \meta{function} may take more than
-% one argument: all others will be left unchanged.
+% one argument: all others are left unchanged.
%
% The |:cc| variant constructs the \meta{function} name in the same
% manner as described for the \meta{tokens}.
@@ -273,7 +273,7 @@
% the \meta{variable}). The content of the \meta{variable} are recovered
% and placed inside braces into the input stream \emph{after} reinsertion
% of the \meta{function}. Thus the \meta{function} may take more than
-% one argument: all others will be left unchanged.
+% one argument: all others are left unchanged.
% \end{function}
%
% \begin{function}[EXP]{\exp_args:Nv}
@@ -283,12 +283,12 @@
% This function absorbs two arguments (the \meta{function} name and
% the \meta{tokens}). The \meta{tokens} are expanded until only characters
% remain, and are then turned into a control sequence. (An internal error
-% will occur if such a conversion is not possible). This control sequence
+% occurs if such a conversion is not possible). This control sequence
% should
% be the name of a \meta{variable}. The content of the \meta{variable} are
% recovered and placed inside braces into the input stream \emph{after}
% reinsertion of the \meta{function}. Thus the \meta{function} may take more
-% than one argument: all others will be left unchanged.
+% than one argument: all others are left unchanged.
% \end{function}
%
% \begin{function}[EXP]{\exp_args:Nf}
@@ -300,7 +300,7 @@
% first non-expandable token or space is found, and the result
% is inserted in braces into the input stream \emph{after} reinsertion
% of the \meta{function}. Thus the \meta{function} may take more than
-% one argument: all others will be left unchanged.
+% one argument: all others are left unchanged.
% \end{function}
%
% \begin{function}{\exp_args:Nx}
@@ -312,7 +312,7 @@
% second. The result is inserted in braces into the input stream
% \emph{after} reinsertion of the \meta{function}.
% Thus the \meta{function} may take more
-% than one argument: all others will be left unchanged.
+% than one argument: all others are left unchanged.
% \end{function}
%
% \section{Manipulating two arguments}
@@ -500,9 +500,9 @@
% \end{syntax}
% Carries out a single expansion of \meta{token_2} (which may consume
% arguments) prior to the expansion
-% of \meta{token_1}. If \meta{token_2} is a \TeX{} primitive, it will
-% be executed rather than expanded, while if \meta{token_2} has not
-% expansion (for example, if it is a character) then it will be left
+% of \meta{token_1}. If \meta{token_2} is an expandable \TeX{} primitive, it is
+% executed rather than expanded, while if \meta{token_2} has not
+% expansion (for example, if it is a character) then it is left
% unchanged. It is important to notice that \meta{token_1} may be
% \emph{any} single token, including group-opening and -closing
% tokens (|{| or |}| assuming normal \TeX{} category codes). Unless
@@ -519,7 +519,7 @@
%
% Despite the fact that the following functions are all about preventing
% expansion, they're designed to be used in an expandable context and hence
-% are all marked as being `expandable' since they themselves will not appear
+% are all marked as being `expandable' since they themselves disappear
% after the expansion has completed.
%
% \begin{function}[EXP]{\exp_not:N}
@@ -599,10 +599,10 @@
% \end{syntax}
% This function terminates an \texttt{f}-type expansion. Thus if
% a function |\foo_bar:f| starts an \texttt{f}-type expansion
-% and all of \meta{tokens} are expandable \cs{exp_stop_f:} will
-% terminate the expansion of tokens even if \meta{more tokens}
+% and all of \meta{tokens} are expandable \cs{exp_stop_f:}
+% terminates the expansion of tokens even if \meta{more tokens}
% are also expandable. The function itself is an implicit space
-% token. Inside an \texttt{x}-type expansion, it will retain its
+% token. Inside an \texttt{x}-type expansion, it retains its
% form, but when typeset it produces the underlying space (\verb*| |).
% \end{function}
%
@@ -619,8 +619,8 @@
% Of course, deep down \TeX{} is using expansion as always and there
% are cases where a programmer needs to control that expansion
% directly; typical situations are basic data manipulation tools. This
-% section documents the functions for that level. You will find these
-% commands used throughout the kernel code, but we hope that outside
+% section documents the functions for that level. These
+% commands are used throughout the kernel code, but we hope that outside
% the kernel there will be little need to resort to them. Instead the
% argument manipulation methods document above should usually be sufficient.
%
@@ -649,7 +649,7 @@
% prematurely and as a result \cs{exp_end:} will be misinterpreted
% later on.\footnotemark
%
-% In typical use cases the \cs{exp_end:} will be hidden somewhere
+% In typical use cases the \cs{exp_end:} is hidden somewhere
% in the replacement text of \meta{expandable-tokens} rather than
% being on the same expansion level than \cs{exp:w}, e.g., you may
% see code such as
@@ -672,11 +672,11 @@
% \cs{exp:w} \meta{expandable-tokens} \cs{exp_end_continue_f:w} \meta{further-tokens}
% \end{syntax}
% Expands \meta{expandable-tokens} until reaching \cs{exp_end_continue_f:w} at
-% which point expansion continues as an f-type expansion expanding
+% which point expansion continues as an \texttt{f}-type expansion expanding
% \meta{further-tokens} until an unexpandable token is encountered (or
-% the f-type expansion is explicitly terminated by
-% \cs{exp_stop_f:}). As with all f-type expansions a space ending
-% the expansion will get removed.
+% the \texttt{f}-type expansion is explicitly terminated by
+% \cs{exp_stop_f:}). As with all \texttt{f}-type expansions a space ending
+% the expansion gets removed.
%
% The full expansion of \meta{expandable-tokens} has to be empty.
% If any token in \meta{expandable-tokens} or any token generated by
@@ -701,7 +701,7 @@
% \begin{quote}
% \cs{exp:w} \meta{expandable-tokens} \cs{exp_end:}
% \end{quote}
-% can be alternatively achieved through an f-type expansion by using
+% can be alternatively achieved through an \texttt{f}-type expansion by using
% \cs{exp_stop_f:}, i.e.
% \begin{quote}
% \cs{exp:w} \cs{exp_end_continue_f:w} \meta{expandable-tokens} \cs{exp_stop_f:}
@@ -728,7 +728,7 @@
% \meta{further-tokens} starts with a brace group then the braces
% are removed. If on the other hand it starts with space tokens then
% these space tokens are removed while searching for the
-% argument. Thus such space tokens will not terminate the f-type expansion.
+% argument. Thus such space tokens will not terminate the \texttt{f}-type expansion.
% \end{function}
%
% \section{Internal functions and variables}
@@ -808,7 +808,7 @@
% argument manipulations and |#3| is the current result of the
% expansion chain. This auxiliary function moves |#1| back after
% |#3| in the input stream and checks if any expansion is left to
-% be done by calling |#2|. In by far the most cases we will require
+% be done by calling |#2|. In by far the most cases we need
% to add a set of braces to the result of an argument manipulation
% so it is more effective to do it directly here. Actually, so far
% only the |c| of the final argument manipulation variants does not
@@ -916,7 +916,7 @@
% expects a single token whereas |v| like |c| creates a csname from
% its argument given in braces and then evaluates it as if it was a
% |V|. The \cs{exp:w} sets off an expansion
-% similar to an |f| type expansion, which we will terminate using
+% similar to an |f|-type expansion, which we terminate using
% \cs{exp_end:}. The argument is returned in braces.
% \begin{macrocode}
\cs_new:Npn \::V #1 \::: #2#3
@@ -942,12 +942,12 @@
% register such as |\count|. For the \TeX{} registers we have to
% utilize a \tn{the} whereas for the macros we merely have to
% expand them once. The trick is to find out when to use
-% \tn{the} and when not to. What we do here is try to find out
-% whether the token will expand to something else when hit with
+% \tn{the} and when not to. What we want here is to find out
+% whether the token expands to something else when hit with
% \cs{exp_after:wN}. The technique is to compare the meaning of the
-% register in question when it has been prefixed with \cs{exp_not:N}
-% and the register itself. If it is a macro, the prefixed
-% \cs{exp_not:N} will temporarily turn it into the primitive
+% token in question when it has been prefixed with \cs{exp_not:N}
+% and the token itself. If it is a macro, the prefixed
+% \cs{exp_not:N} temporarily turns it into the primitive
% \cs{scan_stop:}.
% \begin{macrocode}
\cs_new:Npn \@@_eval_register:N #1
@@ -1419,7 +1419,7 @@
% \end{macrocode}
% So to stop the expansion sequence in a controlled way all we need
% to provide is a constant integer zero as part of expanded tokens. As this is
-% an integer constant it will immediately stop
+% an integer constant it immediately stops
% \cs{tex_romannumerl:D}'s search for a number.
% \begin{macrocode}
%\int_const:Nn \exp_end: { 0 }
@@ -1431,10 +1431,10 @@
% generated. Or if we do then the programmer made a mistake.)
%
% If on the other hand we want to stop the initial expansion
-% sequence but continue with an f-type expansion we provide the
+% sequence but continue with an \texttt{f}-type expansion we provide the
% alphabetic constant |`^^@| that also represents |0| but this time
-% \TeX's syntax for a \meta{number} will continue searching for an
-% optional space (and it will continue expansion doing that) ---
+% \TeX's syntax for a \meta{number} continues searching for an
+% optional space (and it continues expansion doing that) ---
% see \TeX{}book page~269 for details.
% \begin{macrocode}
\tex_catcode:D `\^^@=13
Modified: trunk/l3kernel/l3file.dtx
===================================================================
--- trunk/l3kernel/l3file.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3file.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -53,17 +53,17 @@
% others are used to work with files on a line by line basis and have prefix
% \cs[no-index]{ior_\ldots} (reading) or \cs[no-index]{iow_\ldots} (writing).
%
-% It is important to remember that when reading external files \TeX{} will
-% attempt to locate them both the operating system path and entries in the
+% It is important to remember that when reading external files \TeX{}
+% attempts to locate them both the operating system path and entries in the
% \TeX{} file database (most \TeX{} systems use such a database). Thus the
% \enquote{current path} for \TeX{} is somewhat broader than that for other
% programs.
%
% For functions which expect a \meta{file name} argument, this argument
% may contain both literal items and expandable content, which should on
-% full expansion be the desired file name. Any active characters (as
-% declared in \cs{l_char_active_seq}) will \emph{not} be expanded,
-% allowing the direct use of these in file names. File names will be quoted
+% full expansion be the desired file name. Active characters (as
+% declared in \cs{l_char_active_seq}) are \emph{not} be expanded,
+% allowing the direct use of these in file names. File names are quoted
% using |"| tokens if they contain spaces: as a result, |"| tokens are
% \emph{not} permitted in file names.
%
@@ -76,14 +76,14 @@
% \g_file_curr_ext_str
% }
% Contain the directory, name and extension of the current file. The
-% directory will be empty if the file was loaded without an explicit
-% path (\emph{i.e.}~if it is in the \TeX{} search path), and will
+% directory is empty if the file was loaded without an explicit
+% path (\emph{i.e.}~if it is in the \TeX{} search path), and does
% \emph{not} end in |/| other than the case that it is exactly equal
% to the root directory. The \meta{name} and \meta{ext} parts together
% make up the file name, thus the \meta{name} part may be thought of
% as the \enquote{job name} for the current file. Note that \TeX{} does
% not provide information on the \meta{ext} part for the main (top
-% level) file and it will always have an empty \meta{dir} component.
+% level) file and that this file always has an empty \meta{dir} component.
% Also, the \meta{name} here will be equal to \cs{c_sys_jobname_str},
% which may be different from the real file name (if set using
% |--jobname|, for example).
@@ -91,7 +91,7 @@
%
% \begin{variable}[added = 2017-06-18]{\l_file_search_path_seq}
% Each entry is a (relative) directory which should be searched when
-% seeking a file. The entries will not be expanded when used so
+% seeking a file. The entries are not expanded when used so
% may contain active characters but should not feature any variable
% content.
% \end{variable}
@@ -113,7 +113,7 @@
% Searches for \meta{file name} in the path as detailed for
% \cs{file_if_exist:nTF}, and if found sets the \meta{str var} the
% fully-qualified name of the file, \emph{i.e.}~the path and file name.
-% If the file is not found then the \meta{str var} will be empty.
+% If the file is not found then the \meta{str var} is empty.
% \end{function}
%
% \begin{function}[added = 2017-06-23]{\file_parse_full_name:nNNN}
@@ -121,19 +121,19 @@
% \cs{file_parse_full_name:nNNN} \Arg{full name} \meta{dir} \meta{name} \meta{ext}
% \end{syntax}
% Parses the \meta{full name} and splits it into three parts, each of
-% which is returned by settings the appropriate local string variable:
+% which is returned by setting the appropriate local string variable:
% \begin{itemize}
% \item The \meta{dir}: everything up to the last |/| (path separator)
% in the \meta{file path}. As with system \texttt{PATH} variables
-% and related functions, the \meta{dir} will \emph{not} feature a trailing
+% and related functions, the \meta{dir} does \emph{not} feature a trailing
% |/| unless it points to the root directory. If there is no path (only
-% a file name), \meta{dir} will be empty.
+% a file name), \meta{dir} is empty.
% \item The \meta{name}: everything after the last |/| up to the last |.|,
% where both of those characters are optional. The \meta{name} may
% contain multiple |.| characters.
-% \item The \meta{ext}: everything after the last |.| If there is no
-% \meta{ext} in the \meta{file path}, the \TeX{} standard value
-% \texttt{.tex} will be returned.
+% \item The \meta{ext}: everything after the last |.| (including the dot).
+% If there is no \meta{ext} in the \meta{file path}, the \TeX{} standard
+% value \texttt{.tex} is returned.
% \end{itemize}
% This function does not expand the \meta{full name} before turning it
% to a string. It assume that the \meta{full name} either contains no
@@ -148,15 +148,15 @@
% \cs{file_if_exist:nTF}, and if found reads in the file as
% additional \LaTeX{} source. All files read are recorded
% for information and the file name stack is updated by this
-% function. An error will be raised if the file is not found.
+% function. An error is raised if the file is not found.
% \end{function}
%
% \begin{function}{\file_list:}
% \begin{syntax}
% \cs{file_list:}
% \end{syntax}
-% This function will list all files loaded using \cs{file_input:n}
-% in the log file.
+% This function lists in the log file all files loaded using
+% \cs{file_input:n}.
% \end{function}
%
% \subsection{Input--output stream management}
@@ -219,7 +219,7 @@
% open it is closed before the new operation begins. The
% \meta{stream} is available for access immediately and will remain
% allocated to \meta{file name} until a \cs{iow_close:N} instruction
-% is given or the \TeX{} run ends. Opening a file for writing will clear
+% is given or the \TeX{} run ends. Opening a file for writing clears
% any existing content in the file (\emph{i.e.}~writing is \emph{not}
% additive).
% \end{function}
@@ -254,15 +254,15 @@
% and right braces are found) from the input \meta{stream} and stores
% the result locally in the \meta{token list} variable. If the
% \meta{stream} is not open, input is requested from the terminal.
-% The material read from the \meta{stream} will be tokenized by \TeX{}
+% The material read from the \meta{stream} is tokenized by \TeX{}
% according to the category codes and \tn{endlinechar} in force when
% the function is used. Assuming normal settings, any lines which do
-% not end in a comment character~|%| will have the line ending
+% not end in a comment character~|%| have the line ending
% converted to a space, so for example input
% \begin{verbatim}
% a b c
% \end{verbatim}
-% will result in a token list \verb*|a b c |. Any blank line is
+% results in a token list \verb*|a b c |. Any blank line is
% converted to the token \cs{par}. Therefore, blank lines can be
% skipped by using a test such as
% \begin{verbatim}
@@ -295,15 +295,15 @@
% The material is read from the \meta{stream} as a series of tokens with
% category code $12$ (other), with the exception of space
% characters which are given category code $10$ (space).
-% Multiple whitespace characters are retained by this process. It will
-% always only read one line and any blank lines in the input
-% will result in the \meta{token list variable} being empty. Unlike
+% Multiple whitespace characters are retained by this process. It
+% always only reads one line and any blank lines in the input
+% result in the \meta{token list variable} being empty. Unlike
% \cs{ior_get:NN}, line ends do not receive any special treatment. Thus
% input
% \begin{verbatim}
% a b c
% \end{verbatim}
-% will result in a token list |a b c| with the letters |a|, |b|, and |c|
+% results in a token list |a b c| with the letters |a|, |b|, and |c|
% having category code~12.
% \begin{texnote}
% This protected macro is a wrapper around the \eTeX{} primitive
@@ -321,8 +321,8 @@
% Applies the \meta{inline function} to each set of \meta{lines}
% obtained by calling \cs{ior_get:NN} until reaching the end of the
% file. \TeX{} ignores any trailing new-line marker from the file it
-% reads. The \meta{inline function} should consist of code which will
-% receive the \meta{line} as |#1|.
+% reads. The \meta{inline function} should consist of code which
+% receives the \meta{line} as |#1|.
% \end{function}
%
% \begin{function}[added = 2012-02-11]{\ior_str_map_inline:Nn}
@@ -334,7 +334,7 @@
% as a series of tokens with category code $12$ (other), with the
% exception of space characters which are given category code $10$
% (space). The \meta{inline function} should consist of code which
-% will receive the \meta{line} as |#1|.
+% receives the \meta{line} as |#1|.
% Note that \TeX{} removes trailing space and tab characters
% (character codes 32 and 9) from every line upon input. \TeX{} also
% ignores any trailing new-line marker from the file it reads.
@@ -345,8 +345,8 @@
% \cs{ior_map_break:}
% \end{syntax}
% Used to terminate a \cs[no-index]{ior_map_\ldots} function before all
-% lines from the \meta{stream} have been processed. This will
-% normally take place within a conditional statement, for example
+% lines from the \meta{stream} have been processed. This
+% normally takes place within a conditional statement, for example
% \begin{verbatim}
% \ior_map_inline:Nn \l_my_ior
% {
@@ -357,12 +357,12 @@
% }
% }
% \end{verbatim}
-% Use outside of a \cs[no-index]{ior_map_\ldots} scenario will lead to low
+% Use outside of a \cs[no-index]{ior_map_\ldots} scenario leads to low
% level \TeX{} errors.
% \begin{texnote}
% When the mapping is broken, additional tokens may be inserted by the
% internal macro \cs{__prg_break_point:Nn} before further items are taken
-% from the input stream. This will depend on the design of the mapping
+% from the input stream. This depends on the design of the mapping
% function.
% \end{texnote}
% \end{function}
@@ -373,8 +373,8 @@
% \end{syntax}
% Used to terminate a \cs[no-index]{ior_map_\ldots} function before all
% lines in the \meta{stream} have been processed, inserting
-% the \meta{tokens} after the mapping has ended. This will
-% normally take place within a conditional statement, for example
+% the \meta{tokens} after the mapping has ended. This
+% normally takes place within a conditional statement, for example
% \begin{verbatim}
% \ior_map_inline:Nn \l_my_ior
% {
@@ -385,13 +385,13 @@
% }
% }
% \end{verbatim}
-% Use outside of a \cs[no-index]{ior_map_\ldots} scenario will lead to low
+% Use outside of a \cs[no-index]{ior_map_\ldots} scenario leads to low
% level \TeX{} errors.
% \begin{texnote}
% When the mapping is broken, additional tokens may be inserted by the
% internal macro \cs{__prg_break_point:Nn} before the \meta{tokens} are
% inserted into the input stream.
-% This will depend on the design of the mapping function.
+% This depends on the design of the mapping function.
% \end{texnote}
% \end{function}
%
@@ -401,7 +401,7 @@
% \cs{ior_if_eof:NTF} \meta{stream} \Arg{true code} \Arg{false code}
% \end{syntax}
% Tests if the end of a \meta{stream} has been reached during a reading
-% operation. The test will also return a \texttt{true} value if
+% operation. The test also returns a \texttt{true} value if
% the \meta{stream} is not open.
%\end{function}
%
@@ -445,7 +445,7 @@
% \begin{texnote}
% When using \pkg{expl3} with a format other than \LaTeX{}, new line
% characters inserted using \cs{iow_newline:} or using the
-% line-wrapping code \cs{iow_wrap:nnnN} will not be recognized in
+% line-wrapping code \cs{iow_wrap:nnnN} are not recognized in
% the argument of \cs{iow_shipout:Nn}. This may lead to the
% insertion of additionnal unwanted line-breaks.
% \end{texnote}
@@ -465,7 +465,7 @@
% This is a wrapper around the \TeX{} primitive \tn{write}.
% When using \pkg{expl3} with a format other than \LaTeX{}, new line
% characters inserted using \cs{iow_newline:} or using the
-% line-wrapping code \cs{iow_wrap:nnnN} will not be recognized in
+% line-wrapping code \cs{iow_wrap:nnnN} are not recognized in
% the argument of \cs{iow_shipout:Nn}. This may lead to the
% insertion of additionnal unwanted line-breaks.
% \end{texnote}
@@ -494,7 +494,7 @@
% expansion (\emph{e.g.}~in the second argument of \cs{iow_now:Nn}).
% \begin{texnote}
% When using \pkg{expl3} with a format other than \LaTeX{}, the
-% character inserted by \cs{iow_newline:} will not be recognized by
+% character inserted by \cs{iow_newline:} is not recognized by
% \TeX{}, which may lead to the insertion of additionnal unwanted
% line-breaks. This issue only affects \cs{iow_shipout:Nn},
% \cs{iow_shipout_x:Nn} and direct uses of primitive operations.
@@ -507,10 +507,10 @@
% \begin{syntax}
% \cs{iow_wrap:nnnN} \Arg{text} \Arg{run-on text} \Arg{set up} \meta{function}
% \end{syntax}
-% This function will wrap the \meta{text} to a fixed number of
+% This function wraps the \meta{text} to a fixed number of
% characters per line. At the start of each line which is wrapped,
-% the \meta{run-on text} will be inserted. The line character count
-% targeted will be the value of \cs{l_iow_line_count_int} minus the
+% the \meta{run-on text} is inserted. The line character count
+% targeted is the value of \cs{l_iow_line_count_int} minus the
% number of characters in the \meta{run-on text} for all lines except
% the first, for which the target number of characters is simply
% \cs{l_iow_line_count_int} since there is no run-on text. The
@@ -534,12 +534,12 @@
% \cs{tl_to_str:n}, \cs{tl_to_str:N}, \emph{etc.}
%
% The result of the wrapping operation is passed as a braced argument to the
-% \meta{function}, which will typically be a wrapper around a write
+% \meta{function}, which is typically a wrapper around a write
% operation. The output of \cs{iow_wrap:nnnN} (\emph{i.e.}~the argument
-% passed to the \meta{function}) will consist of characters of category
+% passed to the \meta{function}) consists of characters of category
% \enquote{other} (category code~12), with the exception of spaces which
-% will have category \enquote{space} (category code~10). This means that the
-% output will \emph{not} expand further when written to a file.
+% have category \enquote{space} (category code~10). This means that the
+% output does \emph{not} expand further when written to a file.
%
% \begin{texnote}
% Internally, \cs{iow_wrap:nnnN} carries out an \texttt{x}-type expansion
@@ -556,7 +556,7 @@
% \cs{iow_indent:n} \Arg{text}
% \end{syntax}
% In the first argument of \cs{iow_wrap:nnnN} (for instance in messages),
-% indents \meta{text} by four spaces. This function will not cause
+% indents \meta{text} by four spaces. This function does not cause
% a line break, and only affects lines which start within the scope
% of the \meta{text}. In case the indented \meta{text} should appear
% on separate lines from the surrounding text, use |\\| to force
@@ -580,7 +580,7 @@
%
% \begin{variable}{\c_term_ior}
% Constant input stream for reading from the terminal. Reading from this
-% stream using \cs{ior_get:NN} or similar will result in a prompt from
+% stream using \cs{ior_get:NN} or similar results in a prompt from
% \TeX{} of the form
% \begin{verbatim}
% <tl>=
@@ -862,7 +862,7 @@
% \begin{macro}{\file_get_full_name:nN, \file_get_full_name:VN}
% \begin{macro}[aux]{\@@_get_full_name_search:nN}
% The way to test if a file exists is to try to open it: if it does
-% not exist then \TeX{} will report end-of-file. A search is made
+% not exist then \TeX{} reports end-of-file. A search is made
% looking at each potential path in turn (starting from the current
% directory). The first location is of course treated as the correct
% one: this is done by jumping to \cs{__prg_break_point:}. If nothing
@@ -901,9 +901,9 @@
%
% \begin{macro}[TF]{\file_if_exist:n}
% The test for the existence of a file is a wrapper around the function to
-% add a path to a file. If the file was found, the path will contain
+% add a path to a file. If the file was found, the path contains
% something, whereas if the file was not located then the return value
-% will be empty.
+% is empty.
% \begin{macrocode}
\prg_new_protected_conditional:Npnn \file_if_exist:n #1 { T , F , TF }
{
@@ -1003,7 +1003,6 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
%
% \begin{macro}{\file_parse_full_name:nNNN}
% \begin{macro}[aux]
@@ -1849,7 +1848,7 @@
% valid and otherwise to \cs{@@_indent_error:n}. The first places the
% instruction for increasing the indentation before its argument, and
% the instruction for unindenting afterwards. The second produces an
-% error expandably. Note that there will be no forced line-break, so
+% error expandably. Note that there are no forced line-break, so
% the indentation only changes when the next line is started.
% \begin{macrocode}
\cs_new_protected:Npn \iow_indent:n #1
@@ -1921,7 +1920,7 @@
\int_set:Nn \l_@@_line_target_int
{ \l_iow_line_count_int - \str_count:N \l_@@_newline_tl + 1 }
% \end{macrocode}
-% There is then a loop over the input, which will store the wrapped
+% There is then a loop over the input, which stores the wrapped
% result in \cs{l_@@_wrap_tl}. After the loop, the resulting text is
% passed on to the function which has been given as a post-processor.
% The \cs{tl_to_str:N} step converts the \enquote{other} spaces back
@@ -1933,7 +1932,7 @@
#4 { \tl_to_str:N \l_@@_wrap_tl }
}
% \end{macrocode}
-% As using the generic loader will mean that \cs{protected at edef} is
+% As using the generic loader means that \cs{protected at edef} is
% not available, it's not placed directly in the wrap function but is set
% up as an auxiliary. In the generic loader this can then be redefined.
% \begin{macrocode}
@@ -1946,9 +1945,9 @@
%
% \begin{macro}[aux]{\@@_wrap_do:, \@@_wrap_start:w}
% Escape spaces. Set up a few variables, in particular the initial
-% value of \cs{l_@@_wrap_tl}: the space will stop the
+% value of \cs{l_@@_wrap_tl}: the space stops the
% \texttt{f}-expansion of the main wrapping function and
-% \cs{use_none:n} will remove a newline marker inserted by later code.
+% \cs{use_none:n} removes a newline marker inserted by later code.
% The main loop consists of repeatedly calling the \texttt{chunk}
% auxiliary to wrap chunks delimited by (newline or indentation)
% markers.
@@ -2130,7 +2129,7 @@
% \texttt{break_first} auxiliary calls the \texttt{break_none}
% auxiliary. In that case, if the current line is empty, the complete
% word (including |##4|, characters beyond what we had grabbed) is
-% added to the line, making it over-long. Otherwise, the word will be
+% added to the line, making it over-long. Otherwise, the word is
% used for the following line (and the last space of the line so far
% is removed because it was inserted due to the presence of a marker).
% \begin{macrocode}
Modified: trunk/l3kernel/l3final.dtx
===================================================================
--- trunk/l3kernel/l3final.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3final.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -63,7 +63,7 @@
%
% \subsection{Input encoding}
%
-% The letters |a|--|z| and |A|--|Z| will be correct directly from Ini\TeX{}
+% The letters |a|--|z| and |A|--|Z| have the correct catcode directly from Ini\TeX{}
% while for Unicode engines (almost) all characters to be treated as letters
% are defined by the automatic data parsing. Thus the changes here are to
% deal with the additional cases.
Modified: trunk/l3kernel/l3flag.dtx
===================================================================
--- trunk/l3kernel/l3flag.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3flag.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -84,7 +84,7 @@
% Creates a new flag with a name given by \meta{flag name}, or raises
% an error if the name is already taken. The \meta{flag name} may not
% contain spaces. The declaration is global, but flags are always
-% local variables. The \meta{flag} will initially have zero height.
+% local variables. The \meta{flag} initially has zero height.
% \end{function}
%
% \begin{function}{\flag_clear:n}
Modified: trunk/l3kernel/l3fp-aux.dtx
===================================================================
--- trunk/l3kernel/l3fp-aux.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3fp-aux.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -72,8 +72,8 @@
% \end{quote}
% Let us explain each piece separately.
%
-% Internal floating point numbers will be used in expressions,
-% and in this context will be subject to \texttt{f}-expansion. They must
+% Internal floating point numbers are used in expressions,
+% and in this context are subject to \texttt{f}-expansion. They must
% leave a recognizable mark after \texttt{f}-expansion, to prevent the
% floating point number from being re-parsed. Thus, \cs{s_@@}
% is simply another name for \tn{relax}.
@@ -483,7 +483,7 @@
% \subsection{Packing digits}
%
% When a positive integer |#1| is known to be less than $10^8$, the
-% following trick will split it into two blocks of $4$ digits, padding
+% following trick splits it into two blocks of $4$ digits, padding
% with zeros on the left.
% \begin{verbatim}
% \cs_new:Npn \pack:NNNNNw #1 #2#3#4#5 #6; { {#2#3#4#5} {#6} }
@@ -520,14 +520,14 @@
% which triggers the third computation. The third computation's value
% is $5\,0000\,0000 + 12345 \times 8899$, which has $9$ digits. Adding
% $5\cdot 10^{8}$ to the product allowed us to know how many digits to
-% expect as long as the numbers to multiply are not too big; it will
-% also work to some extent with negative results. The \texttt{pack}
+% expect as long as the numbers to multiply are not too big; it
+% also works to some extent with negative results. The \texttt{pack}
% function puts the last $4$ of those $9$ digits into a brace group,
% moves the semi-colon delimiter, and inserts a |+|, which combines the
% carry with the previous computation. The shifts nicely combine into
% $5\,0000\,0000 / 10^{4} + 4\,9995\,0000 = 5\,0000\,0000$. As long as
% the operands are in some range, the result of this second computation
-% will have $9$ digits. The corresponding \texttt{pack} function,
+% has $9$ digits. The corresponding \texttt{pack} function,
% expanded after the result is computed, braces the last $4$ digits, and
% leaves |+| \meta{5 digits} for the initial computation. The
% \enquote{leading shift} cancels the combination of the other shifts,
@@ -610,7 +610,7 @@
% \end{syntax}
% Grabs two sets of $4$ digits and places them before the semi-colon
% delimiter. Putting several copies of this function before a
-% semicolon will pack more digits since each will take the digits
+% semicolon packs more digits since each takes the digits
% packed by the others in its first argument.
% \begin{macrocode}
\cs_new:Npn \@@_pack_twice_four:wNNNNNNNN #1; #2#3#4#5 #6#7#8#9
@@ -624,8 +624,8 @@
% \end{syntax}
% Grabs one set of $8$ digits and places them before the semi-colon
% delimiter as a single group. Putting several copies of this
-% function before a semicolon will pack more digits since each will
-% take the digits packed by the others in its first argument.
+% function before a semicolon packs more digits since each
+% takes the digits packed by the others in its first argument.
% \begin{macrocode}
\cs_new:Npn \@@_pack_eight:wNNNNNNNN #1; #2#3#4#5 #6#7#8#9
{ #1 {#2#3#4#5#6#7#8#9} ; }
@@ -851,14 +851,14 @@
% \meta{junk}
% \meta{floating point}
% \end{syntax}
-% In this example, the case $0$ will return the floating point
+% In this example, the case $0$ returns the floating point
% \meta{fp~var}, expanding once after that floating point. Case $1$
-% will do \meta{some computation} using the \meta{floating point}
+% does \meta{some computation} using the \meta{floating point}
% (presumably compute the operation requested by the user in that
-% non-trivial case). Case $2$ will return the \meta{floating point}
+% non-trivial case). Case $2$ returns the \meta{floating point}
% without modifying it, removing the \meta{junk} and expanding once
-% after. Case $3$ will close the conditional, remove the \meta{junk}
-% and the \meta{floating point}, and expand \meta{something} next. In
+% after. Case $3$ closes the conditional, removes the \meta{junk}
+% and the \meta{floating point}, and expands \meta{something} next. In
% other cases, the \enquote{\meta{junk}} is expanded, performing some
% other operation on the \meta{floating point}. We provide similar
% functions with two trailing \meta{floating points}.
Modified: trunk/l3kernel/l3fp-basics.dtx
===================================================================
--- trunk/l3kernel/l3fp-basics.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3fp-basics.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -614,7 +614,7 @@
% $10$, namely the first digit of $x$ is $1$, and all others vanish
% when subtracting $y$. Then the \meta{rounding} |#3| and the
% \meta{final sign} |#4| control whether we get $1$ or $0.9999 9999
-% 9999 9999$. In the usual round-to-nearest mode, we will get $1$
+% 9999 9999$. In the usual round-to-nearest mode, we get $1$
% whenever the \meta{rounding} digit is less than or equal to $5$
% (remember that the \meta{rounding} digit is only equal to $5$ if
% there was no further non-zero digit).
@@ -922,7 +922,7 @@
% \end{macro}
%
% \begin{macro}[aux, rEXP]{\@@_mul_significand_small_f:NNwwwN}
-% In this branch, \meta{digit 1} is zero. Our result will thus be
+% In this branch, \meta{digit 1} is zero. Our result is thus
% \meta{digits 2--17}, plus some rounding which depends on the digits
% $17$, $18$, and whether all subsequent digits are zero or not.
% The $8$ digits |1#3| are followed, after expansion of the
@@ -1038,7 +1038,7 @@
% + 10^{-16} Q_{D} + \text{rounding}$. Since the $Q_{i}$ are integers,
% $B$, $C$, $D$, and~$E$ are all exact multiples of $10^{-16}$, in other
% words, computing with $16$ digits after the decimal separator yields
-% exact results. The problem will be overflow: in general $B$, $C$,
+% exact results. The problem is the risk of overflow: in general $B$, $C$,
% $D$, and $E$ may be greater than $1$.
%
% Unfortunately, things are not as easy as they seem. In particular, we
@@ -1143,7 +1143,7 @@
% All of those bounds are less than $2.147\cdot 10^{5}$, and we are thus
% within \TeX{}'s bounds in all cases!
%
-% We will later need to have a bound on the $Q_{i}$. Their definitions
+% We later need to have a bound on the $Q_{i}$. Their definitions
% imply that $Q_{A} < 10^{9} A/y - 1/2 < 10^{5} A$ and similarly for the
% other $Q_{i}$. Thus, all of them are less than $177770$.
%
@@ -1151,7 +1151,7 @@
% \begin{equation*}
% A/Z = \sum_{i=1}^{4} \left(10^{-4i} Q_{i}\right) + 10^{-16} E/Z
% \end{equation*}
-% exactly. Furthermore, we know that the result will be in $[0.1,10)$,
+% exactly. Furthermore, we know that the result is in $[0.1,10)$,
% hence will be rounded to a multiple of $10^{-16}$ or of $10^{-15}$, so
% we only need to know the integer part of $E/Z$, and a
% \enquote{rounding} digit encoding the rest. Equivalently, we need to
@@ -1194,7 +1194,7 @@
% Compute $10^{6} + Q_{A}$ (a $7$~digit number thanks to the shift),
% unbrace \meta{A_1} and \meta{A_2}, and prepare the
% \meta{continuation} arguments for $4$ consecutive calls to
-% \cs{@@_div_significand_calc:wwnnnnnnn}. Each of these calls will need
+% \cs{@@_div_significand_calc:wwnnnnnnn}. Each of these calls needs
% \meta{y} (|#1|), and it turns out that we need post-expansion there,
% hence the \cs{__int_value:w}. Here, |#4| is six brace groups, which
% give the six first |n|-type arguments of the \texttt{calc} function.
@@ -1328,7 +1328,7 @@
% \meta{continuations} \meta{sign}
% \end{quote}
% Compute $Q_{B}$ by evaluating $\meta{B_1}\meta{B_2}0 / y - 1$. The
-% result will be output to the left, in an \cs{__int_eval:w} which we
+% result is output to the left, in an \cs{__int_eval:w} which we
% start now. Once that is evaluated (and the other $Q_{i}$ also,
% since later expansions are triggered by this one), a packing
% auxiliary takes care of placing the digits of $Q_{B}$ in an
@@ -1353,7 +1353,7 @@
% \Arg{Z_1} \Arg{Z_2} \Arg{Z_3} \Arg{Z_4} \meta{sign}
% \end{quote}
% We compute $P \simeq 2E/Z$ by rounding $2 E_{1} E_{2}/Z_{1}Z_{2}$.
-% Note the first $0$, which multiplies $Q_{D}$ by $10$: we will later
+% Note the first $0$, which multiplies $Q_{D}$ by $10$: we later
% add (roughly) $5\cdot P$, which amounts to adding $P/2 \simeq E/Z$
% to $Q_{D}$, the appropriate correction from a hypothetical $Q_{E}$.
% \begin{macrocode}
@@ -1692,7 +1692,7 @@
% < 3.2 \cdot 10^{-8} \,,
% \]
% and $\sqrt{a} - y = (a - y^2)/(\sqrt{a} + y) \leq 16 \cdot 10^{-8}$.
-% Next, \cs{@@_sqrt_auxii_o:NnnnnnnnN} will be called several times to
+% Next, \cs{@@_sqrt_auxii_o:NnnnnnnnN} is called several times to
% get closer and closer underestimates of~$\sqrt{a}$. By
% construction, the underestimates~$y$ are always increasing, $a - y^2
% < 3.2 \cdot 10^{-8}$ for all. Also, $y<1$.
Modified: trunk/l3kernel/l3fp-convert.dtx
===================================================================
--- trunk/l3kernel/l3fp-convert.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3fp-convert.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -69,7 +69,7 @@
% If |#1| ends with a $0$, the \texttt{loop} auxiliary takes that zero
% as an end-delimiter for its first argument, and the second argument
% is the same \texttt{loop} auxiliary. Once the last trailing zero is
-% reached, the second argument will be the \texttt{dot} auxiliary,
+% reached, the second argument is the \texttt{dot} auxiliary,
% which removes a trailing dot if any. We then clean-up with the
% \texttt{end} auxiliary, keeping only the number.
% \begin{macrocode}
@@ -355,7 +355,7 @@
% \begin{macro}[aux, EXP]{\@@_to_int_dispatch:w}
% To convert to an integer, first round to $0$ places (to the nearest
% integer), then express the result as a decimal number: the
-% definition of \cs{@@_to_decimal_dispatch:w} is such that there will be no
+% definition of \cs{@@_to_decimal_dispatch:w} is such that there are no
% trailing dot nor zero.
% \begin{macrocode}
\cs_new:Npn \@@_to_int_dispatch:w #1;
Modified: trunk/l3kernel/l3fp-expo.dtx
===================================================================
--- trunk/l3kernel/l3fp-expo.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3fp-expo.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -82,7 +82,7 @@
%
% \emph{The rest of this section is actually not in sync with the code.
% Or is the code not in sync with the section? In the current code,
-% $c\in [1,10]$ will be such that $0.7\leq ac < 1.4$.}
+% $c\in [1,10]$ is such that $0.7\leq ac < 1.4$.}
%
% We are given a positive normal number, of the form $a\cdot 10^{b}$
% with $a\in[0.1,1)$. To compute its logarithm, we find a small integer
@@ -250,7 +250,7 @@
{#1#2#3#4#5} {#6}
}
% \end{macrocode}
-% The Taylor series will be expressed in terms of
+% The Taylor series to be used is expressed in terms of
% $t = (x-1)/(x+1) = 1 - 2/(x+1)$. We now compute the
% quotient with extended precision, reusing some code
% from \cs{@@_/_o:ww}. Note that $1+x$ is known exactly.
@@ -520,8 +520,7 @@
%
% For now, $\ln(x)$ is given as $\cdot 10^0$. Unless both the exponent
% is $1$ and $c=1$, we shift to working in units of $\cdot 10^4$,
-% since the final result will be at least $\ln(10/7) \simeq
-% 0.35$.
+% since the final result is at least $\ln(10/7) \simeq 0.35$.
% \begin{macrocode}
\cs_new:Npn \@@_ln_c:NwNw #1 #2; #3
{
@@ -542,7 +541,7 @@
% \Arg{exponent}
% \end{quote}
% Compute \meta{exponent} times $\ln(10)$. Apart from the cases where
-% \meta{exponent} is $0$ or $1$, the result will necessarily be at
+% \meta{exponent} is $0$ or $1$, the result is necessarily at
% least $\ln(10) \simeq 2.3$ in magnitude. We can thus drop the least
% significant $4$ digits. In the case of a very large (positive or
% negative) exponent, we can (and we need to) drop $4$ additional
@@ -1157,7 +1156,7 @@
% undefined. This is invalid, unless $|a|^b$ turns out to be $+0$ or
% \texttt{nan}, in which case we return that as $a^b$. In particular,
% since the underflow detection occurs before \cs{@@_pow_neg:www} is
-% called, |(-0.1)**(12345.67)| will give $+0$ rather than complaining
+% called, |(-0.1)**(12345.67)| gives $+0$ rather than complaining
% that the sign is not defined.
% \begin{macrocode}
\cs_new:Npn \@@_pow_neg:www \s_@@ \@@_chk:w #1#2; #3; #4;
Modified: trunk/l3kernel/l3fp-extended.dtx
===================================================================
--- trunk/l3kernel/l3fp-extended.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3fp-extended.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -180,8 +180,8 @@
% $10^{-24}$, and leaves \meta{continuation} \Arg{c_1} \ldots{}
% \Arg{c_6} |;| in the input stream, where each of the \meta{c_i} are
% blocks of $4$~digits, except \meta{c_1}, which is any \TeX{}
-% integer. Note that indices for \meta{b} start at~$0$: a second
-% operand of |{0001}{0000}{0000}| will leave the first operand
+% integer. Note that indices for \meta{b} start at~$0$: for instance
+% a second operand of |{0001}{0000}{0000}| leaves the first operand
% unchanged (rather than dividing it by $10^{4}$, as
% \cs{@@_fixed_mul:wwn} would).
% \begin{macrocode}
@@ -235,7 +235,7 @@
% The \texttt{ii} auxiliary receives $Q_{i}$, $n$, and $a_{i}$ as
% arguments. It adds $Q_{i}$ to a surrounding integer expression, and
% starts a new one with the initial value $9999$, which ensures that
-% the result of this expression will have $5$ digits. The auxiliary
+% the result of this expression has $5$ digits. The auxiliary
% also computes $a_{i}-n\cdot Q_{i}$, placing the result in front of
% the $4$ digits of $a_{i+1}$. The resulting $a'_{i+1} = 10^{4}
% (a_{i} - n \cdot Q_{i}) + a_{i+1}$ serves as the first argument for
@@ -450,7 +450,7 @@
% common parts of the three functions.
%
% For definiteness, consider the task of computing $a\times b + c$.
-% We will perform carries in
+% We perform carries in
% \begin{align*}
% a \times b + c =
% & (a_{1} \cdot b_{1} + c_{1} c_{2})\cdot 10^{-8} \\
@@ -479,7 +479,7 @@
% first level, calls the \texttt{i} auxiliary with arguments described
% later, and adds a trailing ${} + c_{5}c_{6}$ |;|
% \Arg{continuation}~|;|. The ${} + c_{5}c_{6}$ piece, which is
-% omitted for \cs{@@_fixed_one_minus_mul:wwn}, will be taken in the
+% omitted for \cs{@@_fixed_one_minus_mul:wwn}, is taken in the
% integer expression for the $10^{-24}$ level.
% \begin{macrocode}
\cs_new:Npn \@@_fixed_mul_add:wwwn #1; #2; #3#4#5#6#7#8;
@@ -564,7 +564,7 @@
% & b_{1} + a_{4} \cdot b_{2} + a_{3} \cdot b_{3} + a_{2} \cdot b_{4} + a_{1} \\
% & b_{2} + a_{4} \cdot b_{3} + a_{3} \cdot b_{4} + a_{2} .
% \end{align*}
-% Obviously, those expressions make no mathematical sense: we will
+% Obviously, those expressions make no mathematical sense: we
% complete them with $a_{5} \cdot {}$ and ${} \cdot b_{5}$, and with
% $a_{6} \cdot b_{1} + a_{5} \cdot {}$ and ${} \cdot b_{5} + a_{1}
% \cdot b_{6}$, and of course with the trailing ${} + c_{5} c_{6}$.
@@ -626,8 +626,7 @@
% {\@@_ep_to_fixed_auxi:www, \@@_ep_to_fixed_auxii:nnnnnnnwn}
% Converts an extended-precision number with an exponent at most~$4$
% and a first block less than $10^{8}$ to a fixed point number whose
-% first block will have $12$~digits, hopefully starting with many
-% zeros.
+% first block has $12$~digits, hopefully starting with many zeros.
% \begin{macrocode}
\cs_new:Npn \@@_ep_to_fixed:wwn #1,#2
{
@@ -779,7 +778,7 @@
% $\meta{d_1}\cdots\meta{d_6}$, the condition translates to
% $\meta{n_1},\meta{d_1}\in[1000,9999]$.
%
-% We will first find an integer estimate $a \simeq 10^{8} / \meta{d}$ by
+% We first find an integer estimate $a \simeq 10^{8} / \meta{d}$ by
% computing
% \begin{align*}
% \alpha &= \eTeXfrac{10^{9}}{\meta{d_1}+1} \\
@@ -795,7 +794,7 @@
% \meta{d}$, while when $\meta{d_2}=9999$ one gets $a =
% 10^{3}\alpha-1250 \simeq 10^{12} / (\meta{d_1} + 1) \simeq 10^{8} /
% \meta{d}$. The shift by $1250$ helps to ensure that $a$ is an
-% underestimate of the correct value. We will prove that
+% underestimate of the correct value. We shall prove that
% \[
% 1 - 1.755\cdot 10^{-5} < \frac{\meta{d}a}{10^{8}} < 1 .
% \]
@@ -812,8 +811,8 @@
%
% Let us prove the upper bound first (multiplied by $10^{15}$). Note
% that $10^{7} \meta{d} < 10^{3} \meta{d_1} + 10^{-1} (\meta{d_2} + 1)$,
-% and that \eTeX{}'s division $\eTeXfrac{\meta{d_2}}{10}$ will at most
-% underestimate $10^{-1}(\meta{d_2} + 1)$ by $0.5$, as can be checked
+% and that \eTeX{}'s division $\eTeXfrac{\meta{d_2}}{10}$ underestimates
+% $10^{-1}(\meta{d_2} + 1)$ by $0.5$ at most, as can be checked
% for each possible last digit of \meta{d_2}. Then,
% \begin{align}
% 10^{7} \meta{d}a
@@ -877,7 +876,7 @@
% reached for one of the extreme values $[y/10]=0$ or $[y/10]=100$, and
% we easily check the bound for those values.
%
-% We have proven that the algorithm will give us a precise enough
+% We have proven that the algorithm gives us a precise enough
% answer. Incidentally, the upper bound that we derived tells us that
% $a < 10^{8}/\meta{d} \leq 10^{9}$, hence we can compute $a$ safely as
% a \TeX{} integer, and even add $10^{9}$ to it to ease grabbing of all
@@ -916,7 +915,7 @@
% }
% The \texttt{esti} function evaluates $\alpha=10^{9} / (\meta{d_1} +
% 1)$, which is used twice in the expression for $a$, and combines the
-% exponents |#1| and~|#4| (with a shift by~$1$ because we will compute
+% exponents |#1| and~|#4| (with a shift by~$1$ because we later compute
% $\meta{n}/(10\meta{d})$. Then the \texttt{estii} function evaluates
% $10^{9} + a$, and puts the exponent~|#2| after the
% continuation~|#7|: from there on we can forget exponents and focus
@@ -1008,8 +1007,8 @@
% method: essentially $r \mapsto (r + 10^{8} / (x_{1} r)) / 2$, starting
% from a guess that optimizes the number of steps before convergence.
% In fact, just as there is a slight shift when computing divisions to
-% ensure that some inequalities hold, we will replace $10^{8}$ by a
-% slightly larger number which will ensure that $r^2 x \geq 10^{4}$.
+% ensure that some inequalities hold, we replace $10^{8}$ by a
+% slightly larger number which ensures that $r^2 x \geq 10^{4}$.
% This also causes $r \in [101, 1003]$. Another correction to the above
% is that the input is actually normalized to $[0.1,1)$, and we use
% either $10^{8}$ or $10^{9}$ in the Newton method, depending on the
Modified: trunk/l3kernel/l3fp-logic.dtx
===================================================================
--- trunk/l3kernel/l3fp-logic.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3fp-logic.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -315,8 +315,7 @@
% \cs{int_step_function:nnnN}. There are two subtleties: we use the
% internal parser \cs{@@_parse:n} to avoid converting back and forth
% from the internal representation; and (due to rounding) even a
-% non-zero step does not guarantee that the loop counter will
-% increase.
+% non-zero step does not guarantee that the loop counter increases.
% \begin{macrocode}
\cs_new:Npn \fp_step_function:nnnN #1#2#3
{
@@ -425,8 +424,9 @@
% numbers sequentially, keeping track of the largest (smallest) number
% found so far. If numbers are equal (for instance~$\pm0$), the first
% is kept. We append $-\infty$ ($\infty$), for the case of an empty
-% array, currently impossible. Since no number is smaller (larger)
-% than that, it will never alter the maximum (minimum). The weird
+% array. Since no number is smaller (larger) than that, this
+% additional item only affects the maximum (minimum) in the case of
+% |max()| and |min()| with no argument. The weird
% fp-like trailing marker breaks the loop correctly: see the precise
% definition of \cs{@@_minmax_loop:Nww}.
% \begin{macrocode}
Modified: trunk/l3kernel/l3fp-parse.dtx
===================================================================
--- trunk/l3kernel/l3fp-parse.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3fp-parse.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -78,7 +78,7 @@
% \begin{texnote}
% Registers (integers, toks, etc.) are automatically unpacked,
% without requiring a function such as \cs{int_use:N}. Invalid
-% tokens remaining after \texttt{f}-expansion will lead to
+% tokens remaining after \texttt{f}-expansion lead to
% unrecoverable low-level \TeX{} errors.
% \end{texnote}
% \end{macro}
@@ -155,7 +155,7 @@
% \cs{int_eval:n} does), and with this approach, expanding the next
% unread token forces us to jump with \cs{exp_after:wN} over every value
% computed earlier in the expression. With this approach, the run-time
-% will grow at least quadratically in the length of the expression, if
+% grows at least quadratically in the length of the expression, if
% not as its cube (inserting the \cs{exp_after:wN} is tricky and slow).
%
% A second option is to place those values at the end of the expression.
@@ -217,7 +217,7 @@
% to do the calculation, and in the process to expand the following
% once. This is also true in our real application: all the functions of
% the form \cs[no-index]{@@_\ldots_o:ww} expand what follows once. This comes at the
-% cost of leaving tokens in the input stack, and we will need to be
+% cost of leaving tokens in the input stack, and we need to be
% careful not to waste this memory. All of our discussion above is nice
% but simplistic, as operations should not simply be performed in the
% order they appear.
@@ -232,8 +232,8 @@
% reaching an operator which has lower precedence than the one which
% called |\operand:w|. This means that |\operand:w| must know what the
% previous binary operator is, or rather, its precedence: we thus rename
-% it |\operand:Nw|. Let us describe as an example how the calculation
-% |41-2^3*4+5| will be done. Here, we abuse notations: the first
+% it |\operand:Nw|. Let us describe as an example how we plan to do
+% the calculation |41-2^3*4+5|. Here, we abuse notations: the first
% argument of |\operand:Nw| should be an integer constant (\cs{c_@@_prec_plus_int},
% \ldots{}) equal to the precedence of the given operator,
% not directly the operator itself.
@@ -266,7 +266,7 @@
% \end{itemize}
% The procedure above stops short of performing all computations, but
% adding a surrounding call to |\operand:Nw| with a very low precedence
-% ensures that all computations will be performed before |\operand:Nw|
+% ensures that all computations are performed before |\operand:Nw|
% is done. Adding a trailing marker with the same very low precedence
% prevents the surrounding |\operand:Nw| from going beyond the marker.
%
@@ -386,7 +386,7 @@
% the \meta{precedence}, continuing the loop.
%
% We have introduced the most important functions here, and the next few
-% paragraphs will describe various subtleties.
+% paragraphs we describe various subtleties.
%
% \subsubsection{Prefix operators, parentheses, and functions}
%
@@ -530,8 +530,8 @@
% At all steps, we try to accept all category codes: when |#1|~is kept
% to be used later, it is almost always converted to category code other
% through \cs{token_to_str:N}. More precisely, catcodes $\{3, 6, 7, 8,
-% 11, 12\}$ should work without trouble, but $\{1, 2, 4, 10, 13\}$ will
-% not work, and of course $\{0, 5, 9\}$ cannot become tokens.
+% 11, 12\}$ should work without trouble, but not $\{1, 2, 4, 10, 13\}$,
+% and of course $\{0, 5, 9\}$ cannot become tokens.
%
% Floating point expressions should behave as much as possible like
% \eTeX{}-based integer expressions and dimension expressions. In
@@ -541,22 +541,22 @@
% restricted expandable functions can then be used in floating point
% expressions just as they can be in other kinds of expressions.
% Problematically, spaces stop \texttt{f}-expansion: for instance, the
-% macro~|\X| below will not be expanded if we simply perform
+% macro~|\X| below would not be expanded if we simply performed
% \texttt{f}-expansion.
% \begin{verbatim}
% \DeclareDocumentCommand {\test} {m} { \fp_eval:n {#1} }
% \ExplSyntaxOff
% \test { 1 + \X }
% \end{verbatim}
-% Of course, spaces will not appear in a code setting, but may very
+% Of course, spaces typically do not appear in a code setting, but may very
% easily come in document-level input, from which some expressions may
% come. To avoid this problem, at every step, we do essentially what
% \cs{use:f} would do: take an argument, put it back in the input
% stream, then \texttt{f}-expand it. This is not a complete solution,
-% since a macro's expansion could contain leading spaces which will stop
+% since a macro's expansion could contain leading spaces which would stop
% the \texttt{f}-expansion before further macro calls are performed.
% However, in practice it should be enough: in particular, floating
-% point numbers will correctly be expanded to the underlying \cs{s_@@}
+% point numbers are correctly expanded to the underlying \cs{s_@@}
% \ldots{} structure. The \texttt{f}-expansion is performed by
% \cs{@@_parse_expand:w}.
%
@@ -722,7 +722,7 @@
% and |#2|~the first token of the operand. We distinguish four cases:
% |#2|~is equal to \cs{scan_stop:} in meaning, |#2|~is a different
% control sequence, |#2|~is a digit, and |#2|~is something else (this
-% last case will be split further). Despite the earlier
+% last case is split further later). Despite the earlier
% \texttt{f}-expansion, |#2|~may still be expandable if it was
% protected by \cs{exp_not:N}, as may happen with the \LaTeXe{} command
% \tn{protect}. Using a well placed \cs{reverse_if:N}, this case is
@@ -925,7 +925,7 @@
%
% \begin{macro}[aux, EXP]{\@@_parse_one_digit:NN}
% A digit marks the beginning of an explicit floating point number.
-% Once the number is found, we will catch the case of overflow and
+% Once the number is found, we catch the case of overflow and
% underflow with \cs{@@_sanitize:wN}, then
% \cs{@@_parse_infix_after_operand:NwN} expands \cs{@@_parse_infix:NN}
% after the number we find, to wrap the following infix operator as
@@ -1069,7 +1069,7 @@
%
% \subsubsection{Numbers: trimming leading zeros}
%
-% Numbers will be parsed as follows: first we trim leading zeros, then
+% Numbers are parsed as follows: first we trim leading zeros, then
% if the next character is a digit, start reading a significand $\geq 1$
% with the set of functions |\__fp_parse_large|\ldots{}; if it is a
% period, the significand is~$<1$; and otherwise it is zero. In the
@@ -1150,8 +1150,8 @@
%
% \begin{macro}[aux, EXP]{\@@_parse_zero:}
% After reading a significand of~$0$, find any exponent, then put a
-% sign of~|1| for \cs{@@_sanitize:wN}, which will remove everything
-% and leave an exact zero.
+% sign of~|1| for \cs{@@_sanitize:wN}, which removes everything
+% and leaves an exact zero.
% \begin{macrocode}
\cs_new:Npn \@@_parse_zero:
{
@@ -1172,8 +1172,8 @@
% expanding) can only go up to $9$ digits. Hence we grab digits in
% two steps of $8$ digits. Since |#1| is a digit, read seven more
% digits using \cs{@@_parse_digits_vii:N}. The \texttt{small_leading}
-% auxiliary will leave those digits in the \cs{__int_value:w}, and
-% grab some more, or stop if there are no more digits. Then the
+% auxiliary leaves those digits in the \cs{__int_value:w}, and
+% grabs some more, or stops if there are no more digits. Then the
% \texttt{pack_leading} auxiliary puts the various parts in the
% appropriate order for the processing further up.
% \begin{macrocode}
@@ -1471,7 +1471,7 @@
% {\@@_parse_small_round:NN, \@@_parse_round_after:wN}
% Here, |#1|~is the digit that we are currently rounding (we only care
% whether it is even or odd). If |#2|~is not a digit, then fetch an
-% exponent and expand to |;|\meta{exponent} only. Otherwise, we will
+% exponent and expand to |;|\meta{exponent} only. Otherwise, we
% expand to |+0| or |+1|, then |;|\meta{exponent}. To
% decide which, call \cs{@@_round_s:NNNw} to know whether to round up,
% giving it as arguments a sign~$0$ (all explicit numbers are
@@ -1842,7 +1842,7 @@
% \begin{macro}[aux, EXP]
% {\@@_parse_prefix_(:Nw, \@@_parse_lparen_after:NwN}
% The left parenthesis is treated as a unary prefix operator because
-% it appears in exactly the same settings. Commas will be allowed if
+% it appears in exactly the same settings. Commas are allowed if
% the previous precedence is $16$ (function with multiple arguments).
% In this case, find an
% operand using the precedence~$1$; otherwise the precedence~$0$.
@@ -2028,7 +2028,7 @@
% \begin{macro}[int, EXP]{\@@_parse:n}
% \begin{macro}[aux, EXP]{\@@_parse_after:ww}
% Start an \cs{exp:w} expansion so that \cs{@@_parse:n} expands
-% in two steps. The \cs{@@_parse_operand:Nw} function will perform
+% in two steps. The \cs{@@_parse_operand:Nw} function performs
% computations until reaching an operation with precedence
% \cs{c_@@_prec_end_int} or less, namely, the end of the expression. The
% marker \cs{s_@@_mark} indicates that the next token is an already
@@ -2654,7 +2654,7 @@
% is the role of \cs{@@_function_store:wwNwnn} and
% \cs{@@_function_store_end:wnnn}. Then apply \cs{@@_parse:n} to the
% code~|#1| followed by a brace group with this token list. This
-% results in a floating point result, which will correctly be parsed
+% results in a floating point result, which is then correctly parsed
% as the next operand of whatever was looking for one. The trailing
% \cs{s_@@_mark} is used as a special infix operator to indicate that
% the next token has already gone through \cs{@@_parse_infix:NN}.
Modified: trunk/l3kernel/l3fp-random.dtx
===================================================================
--- trunk/l3kernel/l3fp-random.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3fp-random.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -106,7 +106,7 @@
% setting~$n$ to (any multiple of) $2^{29}$ gives only even values.
% Thus it is only safe to call \cs{pdftex_uniformdeviate:D} with
% argument $2^{28}$. This integer is also used in the implementation
-% of \cs{int_rand:nn}. We will also use variants of this number
+% of \cs{int_rand:nn}. We also use variants of this number
% rounded down to multiples of $10^4$ and $10^8$.
% \begin{macrocode}
\cs_new:Npn \@@_rand_uniform:
Modified: trunk/l3kernel/l3fp-round.dtx
===================================================================
--- trunk/l3kernel/l3fp-round.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3fp-round.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -92,8 +92,7 @@
% This looks for |+|, |-|, |0| after |round|. That syntax was
% deprecated in 2013 but the system to tell users about deprecated
% syntax was not really available then, so we did not have anything
-% set up. The date |2016-07-01| is arbitrary, chosen so that
-% \pkg{l3doc} will complain when the syntax should be removed by
+% set up. When \pkg{l3doc} complains, remove the syntax by
% removing everything until the last \cs{fi:} in
% \cs{@@_parse_word_round:N} (and getting rid of the unused
% definitions of \cs{@@_parse_round:Nw} and
@@ -203,7 +202,7 @@
% correctly. The result depends on the rounding mode.
%
% It is very important that \meta{final sign} be the final sign of the
-% result. Otherwise, the result will be incorrect in the case of
+% result. Otherwise, the result would be incorrect in the case of
% rounding towards~$-\infty$ or towards~$+\infty$. Also recall that
% \meta{final sign} is~$0$ for positive, and~$2$ for negative.
%
@@ -410,7 +409,7 @@
% The |trunc|, |ceil| and |floor| functions expect one or two
% arguments (the second is $0$ by default), and the |round| function
% also accepts a third argument (\texttt{nan} by default), which
-% will change |#1| from \cs{@@_round_to_nearest:NNN} to one of its
+% changes |#1| from \cs{@@_round_to_nearest:NNN} to one of its
% analogues.
% \begin{macrocode}
\cs_new:Npn \@@_round_o:Nw #1#2 @
Modified: trunk/l3kernel/l3fp-trig.dtx
===================================================================
--- trunk/l3kernel/l3fp-trig.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3fp-trig.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -158,7 +158,7 @@
% an invalid operation exception with the appropriate function name.
% Otherwise, call the \texttt{trig} function to perform argument
% reduction and if necessary convert the reduced argument to radians.
-% Then, \cs{@@_sin_series_o:NNwwww} will be called to compute the
+% Then, \cs{@@_sin_series_o:NNwwww} is called to compute the
% Taylor series: this function receives a sign~|#3|, an initial octant
% of~$0$, and the function \cs{@@_ep_to_float_o:wwN} which converts the
% result of the series to a floating point directly rather than taking
@@ -187,7 +187,7 @@
% invalid operation exception. The cosine of \nan{} is itself.
% Otherwise, the \texttt{trig} function reduces the argument to at
% most half a right-angle and converts if necessary to radians. We
-% will then call the same series as for sine, but using a positive
+% then call the same series as for sine, but using a positive
% sign~|0| regardless of the sign of~$x$, and with an initial octant
% of~$2$, because $\cos(x) = + \sin(\pi/2 + \lvert x\rvert)$.
% \begin{macrocode}
@@ -382,7 +382,7 @@
% converts it to a fixed point number. Some trailing digits may be
% lost in the conversion, so we keep the original floating point
% number around: when computing sine or tangent (or their inverses),
-% the last step will be to multiply by the floating point number (as
+% the last step is to multiply by the floating point number (as
% an extended-precision number) rather than the fixed point number.
% The period serves to end the integer expression for the octant.
% \begin{macrocode}
@@ -516,7 +516,7 @@
% \begin{variable}[aux, EXP]{\@@_trig_inverse_two_pi:}
% This macro expands to |,,!| or~|,!| followed by $10112$~decimals of
% $10^{-16}/(2\pi)$. The number of decimals we really need is the
-% maximum exponent plus the number of digits we will need later,~$52$,
+% maximum exponent plus the number of digits we later need,~$52$,
% plus~$12$ ($4-1$~groups of $4$~digits). We store the decimals as a
% control sequence name, and convert it to a token list when required:
% strings take up less memory than their token list representation.
@@ -864,7 +864,7 @@
% \item the conversion function~|#1|;
% \item the final sign, which depends on the octant~|#3| and the
% sign~|#2|;
-% \item the octant~|#3|, which will control the series we use;
+% \item the octant~|#3|, which controls the series we use;
% \item the square |#4 * #4| of the argument as a fixed point number,
% computed with \cs{@@_fixed_mul:wwn};
% \item the number itself as an extended-precision number.
@@ -1046,7 +1046,7 @@
% / x)$ is the angular coordinate of the point $(x, y)$.
%
% As for direct trigonometric functions, the first step in computing
-% $\operatorname{atan}(y, x)$ is argument reduction. The sign of~$y$ will give that
+% $\operatorname{atan}(y, x)$ is argument reduction. The sign of~$y$ gives that
% of the result. We distinguish eight regions where the point $(x,
% \lvert y\rvert)$ can lie, of angular size roughly $\pi/8$,
% characterized by their \enquote{octant}, between $0$ and~$7$ included. In
@@ -1080,7 +1080,7 @@
% $\operatorname{atan}\frac{\lvert y\rvert}{x}
% = \pi-\operatorname{atan}\frac{\lvert y\rvert}{-x}$.
% \end{itemize}
-% In the following, we will denote by~$z$ the ratio among
+% In the following, we denote by~$z$ the ratio among
% $\lvert\frac{y}{x}\rvert$, $\lvert\frac{x}{y}\rvert$,
% $\lvert\frac{x+y}{x-y}\rvert$, $\lvert\frac{x-y}{x+y}\rvert$ which
% appears in the right-hand side above.
@@ -1171,8 +1171,8 @@
% \cs{@@_atan_combine_o:NwwwwwN}, with arguments the final sign~|#2|;
% the octant~|#3|; $\operatorname{atan} z/z=1$ as a fixed point number; $z=0$~as a
% fixed point number; and $z=0$~as an extended-precision number.
-% Given the values we provide, $\operatorname{atan} z$ will be computed to be~$0$,
-% and the result will be $[|#3|/2]\cdot\pi/4$ if the sign~|#5| of~$x$
+% Given the values we provide, $\operatorname{atan} z$ is computed to be~$0$,
+% and the result is $[|#3|/2]\cdot\pi/4$ if the sign~|#5| of~$x$
% is positive, and $[(7-|#3|)/2]\cdot\pi/4$ for negative~$x$, where
% the divisions are rounded up.
% \begin{macrocode}
@@ -1215,7 +1215,7 @@
% both as a fixed point number and as an extended-precision floating
% point number with a mantissa in $[0.01,1)$. For now, we place |#1|
% as a first argument, and start an integer expression for the octant.
-% The sign of $x$ does not affect what~$z$ will be, so we simply leave
+% The sign of $x$ does not affect~$z$, so we simply leave
% a contribution to the octant: $\meta{octant} \to 7 - \meta{octant}$
% for negative~$x$. Then we order $\lvert y\rvert$ and $\lvert
% x\rvert$ in a non-decreasing order: if $\lvert y\rvert > \lvert
Modified: trunk/l3kernel/l3fp.dtx
===================================================================
--- trunk/l3kernel/l3fp.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3fp.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -148,8 +148,8 @@
% \cs{fp_new:N} \meta{fp~var}
% \end{syntax}
% Creates a new \meta{fp~var} or raises an error if the name is
-% already taken. The declaration is global. The \meta{fp~var} will
-% initially be~$+0$.
+% already taken. The declaration is global. The \meta{fp~var} is
+% initially~$+0$.
% \end{function}
%
% \begin{function}[updated = 2012-05-08, tested = m3fp001]
@@ -158,7 +158,7 @@
% \cs{fp_const:Nn} \meta{fp~var} \Arg{floating point expression}
% \end{syntax}
% Creates a new constant \meta{fp~var} or raises an error if the name
-% is already taken. The \meta{fp~var} will be set globally equal to
+% is already taken. The \meta{fp~var} is set globally equal to
% the result of evaluating the \meta{floating point expression}.
% \end{function}
%
@@ -319,7 +319,7 @@
% special values $\pm 0$, $\pm\infty$ and~\nan{} are rendered as
% |0|, |-0|, \texttt{inf}, \texttt{-inf}, and~\texttt{nan}
% respectively. Normal category codes apply and thus \texttt{inf} or
-% \texttt{nan}, if produced, will be made up of letters.
+% \texttt{nan}, if produced, are made up of letters.
% \end{function}
%
% \begin{function}[EXP, updated = 2012-07-08]
@@ -428,8 +428,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process,
% and then evaluates the relationship between the two \meta{floating
% point expressions} as described for \cs{fp_compare:nNnTF}. If the
-% test is \texttt{false} then the \meta{code} will be inserted into
-% the input stream again and a loop will occur until the
+% test is \texttt{false} then the \meta{code} is inserted into
+% the input stream again and a loop occurs until the
% \meta{relation} is \texttt{true}.
% \end{function}
%
@@ -441,8 +441,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process,
% and then evaluates the relationship between the two \meta{floating
% point expressions} as described for \cs{fp_compare:nNnTF}. If the
-% test is \texttt{true} then the \meta{code} will be inserted into the
-% input stream again and a loop will occur until the \meta{relation}
+% test is \texttt{true} then the \meta{code} is inserted into the
+% input stream again and a loop occurs until the \meta{relation}
% is \texttt{false}.
% \end{function}
%
@@ -455,7 +455,7 @@
% expressions} as described for \cs{fp_compare:nNnTF}, and then
% places the \meta{code} in the input stream if the \meta{relation} is
% \texttt{false}. After the \meta{code} has been processed by \TeX{}
-% the test will be repeated, and a loop will occur until the test is
+% the test is repeated, and a loop occurs until the test is
% \texttt{true}.
% \end{function}
%
@@ -468,7 +468,7 @@
% expressions} as described for \cs{fp_compare:nNnTF}, and then
% places the \meta{code} in the input stream if the \meta{relation} is
% \texttt{true}. After the \meta{code} has been processed by \TeX{}
-% the test will be repeated, and a loop will occur until the test is
+% the test is repeated, and a loop occurs until the test is
% \texttt{false}.
% \end{function}
%
@@ -480,8 +480,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process,
% and then evaluates the relationship between the two \meta{floating
% point expressions} as described for \cs{fp_compare:nTF}. If the
-% test is \texttt{false} then the \meta{code} will be inserted into
-% the input stream again and a loop will occur until the
+% test is \texttt{false} then the \meta{code} is inserted into
+% the input stream again and a loop occurs until the
% \meta{relation} is \texttt{true}.
% \end{function}
%
@@ -493,8 +493,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process,
% and then evaluates the relationship between the two \meta{floating
% point expressions} as described for \cs{fp_compare:nTF}. If the
-% test is \texttt{true} then the \meta{code} will be inserted into the
-% input stream again and a loop will occur until the \meta{relation}
+% test is \texttt{true} then the \meta{code} is inserted into the
+% input stream again and a loop occurs until the \meta{relation}
% is \texttt{false}.
% \end{function}
%
@@ -507,7 +507,7 @@
% expressions} as described for \cs{fp_compare:nTF}, and then places
% the \meta{code} in the input stream if the \meta{relation} is
% \texttt{false}. After the \meta{code} has been processed by \TeX{}
-% the test will be repeated, and a loop will occur until the test is
+% the test is repeated, and a loop occurs until the test is
% \texttt{true}.
% \end{function}
%
@@ -520,7 +520,7 @@
% expressions} as described for \cs{fp_compare:nTF}, and then places
% the \meta{code} in the input stream if the \meta{relation} is
% \texttt{true}. After the \meta{code} has been processed by \TeX{}
-% the test will be repeated, and a loop will occur until the test is
+% the test is repeated, and a loop occurs until the test is
% \texttt{false}.
% \end{function}
%
@@ -789,7 +789,7 @@
% \item \texttt{inf} represents $+\infty$, and can be preceded by any
% \meta{sign}, yielding $\pm\infty$ as appropriate.
% \item \texttt{nan} represents a (quiet) non-number. It can be
-% preceded by any sign, but that will be ignored.
+% preceded by any sign, but that sign is ignored.
% \item Any unrecognizable string triggers an error, and produces a
% \nan{}.
% \end{itemize}
Modified: trunk/l3kernel/l3int.dtx
===================================================================
--- trunk/l3kernel/l3int.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3int.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -158,8 +158,8 @@
% \cs{int_new:N} \meta{integer}
% \end{syntax}
% Creates a new \meta{integer} or raises an error if the name is
-% already taken. The declaration is global. The \meta{integer} will
-% initially be equal to $0$.
+% already taken. The declaration is global. The \meta{integer} is
+% initially equal to $0$.
% \end{function}
%
% \begin{function}[updated = 2011-10-22]{\int_const:Nn, \int_const:cn}
@@ -167,7 +167,7 @@
% \cs{int_const:Nn} \meta{integer} \Arg{integer expression}
% \end{syntax}
% Creates a new constant \meta{integer} or raises an error if the name
-% is already taken. The value of the \meta{integer} will be set
+% is already taken. The value of the \meta{integer} is set
% globally to the \meta{integer expression}.
% \end{function}
%
@@ -262,7 +262,7 @@
% \cs{int_use:N} \meta{integer}
% \end{syntax}
% Recovers the content of an \meta{integer} and places it directly
-% in the input stream. An error will be raised if the variable does
+% in the input stream. An error is raised if the variable does
% not exist or if it is invalid. Can be omitted in places where an
% \meta{integer} is required (such as in the first and third arguments
% of \cs{int_compare:nNnTF}).
@@ -367,7 +367,7 @@
% }
% { No idea! }
% \end{verbatim}
-% will leave \enquote{\texttt{Medium}} in the input stream.
+% leaves \enquote{\texttt{Medium}} in the input stream.
% \end{function}
%
% \begin{function}[EXP,pTF]{\int_if_even:n, \int_if_odd:n}
@@ -390,8 +390,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the relationship between the two
% \meta{integer expressions} as described for \cs{int_compare:nNnTF}.
-% If the test is \texttt{false} then the \meta{code} will be inserted
-% into the input stream again and a loop will occur until the
+% If the test is \texttt{false} then the \meta{code} is inserted
+% into the input stream again and a loop occurs until the
% \meta{relation} is \texttt{true}.
% \end{function}
%
@@ -402,8 +402,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the relationship between the two
% \meta{integer expressions} as described for \cs{int_compare:nNnTF}.
-% If the test is \texttt{true} then the \meta{code} will be inserted
-% into the input stream again and a loop will occur until the
+% If the test is \texttt{true} then the \meta{code} is inserted
+% into the input stream again and a loop occurs until the
% \meta{relation} is \texttt{false}.
% \end{function}
%
@@ -415,7 +415,7 @@
% as described for \cs{int_compare:nNnTF}, and then places the
% \meta{code} in the input stream if the \meta{relation} is
% \texttt{false}. After the \meta{code} has been processed by \TeX{} the
-% test will be repeated, and a loop will occur until the test is
+% test is repeated, and a loop occurs until the test is
% \texttt{true}.
% \end{function}
%
@@ -427,7 +427,7 @@
% as described for \cs{int_compare:nNnTF}, and then places the
% \meta{code} in the input stream if the \meta{relation} is
% \texttt{true}. After the \meta{code} has been processed by \TeX{} the
-% test will be repeated, and a loop will occur until the test is
+% test is repeated, and a loop occurs until the test is
% \texttt{false}.
% \end{function}
%
@@ -438,8 +438,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the \meta{integer relation}
% as described for \cs{int_compare:nTF}.
-% If the test is \texttt{false} then the \meta{code} will be inserted
-% into the input stream again and a loop will occur until the
+% If the test is \texttt{false} then the \meta{code} is inserted
+% into the input stream again and a loop occurs until the
% \meta{relation} is \texttt{true}.
% \end{function}
%
@@ -450,8 +450,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the \meta{integer relation}
% as described for \cs{int_compare:nTF}.
-% If the test is \texttt{true} then the \meta{code} will be inserted
-% into the input stream again and a loop will occur until the
+% If the test is \texttt{true} then the \meta{code} is inserted
+% into the input stream again and a loop occurs until the
% \meta{relation} is \texttt{false}.
% \end{function}
%
@@ -463,7 +463,7 @@
% as described for \cs{int_compare:nTF}, and then places the
% \meta{code} in the input stream if the \meta{relation} is
% \texttt{false}. After the \meta{code} has been processed by \TeX{} the
-% test will be repeated, and a loop will occur until the test is
+% test is repeated, and a loop occurs until the test is
% \texttt{true}.
% \end{function}
%
@@ -475,7 +475,7 @@
% as described for \cs{int_compare:nTF}, and then places the
% \meta{code} in the input stream if the \meta{relation} is
% \texttt{true}. After the \meta{code} has been processed by \TeX{} the
-% test will be repeated, and a loop will occur until the test is
+% test is repeated, and a loop occurs until the test is
% \texttt{false}.
% \end{function}
%
@@ -587,8 +587,8 @@
% ~~\meta{value to symbol mapping}
% \end{syntax}
% This is the low-level function for conversion of an
-% \meta{integer expression} into a symbolic form (which will often
-% be letters). The \meta{total symbols} available should be given
+% \meta{integer expression} into a symbolic form (often
+% letters). The \meta{total symbols} available should be given
% as an integer expression. Values are actually converted to symbols
% according to the \meta{value to symbol mapping}. This should be given
% as \meta{total symbols} pairs of entries, a number and the
@@ -736,7 +736,7 @@
% numeral} is first converted to a string, with no expansion. The
% \meta{roman numeral} may be in upper or lower case; if the numeral
% contains characters besides |mdclxvi| or |MDCLXVI| then the
-% resulting value will be $-1$. This is the inverse function of
+% resulting value is $-1$. This is the inverse function of
% \cs{int_to_roman:n} and \cs{int_to_Roman:n}.
% \end{function}
%
@@ -1318,7 +1318,7 @@
% \UnitTested
% \begin{macro}{\int_gset:Nn, \int_gset:cn}
% \UnitTested
-% As integers are register-based \TeX{} will issue an error
+% As integers are register-based \TeX{} issues an error
% if they are not defined. Thus there is no need for the checking
% code seen with token list variables.
% \begin{macrocode}
@@ -1419,11 +1419,11 @@
% is at least one relation symbol. We first let \TeX{} evaluate this
% left hand side of the (in)equality using \cs{@@_eval:w}. Since the
% relation symbols |<|, |>|, |=| and |!| are not allowed in integer
-% expressions, they will terminate it. If the argument contains no
+% expressions, they would terminate the expression. If the argument contains no
% relation symbol, \cs{__prg_compare_error:} is expanded,
% inserting~|=| and itself after an error. In all cases,
% \cs{@@_compare:w} receives as its argument an integer, a relation
-% symbol, and some more tokens. We then setup the loop, which will be
+% symbol, and some more tokens. We then setup the loop, which is
% ended by the two odd-looking items |e| and |{=nd_}|, with a trailing
% \cs{q_stop} used to grab the entire argument when necessary.
% \begin{macrocode}
@@ -1751,7 +1751,7 @@
% We put a \cs{__prg_break_point:Nn} so that \texttt{map_break}
% functions from other modules correctly decrement \cs{g__prg_map_int}
% before looking for their own break point. The first argument is
-% \cs{scan_stop:}, so no breaking function will recognize this break
+% \cs{scan_stop:}, so that no breaking function recognizes this break
% point as its own.
% \begin{macrocode}
\cs_new_protected:Npn \int_step_inline:nnnn
@@ -2094,7 +2094,7 @@
% code $12$ (other). Usually, what is actually wanted is letters.
% The approach here is to convert the output of the primitive into
% letters using appropriate control sequence names. That keeps
-% everything expandable. The loop will be terminated by the conversion
+% everything expandable. The loop is terminated by the conversion
% of the |Q|.
% \begin{macrocode}
\cs_new:Npn \int_to_roman:n #1
Modified: trunk/l3kernel/l3keys.dtx
===================================================================
--- trunk/l3kernel/l3keys.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3keys.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -86,7 +86,7 @@
% }
% \end{verbatim}
%
-% At a document level, \cs{keys_set:nn} will be used within a
+% At a document level, \cs{keys_set:nn} is used within a
% document function, for example
% \begin{verbatim}
% \DeclareDocumentCommand \MyModuleSetup { m }
@@ -102,7 +102,7 @@
%
% Key names may contain any tokens, as they are handled internally
% using \cs{tl_to_str:n}; spaces are \emph{ignored} in key names.
-% As will be discussed in
+% As discussed in
% section~\ref{sec:l3keys:subdivision}, it is suggested that the character
% |/| is reserved for sub-division of keys into logical
% groups. Functions and variables are \emph{not} expanded when creating
@@ -114,7 +114,7 @@
% \l_mymodule_tmp_tl .code:n = code
% }
% \end{verbatim}
-% will create a key called |\l_mymodule_tmp_tl|, and not one called
+% creates a key called |\l_mymodule_tmp_tl|, and not one called
% \texttt{key}.
%
% \section{Creating keys}
@@ -154,9 +154,9 @@
%
% Key properties are applied in the reading order and so the ordering
% is significant. Key properties which define \enquote{actions}, such
-% as |.code:n|, |.tl_set:N|, \emph{etc.}, will override one another.
+% as |.code:n|, |.tl_set:N|, \emph{etc.}, override one another.
% Some other properties are mutually exclusive, notably |.value_required:n|
-% and |.value_forbidden:n|, and so will replace one another. However,
+% and |.value_forbidden:n|, and so they replace one another. However,
% properties covering non-exclusive behaviours may be given in any order. Thus
% for example the following definitions are equivalent.
% \begin{verbatim}
@@ -172,7 +172,7 @@
% }
% \end{verbatim}
% Note that with the exception of the special |.undefine:| property, all
-% key properties will define the key within the current \TeX{} scope.
+% key properties define the key within the current \TeX{} scope.
%
% \begin{function}[updated = 2013-07-08]
% {.bool_set:N, .bool_set:c, .bool_gset:N, .bool_gset:c}
@@ -230,7 +230,7 @@
% Defines \meta{key} to set \meta{comma list variable} to \meta{value}.
% Spaces around commas and empty items will be stripped.
% If the variable does not exist, it
-% will be created globally at the point that the key is set up.
+% is created globally at the point that the key is set up.
% \end{function}
%
% \begin{function}[updated = 2013-07-10]{.code:n}
@@ -240,7 +240,7 @@
% Stores the \meta{code} for execution when \meta{key} is used.
% The \meta{code} can include one parameter (|#1|), which will be the
% \meta{value} given for the \meta{key}. The \texttt{x}-type variant
-% will expand \meta{code} at the point where the \meta{key} is
+% expands \meta{code} at the point where the \meta{key} is
% created.
% \end{function}
%
@@ -268,7 +268,7 @@
% The default does not affect keys where values are required or
% forbidden. Thus a required value cannot be supplied by a default
% value, and giving a default value for a key which cannot take a value
-% will not trigger an error.
+% does not trigger an error.
% \end{function}
%
% \begin{function}{.dim_set:N, .dim_set:c, .dim_gset:N, .dim_gset:c}
@@ -277,7 +277,7 @@
% \end{syntax}
% Defines \meta{key} to set \meta{dimension} to \meta{value} (which
% must a dimension expression). If the variable does not exist, it
-% will be created globally at the point that the key is set up.
+% is created globally at the point that the key is set up.
% \end{function}
%
% \begin{function}{.fp_set:N, .fp_set:c, .fp_gset:N, .fp_gset:c}
@@ -286,7 +286,7 @@
% \end{syntax}
% Defines \meta{key} to set \meta{floating point} to \meta{value}
% (which must a floating point expression). If the variable does not exist,
-% it will be created globally at the point that the key is set up.
+% it is created globally at the point that the key is set up.
% \end{function}
%
% \begin{function}[added = 2013-07-14]
@@ -304,7 +304,7 @@
% \meta{key} .inherit:n = \Arg{parents}
% \end{syntax}
% Specifies that the \meta{key} path should inherit the keys listed
-% as \meta{parents}. For example, with setting
+% as \meta{parents}. For example, after setting
% \begin{verbatim}
% \keys_define:n { foo } { test .code:n = \tl_show:n {#1} }
% \keys_define:n { } { bar .inherit:n = foo }
@@ -336,7 +336,7 @@
% \end{syntax}
% Defines \meta{key} to set \meta{integer} to \meta{value} (which
% must be an integer expression). If the variable does not exist, it
-% will be created globally at the point that the key is set up.
+% is created globally at the point that the key is set up.
% \end{function}
%
% \begin{function}[updated = 2013-07-10]{.meta:n}
@@ -389,7 +389,7 @@
% \end{syntax}
% Defines \meta{key} to set \meta{skip} to \meta{value} (which
% must be a skip expression). If the variable does not exist, it
-% will be created globally at the point that the key is set up.
+% is created globally at the point that the key is set up.
% \end{function}
%
% \begin{function}{.tl_set:N, .tl_set:c, .tl_gset:N, .tl_gset:c}
@@ -397,7 +397,7 @@
% \meta{key} .tl_set:N = \meta{token list variable}
% \end{syntax}
% Defines \meta{key} to set \meta{token list variable} to \meta{value}.
-% If the variable does not exist, it will be created globally
+% If the variable does not exist, it is created globally
% at the point that the key is set up.
% \end{function}
%
@@ -408,7 +408,7 @@
% Defines \meta{key} to set \meta{token list variable} to \meta{value},
% which will be subjected to an \texttt{x}-type expansion
% (\emph{i.e.}~using \cs{tl_set:Nx}). If the variable does not exist,
-% it will be created globally at the point that the key is set up.
+% it is created globally at the point that the key is set up.
% \end{function}
%
% \begin{function}[added = 2015-07-14]{.undefine:}
@@ -424,7 +424,7 @@
% \end{syntax}
% Specifies that \meta{key} cannot receive a \meta{value} when used.
% If a \meta{value} is given then an error will be issued. Setting
-% the property \texttt{false} will cancel the restriction.
+% the property \texttt{false} cancels the restriction.
% \end{function}
%
% \begin{function}[added = 2015-07-14]{.value_required:n}
@@ -433,7 +433,7 @@
% \end{syntax}
% Specifies that \meta{key} must receive a \meta{value} when used.
% If a \meta{value} is not given then an error will be issued. Setting
-% the property \texttt{false} will cancel the restriction.
+% the property \texttt{false} cancels the restriction.
% \end{function}
%
% \section{Sub-dividing keys}
@@ -456,7 +456,7 @@
% used to represent keys internally. Both of the above code fragments
% set the same key, which has full name \texttt{module/subgroup/key}.
%
-% As will be illustrated in the next section, this subdivision is
+% As illustrated in the next section, this subdivision is
% particularly relevant to making multiple choices.
%
% \section{Choice and multiple choice keys}
@@ -606,7 +606,7 @@
% \end{syntax}
% Parses the \meta{keyval list}, and sets those keys which are defined
% for \meta{module}. The behaviour on finding an unknown key can be set
-% by defining a special \texttt{unknown} key: this will be illustrated
+% by defining a special \texttt{unknown} key: this is illustrated
% later.
% \end{function}
%
@@ -634,18 +634,18 @@
% has path \texttt{mymodule/subset/key-a}. This information is stored in
% \cs{l_keys_path_tl}, and will have been processed by \cs{tl_to_str:n}.
%
-% The \emph{name} of the key is the part of the path after the last
-% \texttt{/}, and thus is not unique. In the preceding examples, both keys
-% have name \texttt{key-a} despite having different paths. This information
-% is stored in \cs{l_keys_key_tl}, and will have been processed by
-% \cs{tl_to_str:n}.
+% The \emph{name} of the key is the part of the path after the last
+% \texttt{/}, and thus is not unique. In the preceding examples, both keys
+% have name \texttt{key-a} despite having different paths. This information
+% is stored in \cs{l_keys_key_tl}, and will have been processed by
+% \cs{tl_to_str:n}.
% \end{variable}
%
% \section{Handling of unknown keys}
% \label{sec:l3keys:unknown}
%
-% If a key has not previously been defined (is unknown), \cs{keys_set:nn} will
-% look for a special \texttt{unknown} key for the same module, and if this is
+% If a key has not previously been defined (is unknown), \cs{keys_set:nn}
+% looks for a special \texttt{unknown} key for the same module, and if this is
% not defined raises an error indicating that the key name was unknown. This
% mechanism can be used for example to issue custom error texts.
% \begin{verbatim}
@@ -671,7 +671,7 @@
% \cs{keys_set_known:nnN} function parses the \meta{keyval list}, and sets
% those keys which are defined for \meta{module}. Any keys which are unknown
% are not processed further by the parser.
-% The key--value pairs for each \emph{unknown} key name will be
+% The key--value pairs for each \emph{unknown} key name are
% stored in the \meta{tl} in a comma-separated form (\emph{i.e.}~an edited
% version of the \meta{keyval list}). The \cs{keys_set_known:nn} version
% skips this stage.
@@ -695,7 +695,7 @@
% key-four .fp_set:N = \l_my_a_fp ,
% }
% \end{verbatim}
-% the use of \cs{keys_set:nn} will attempt to set all four keys. However, in
+% the use of \cs{keys_set:nn} attempts to set all four keys. However, in
% some contexts it may only be sensible to set some keys, or to control the
% order of setting. To do this, keys may be assigned to \emph{groups}:
% arbitrary sets which are independent of the key tree. Thus modifying the
@@ -712,7 +712,7 @@
% key-four .fp_set:N = \l_my_a_fp ,
% }
% \end{verbatim}
-% will assign \texttt{key-one} and \texttt{key-two} to group \texttt{first},
+% assigns \texttt{key-one} and \texttt{key-two} to group \texttt{first},
% \texttt{key-three} to group \texttt{second}, while \texttt{key-four} is
% not assigned to a group.
%
@@ -730,11 +730,11 @@
% \begin{syntax}
% \cs{keys_set_filter:nnnN} \Arg{module} \Arg{groups} \Arg{keyval list} \meta{tl}
% \end{syntax}
-% Actives key filtering in an \enquote{opt-out} sense: keys assigned to any
-% of the \meta{groups} specified will be ignored. The \meta{groups} are
+% Activates key filtering in an \enquote{opt-out} sense: keys assigned to any
+% of the \meta{groups} specified are ignored. The \meta{groups} are
% given as a comma-separated list. Unknown keys are not assigned to any
-% group and will thus always be set. The key--value pairs for each
-% key which is filtered out will be stored in the \meta{tl} in a
+% group and are thus always set. The key--value pairs for each
+% key which is filtered out are stored in the \meta{tl} in a
% comma-separated form (\emph{i.e.}~an edited version of the \meta{keyval
% list}). The \cs{keys_set_filter:nnn} version skips this stage.
%
@@ -750,10 +750,10 @@
% \begin{syntax}
% \cs{keys_set_groups:nnn} \Arg{module} \Arg{groups} \Arg{keyval list}
% \end{syntax}
-% Actives key filtering in an \enquote{opt-in} sense: only keys assigned to
-% one or more of the \meta{groups} specified will be set. The \meta{groups} are
+% Activates key filtering in an \enquote{opt-in} sense: only keys assigned to
+% one or more of the \meta{groups} specified are set. The \meta{groups} are
% given as a comma-separated list. Unknown keys are not assigned to any
-% group and will thus never be set.
+% group and are thus never set.
% \end{function}
%
% \section{Utility functions for keys}
@@ -829,7 +829,7 @@
% to category \enquote{other} (12) so that the parser does not \enquote{miss}
% any due to category code changes. Spaces are removed from the ends
% of the keys and values. Keys and values which are given in braces
-% will have exactly one set removed (after space trimming), thus
+% have exactly one set removed (after space trimming), thus
% \begin{verbatim}
% key = {value here},
% \end{verbatim}
@@ -848,15 +848,15 @@
% given). \meta{function_1} should take one argument, while
% \meta{function_2} should absorb two arguments. After
% \cs{keyval_parse:NNn} has parsed the \meta{key--value list},
-% \meta{function_1} will be used to process keys given with no value
-% and \meta{function_2} will be used to process keys given with a
+% \meta{function_1} is used to process keys given with no value
+% and \meta{function_2} is used to process keys given with a
% value. The order of the \meta{keys} in the \meta{key--value list}
-% will be preserved. Thus
+% is preserved. Thus
% \begin{verbatim}
% \keyval_parse:NNn \function:n \function:nn
% { key1 = value1 , key2 = value2, key3 = , key4 }
% \end{verbatim}
-% will be converted into an input stream
+% is converted into an input stream
% \begin{verbatim}
% \function:nn { key1 } { value1 }
% \function:nn { key2 } { value2 }
@@ -1363,7 +1363,7 @@
% the function. If not, then a check to make sure there is no need for
% a value with the property. If there should be one then complain,
% otherwise execute it. There is no need to check for a |:| as if it
-% is missing the earlier tests will have failed.
+% was missing the earlier tests would have failed.
% \begin{macrocode}
\cs_new_protected:Npn \@@_define_code:n #1
{
@@ -1757,7 +1757,7 @@
% \begin{macro}
% {.choices:nn, .choices:Vn, .choices:on, .choices:xn}
% For auto-generation of a series of mutually-exclusive choices.
-% Here, |#1| will consist of two separate
+% Here, |#1| consists of two separate
% arguments, hence the slightly odd-looking implementation.
% \begin{macrocode}
\cs_new_protected:cpn { \c_@@_props_root_tl .choices:nn } #1
@@ -2368,7 +2368,7 @@
% \begin{macro}[int, EXP]{\@@_choice_find:n}
% \begin{macro}[int, EXP]{\@@_multichoice_find:n}
% Executing a choice has two parts. First, try the choice given, then
-% if that fails call the unknown key. That will exist, as it is created
+% if that fails call the unknown key. That always exists, as it is created
% when a choice is first made. So there is no need for any escape code.
% For multiple choices, the same code ends up used in a mapping.
% \begin{macrocode}
@@ -2456,7 +2456,7 @@
% (same message, but with a |t| or |f| argument, then build the
% control sequences which contain the code and other information
% about the key, call an intermediate auxiliary which constructs the
-% code that will be displayed to the terminal, and finally conclude
+% code to be displayed to the terminal, and finally conclude
% with \cs{__msg_show_wrap:n}.
% \begin{macrocode}
\cs_new_protected:Npn \keys_show:nn #1#2
Modified: trunk/l3kernel/l3luatex.dtx
===================================================================
--- trunk/l3kernel/l3luatex.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3luatex.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -52,9 +52,9 @@
% The \LuaTeX{} engine provides access to the \Lua{} programming language,
% and with it access to the \enquote{internals} of \TeX{}. In order to use
% this within the framework provided here, a family of functions is
-% available. When used with \pdfTeX{} or \XeTeX{} these will raise an
-% error: use \cs{sys_if_engine_luatex:T} to avoid this. Details of coding
-% the \LuaTeX{} engine are detailed in the \LuaTeX{} manual.
+% available. When used with \pdfTeX{} or \XeTeX{} these raise an
+% error: use \cs{sys_if_engine_luatex:T} to avoid this. Details on using
+% \Lua{} with the \LuaTeX{} engine are given in the \LuaTeX{} manual.
%
% \subsection{\TeX{} code interfaces}
%
@@ -62,12 +62,12 @@
% \begin{syntax}
% \cs{lua_now:n} \Arg{token list}
% \end{syntax}
-% The \meta{token list} is first tokenized by \TeX{}, which will include
+% The \meta{token list} is first tokenized by \TeX{}, which includes
% converting line ends to spaces in the usual \TeX{} manner and which
% respects currently-applicable \TeX{} category codes. The resulting
% \meta{\Lua{} input} is passed to the \Lua{} interpreter for processing.
% Each \cs{lua_now:n} block is treated by \Lua{} as a separate chunk.
-% The \Lua{} interpreter will execute the \meta{\Lua{} input} immediately,
+% The \Lua{} interpreter executes the \meta{\Lua{} input} immediately,
% and in an expandable manner.
%
% In the case of the \cs{lua_now_x:n} version the input is fully expanded
@@ -75,7 +75,7 @@
% fully expandable.
% \begin{texnote}
% \cs{lua_now_x:n} is a macro wrapper around \tn{directlua}: when
-% \LuaTeX{} is in use two expansions will be required to yield the
+% \LuaTeX{} is in use two expansions are required to yield the
% result of the \Lua{} code.
% \end{texnote}
% \end{function}
@@ -84,7 +84,7 @@
% \begin{syntax}
% \cs{lua_shipout:n} \Arg{token list}
% \end{syntax}
-% The \meta{token list} is first tokenized by \TeX{}, which will include
+% The \meta{token list} is first tokenized by \TeX{}, which includes
% converting line ends to spaces in the usual \TeX{} manner and which
% respects currently-applicable \TeX{} category codes. The resulting
% \meta{\Lua{} input} is passed to the \Lua{} interpreter when the
@@ -118,7 +118,7 @@
% fully expandable.
% \begin{texnote}
% \cs{lua_escape_x:n} is a macro wrapper around \tn{luaescapestring}:
-% when \LuaTeX{} is in use two expansions will be required to yield the
+% when \LuaTeX{} is in use two expansions are required to yield the
% result of the \Lua{} code.
% \end{texnote}
% \end{function}
Modified: trunk/l3kernel/l3msg.dtx
===================================================================
--- trunk/l3kernel/l3msg.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3msg.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -72,9 +72,9 @@
% \section{Creating new messages}
%
% All messages have to be created before they can be used.
-% The text of messages will automatically by wrapped to the length
+% The text of messages is automatically wrapped to the length
% available in the console. As a result, formatting is only needed
-% where it will help to show meaning. In particular, |\\| may be
+% where it helps to show meaning. In particular, |\\| may be
% used to force a new line and \verb*|\ | forces an explicit space.
% Additionally, |\{|, |\#|, |\}|, |\%| and |\~| can be used to produce
% the corresponding character.
@@ -87,20 +87,19 @@
% \begin{verbatim}
% \msg_new:nnnn { mymodule } { submodule / message } ...
% \end{verbatim}
-% will allow only those messages from the \texttt{submodule} to be filtered
-% out.
+% will allow to filter out specifically messages from the \texttt{submodule}.
%
% \begin{function}[updated = 2011-08-16]{\msg_new:nnnn, \msg_new:nnn}
% \begin{syntax}
% \cs{msg_new:nnnn} \Arg{module} \Arg{message} \Arg{text} \Arg{more text}
% \end{syntax}
% Creates a \meta{message} for a given \meta{module}.
-% The message will be defined to first give \meta{text} and then
+% The message is defined to first give \meta{text} and then
% \meta{more text} if the user requests it. If no \meta{more text} is
% available then a standard text is given instead. Within \meta{text}
% and \meta{more text} four parameters (|#1| to |#4|) can be used:
% these will be supplied at the time the message is
-% used. An error will be raised if the \meta{message} already exists.
+% used. An error is raised if the \meta{message} already exists.
% \end{function}
%
% \begin{function}{\msg_set:nnnn, \msg_set:nnn, \msg_gset:nnnn, \msg_gset:nnn}
@@ -108,7 +107,7 @@
% \cs{msg_set:nnnn} \Arg{module} \Arg{message} \Arg{text} \Arg{more text}
% \end{syntax}
% Sets up the text for a \meta{message} for a given \meta{module}.
-% The message will be defined to first give \meta{text} and then
+% The message is defined to first give \meta{text} and then
% \meta{more text} if the user requests it. If no \meta{more text} is
% available then a standard text is given instead. Within \meta{text}
% and \meta{more text} four parameters (|#1| to |#4|) can be used:
@@ -232,9 +231,9 @@
% Messages behave differently depending on the message class. In all cases,
% the message may be issued supplying~$0$ to~$4$ arguments. If the number of
% arguments supplied here does not match the number in the definition of the
-% message, extra arguments will be ignored, or empty arguments added (of
-% course the sense of the message may be impaired). The four arguments will
-% be converted to strings before being added to the message text: the
+% message, extra arguments are ignored, or empty arguments added (of
+% course the sense of the message may be impaired). The four arguments are
+% converted to strings before being added to the message text: the
% \texttt{x}-type variants should be used to expand material.
%
% \begin{function}[updated = 2012-08-11]
@@ -254,7 +253,7 @@
% \end{syntax}
% Issues \meta{module} error \meta{message}, passing \meta{arg one} to
% \meta{arg four} to the text-creating functions. After issuing a
-% fatal error the \TeX{} run will halt.
+% fatal error the \TeX{} run halts.
% \end{function}
%
% \begin{function}[updated = 2012-08-11]
@@ -274,7 +273,7 @@
% \end{syntax}
% Issues \meta{module} error \meta{message}, passing \meta{arg one} to
% \meta{arg four} to the text-creating functions. After issuing a
-% critical error, \TeX{} will stop reading the current input file.
+% critical error, \TeX{} stops reading the current input file.
% This may halt the \TeX{} run (if the current file is the main file)
% or may abort reading a sub-file.
% \begin{texnote}
@@ -300,9 +299,9 @@
% \cs{msg_error:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four}
% \end{syntax}
% Issues \meta{module} error \meta{message}, passing \meta{arg one} to
-% \meta{arg four} to the text-creating functions. The error will
-% interrupt processing and issue the text at the terminal. After user
-% input, the run will continue.
+% \meta{arg four} to the text-creating functions. The error
+% interrupts processing and issues the text at the terminal. After user
+% input, the run continues.
% \end{function}
%
% \begin{function}[updated = 2012-08-11]
@@ -322,8 +321,8 @@
% \end{syntax}
% Issues \meta{module} warning \meta{message}, passing \meta{arg one}
% to \meta{arg four} to the text-creating functions. The warning text
-% will be added to the log file and the terminal, but the \TeX{} run
-% will not be interrupted.
+% is added to the log file and the terminal, but the \TeX{} run
+% is not interrupted.
% \end{function}
%
% \begin{function}[updated = 2012-08-11]
@@ -343,7 +342,7 @@
% \end{syntax}
% Issues \meta{module} information \meta{message}, passing
% \meta{arg one} to \meta{arg four} to the text-creating functions.
-% The information text will be added to the log file.
+% The information text is added to the log file.
% \end{function}
%
% \begin{function}[updated = 2012-08-11]
@@ -363,7 +362,7 @@
% \end{syntax}
% Issues \meta{module} information \meta{message}, passing
% \meta{arg one} to \meta{arg four} to the text-creating functions.
-% The information text will be added to the log file: the output
+% The information text is added to the log file: the output
% is briefer than \cs{msg_info:nnnnnn}.
% \end{function}
%
@@ -397,7 +396,7 @@
% \begin{verbatim}
% \msg_error:nn { module } { my-message }
% \end{verbatim}
-% when it is used. With no filtering, this will raise an error. However, we
+% when it is used. With no filtering, this raises an error. However, we
% could alter the behaviour with
% \begin{verbatim}
% \msg_redirect_class:nn { error } { warning }
@@ -417,7 +416,7 @@
%
% Multiple redirections are possible. Redirections can be cancelled by
% providing an empty argument for the target class. Redirection to a
-% missing class will raise errors immediately. Infinite loops are
+% missing class raises an error immediately. Infinite loops are
% prevented by eliminating the redirection starting from the target of
% the redirection that caused the loop to appear. Namely, if
% redirections are requested as $A \to B$, $B \to C$ and $C \to A$ in
@@ -479,16 +478,16 @@
% ! <text>
% !...............................................
% \end{verbatim}
-% where the \meta{text} will be wrapped to fit within the current
+% where the \meta{text} is wrapped to fit within the current
% line length. The user may then request more information, at which
-% stage the \meta{extra text} will be shown in the terminal in the
+% stage the \meta{extra text} is shown in the terminal in the
% format
% \begin{verbatim}
% |'''''''''''''''''''''''''''''''''''''''''''''''
% | <extra text>
% |...............................................
% \end{verbatim}
-% where the \meta{extra text} will be wrapped within the current
+% where the \meta{extra text} is wrapped within the current
% line length. Wrapping of both \meta{text} and \meta{more text} takes place
% using \cs{iow_wrap:nnnN}; the documentation for the latter should be
% consulted for full details.
@@ -504,7 +503,7 @@
% . <text>
% .................................................
% \end{verbatim}
-% where the \meta{text} will be wrapped to fit within the current
+% where the \meta{text} is wrapped to fit within the current
% line length. Wrapping takes place using \cs{iow_wrap:nnnN}; the
% documentation for the latter should be consulted for full details.
% \end{function}
@@ -520,7 +519,7 @@
% * <text>
% *************************************************
% \end{verbatim}
-% where the \meta{text} will be wrapped to fit within the current
+% where the \meta{text} is wrapped to fit within the current
% line length. Wrapping takes place using \cs{iow_wrap:nnnN}; the
% documentation for the latter should be consulted for full details.
% \end{function}
@@ -537,12 +536,12 @@
% \cs{__msg_kernel_new:nnnn} \Arg{module} \Arg{message} \Arg{text} \Arg{more text}
% \end{syntax}
% Creates a kernel \meta{message} for a given \meta{module}.
-% The message will be defined to first give \meta{text} and then
+% The message is defined to first give \meta{text} and then
% \meta{more text} if the user requests it. If no \meta{more text} is
% available then a standard text is given instead. Within \meta{text}
% and \meta{more text} four parameters (|#1| to |#4|) can be used:
% these will be supplied and expanded at the time the message is used.
-% An error will be raised if the \meta{message} already exists.
+% An error is raised if the \meta{message} already exists.
% \end{function}
%
% \begin{function}{\__msg_kernel_set:nnnn, \__msg_kernel_set:nnn}
@@ -550,7 +549,7 @@
% \cs{__msg_kernel_set:nnnn} \Arg{module} \Arg{message} \Arg{text} \Arg{more text}
% \end{syntax}
% Sets up the text for a kernel \meta{message} for a given \meta{module}.
-% The message will be defined to first give \meta{text} and then
+% The message is defined to first give \meta{text} and then
% \meta{more text} if the user requests it. If no \meta{more text} is
% available then a standard text is given instead. Within \meta{text}
% and \meta{more text} four parameters (|#1| to |#4|) can be used:
@@ -574,7 +573,7 @@
% \end{syntax}
% Issues kernel \meta{module} error \meta{message}, passing \meta{arg one}
% to \meta{arg four} to the text-creating functions. After issuing a
-% fatal error the \TeX{} run will halt. Cannot be redirected.
+% fatal error the \TeX{} run halts. Cannot be redirected.
% \end{function}
%
% \begin{function}[updated = 2012-08-11]
@@ -594,9 +593,9 @@
% \end{syntax}
% Issues kernel \meta{module} error \meta{message}, passing \meta{arg one}
% to
-% \meta{arg four} to the text-creating functions. The error will
-% stop processing and issue the text at the terminal. After user input,
-% the run will continue. Cannot be redirected.
+% \meta{arg four} to the text-creating functions. The error
+% stops processing and issues the text at the terminal. After user input,
+% the run continues. Cannot be redirected.
% \end{function}
%
% \begin{function}[updated = 2012-08-11]
@@ -617,8 +616,7 @@
% Issues kernel \meta{module} warning \meta{message}, passing
% \meta{arg one} to
% \meta{arg four} to the text-creating functions. The warning text
-% will be added to the log file, but the \TeX{} run will not be
-% interrupted.
+% is added to the log file, but the \TeX{} run is not interrupted.
% \end{function}
%
% \begin{function}[updated = 2012-08-11]
@@ -638,7 +636,7 @@
% \end{syntax}
% Issues kernel \meta{module} information \meta{message}, passing
% \meta{arg one} to \meta{arg four} to the text-creating functions.
-% The information text will be added to the log file.
+% The information text is added to the log file.
% \end{function}
%
% \section{Expandable errors}
@@ -664,7 +662,7 @@
% \end{syntax}
% Issues an error, passing \meta{arg one} to \meta{arg four}
% to the text-creating functions. The resulting string must
-% be shorter than a line, otherwise it will be cropped.
+% be much shorter than a line, otherwise it is cropped.
% \end{function}
%
% \begin{function}[EXP, added = 2011-08-11, updated = 2011-08-13]
@@ -738,8 +736,8 @@
% Shows or logs the \meta{expression} (turned into a string), an
% equal sign, and the result of applying the \meta{function} to the
% \Arg{expression}. For instance, if the \meta{function} is
-% \cs{int_eval:n} and the \meta{expression} is |1+2| then this will
-% log |> 1+2=3.| The case where the \meta{function} is
+% \cs{int_eval:n} and the \meta{expression} is |1+2| then this
+% logs |> 1+2=3.| The case where the \meta{function} is
% \cs{tl_to_str:n} is special: then the string representation of the
% \meta{expression} is only logged once.
% \end{function}
@@ -1027,9 +1025,9 @@
% trailing closing braces are turned into spaces to hide them as well.
% The group in which we alter the definition of the active |!| is
% closed before producing the message: this ensures that tokens
-% inserted by typing |I| in the command-line will be inserted after
+% inserted by typing |I| in the command-line are inserted after
% the message is entirely cleaned up.
-
+%
% The \cs{__iow_with:Nnn} auxiliary, defined in \pkg{l3file}, expects
% an \meta{integer variable}, an integer \meta{value}, and some
% \meta{code}. It runs the \meta{code} after ensuring that the
@@ -1489,7 +1487,7 @@
% applies then no further redirection is attempted. Otherwise, split
% the message name into \texttt{module/submodule/message} (with an
% arbitrary number of slashes), and store |{/module/submodule}|,
-% |{/module}| and |{}| into \cs{l_@@_hierarchy_seq}. We will then
+% |{/module}| and |{}| into \cs{l_@@_hierarchy_seq}. We then
% map through this sequence, applying the most specific redirection.
% \begin{macrocode}
\cs_new_protected:Npn \@@_use_redirect_name:n #1
@@ -1556,7 +1554,7 @@
% \end{macro}
%
% \begin{macro}{\msg_redirect_name:nnn}
-% Named message will always use the given class even if that class is
+% Named message always use the given class even if that class is
% redirected further. An empty target class cancels any existing
% redirection for that message.
% \begin{macrocode}
Modified: trunk/l3kernel/l3names.dtx
===================================================================
--- trunk/l3kernel/l3names.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3names.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -1112,7 +1112,7 @@
\tex_endgroup:D
% \end{macrocode}
%
-% \LaTeXe{} will have moved a few primitives, so these are sorted out.
+% \LaTeXe{} moves a few primitives, so these are sorted out.
% A convenient test for \LaTeXe{} is the \cs{@@end} saved primitive.
% \begin{macrocode}
%<*package>
@@ -1126,7 +1126,7 @@
\tex_let:D \tex_underline:D \@@underline
% \end{macrocode}
% Some tidying up is needed for \tn[index=tracingfonts]{(pdf)tracingfonts}. Newer \LuaTeX{} has
-% this simply as \tn{tracingfonts}, but that will have been overwritten by
+% this simply as \tn{tracingfonts}, but that is overwritten by
% the \LaTeXe{} kernel. So any spurious definition has to be removed, then
% the real version saved either from the \pdfTeX{} name or from \LuaTeX{}.
% In the latter case, we leave \tn{@@tracingfonts} available: this might
Modified: trunk/l3kernel/l3prg.dtx
===================================================================
--- trunk/l3kernel/l3prg.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3prg.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -85,7 +85,7 @@
% \end{syntax}
% These functions create a family of conditionals using the same
% \Arg{code} to perform the test created. Those conditionals are
-% expandable if \meta{code} is. The \texttt{new} versions will check
+% expandable if \meta{code} is. The \texttt{new} versions check
% for existing definitions and perform assignments globally
% (\emph{cf.}~\cs{cs_new:Npn}) whereas the \texttt{set} versions do no
% check and perform assignments locally (\emph{cf.}~\cs{cs_set:Npn}).
@@ -105,9 +105,9 @@
% \end{syntax}
% These functions create a family of protected conditionals using the
% same \Arg{code} to perform the test created. The \meta{code} does
-% not need to be expandable. The \texttt{new} version will check for
+% not need to be expandable. The \texttt{new} version check for
% existing definitions and perform assignments globally
-% (\emph{cf.}~\cs{cs_new:Npn}) whereas the \texttt{set} version will
+% (\emph{cf.}~\cs{cs_new:Npn}) whereas the \texttt{set} version do
% not (\emph{cf.}~\cs{cs_set:Npn}). The conditionals created are
% depended on the comma-separated list of \meta{conditions}, which
% should be one or more of \texttt{T}, \texttt{F} and \texttt{TF} (not
@@ -174,8 +174,8 @@
% \cs{prg_new_eq_conditional:NNn} \cs[no-index]{\meta{name_1}:\meta{arg spec_1}} \cs[no-index]{\meta{name_2}:\meta{arg spec_2}} \Arg{conditions}
% \end{syntax}
% These functions copy a family of conditionals. The \texttt{new} version
-% will check for existing definitions (\emph{cf.}~\cs{cs_new_eq:NN}) whereas
-% the \texttt{set} version will not (\emph{cf.}~\cs{cs_set_eq:NN}). The
+% checks for existing definitions (\emph{cf.}~\cs{cs_new_eq:NN}) whereas
+% the \texttt{set} version does not (\emph{cf.}~\cs{cs_set_eq:NN}). The
% conditionals copied are depended on the comma-separated list of
% \meta{conditions}, which should be one or more of \texttt{p}, \texttt{T},
% \texttt{F} and \texttt{TF}.
@@ -217,8 +217,8 @@
% both the boolean type and predicate functions.
%
% All conditional |\bool_| functions except assignments are expandable
-% and expect the input to also be fully expandable (which will generally
-% mean being constructed from predicate functions, possibly nested).
+% and expect the input to also be fully expandable (which generally
+% means being constructed from predicate functions and booleans, possibly nested).
%
% \begin{texnote}
% The \texttt{bool} data type is not implemented using the
@@ -234,7 +234,7 @@
% \end{syntax}
% Creates a new \meta{boolean} or raises an error if the
% name is already taken. The declaration is global. The
-% \meta{boolean} will initially be \texttt{false}.
+% \meta{boolean} is initially \texttt{false}.
% \end{function}
%
% \begin{function}
@@ -429,7 +429,7 @@
% \texttt{true} and \texttt{false} if any of them is \texttt{false}.
% Contrarily to the infix operator |&&|, only the \meta{boolean
% expressions} which are needed to determine the result of
-% \cs{bool_lazy_all:nTF} will be evaluated. See also \cs{bool_lazy_and:nnTF}
+% \cs{bool_lazy_all:nTF} are evaluated. See also \cs{bool_lazy_and:nnTF}
% when there are only two \meta{boolean expressions}.
% \end{function}
%
@@ -440,8 +440,8 @@
% \end{syntax}
% Implements the \enquote{And} operation between two boolean
% expressions, hence is \texttt{true} if both are \texttt{true}.
-% Contrarily to the infix operator |&&|, the \meta{boolexpr_2} will
-% only be evaluated if it is needed to determine the result of
+% Contrarily to the infix operator |&&|, the \meta{boolexpr_2} is only
+% evaluated if it is needed to determine the result of
% \cs{bool_lazy_and:nnTF}. See also \cs{bool_lazy_all:nTF} when there are more
% than two \meta{boolean expressions}.
% \end{function}
@@ -456,7 +456,7 @@
% \texttt{true} and \texttt{false} if all of them are \texttt{false}.
% Contrarily to the infix operator \verb"||", only the \meta{boolean
% expressions} which are needed to determine the result of
-% \cs{bool_lazy_any:nTF} will be evaluated. See also \cs{bool_lazy_or:nnTF}
+% \cs{bool_lazy_any:nTF} are evaluated. See also \cs{bool_lazy_or:nnTF}
% when there are only two \meta{boolean expressions}.
% \end{function}
%
@@ -468,7 +468,7 @@
% Implements the \enquote{Or} operation between two boolean
% expressions, hence is \texttt{true} if either one is \texttt{true}.
% Contrarily to the infix operator \verb"||", the \meta{boolexpr_2}
-% will only be evaluated if it is needed to determine the result of
+% is only evaluated if it is needed to determine the result of
% \cs{bool_lazy_or:nnTF}. See also \cs{bool_lazy_any:nTF} when there are more
% than two \meta{boolean expressions}.
% \end{function}
@@ -500,8 +500,8 @@
% \end{syntax}
% Places the \meta{code} in the input stream for \TeX{} to process,
% and then checks the logical value of the \meta{boolean}. If it is
-% \texttt{false} then the \meta{code} will be inserted into the input
-% stream again and the process will loop until the \meta{boolean} is
+% \texttt{false} then the \meta{code} is inserted into the input
+% stream again and the process loops until the \meta{boolean} is
% \texttt{true}.
% \end{function}
%
@@ -511,8 +511,8 @@
% \end{syntax}
% Places the \meta{code} in the input stream for \TeX{} to process,
% and then checks the logical value of the \meta{boolean}. If it is
-% \texttt{true} then the \meta{code} will be inserted into the input
-% stream again and the process will loop until the \meta{boolean} is
+% \texttt{true} then the \meta{code} is inserted into the input
+% stream again and the process loops until the \meta{boolean} is
% \texttt{false}.
% \end{function}
%
@@ -523,7 +523,7 @@
% This function firsts checks the logical value of the \meta{boolean}.
% If it is \texttt{false} the \meta{code} is placed in the input stream
% and expanded. After the completion of the \meta{code} the truth
-% of the \meta{boolean} is re-evaluated. The process will then loop
+% of the \meta{boolean} is re-evaluated. The process then loops
% until the \meta{boolean} is \texttt{true}.
% \end{function}
%
@@ -534,7 +534,7 @@
% This function firsts checks the logical value of the \meta{boolean}.
% If it is \texttt{true} the \meta{code} is placed in the input stream
% and expanded. After the completion of the \meta{code} the truth
-% of the \meta{boolean} is re-evaluated. The process will then loop
+% of the \meta{boolean} is re-evaluated. The process then loops
% until the \meta{boolean} is \texttt{false}.
% \end{function}
%
@@ -545,8 +545,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process,
% and then checks the logical value of the \meta{boolean expression}
% as described for \cs{bool_if:nTF}. If it is \texttt{false} then the
-% \meta{code} will be inserted into the input stream again and the
-% process will loop until the \meta{boolean expression} evaluates to
+% \meta{code} is inserted into the input stream again and the
+% process loops until the \meta{boolean expression} evaluates to
% \texttt{true}.
% \end{function}
%
@@ -557,8 +557,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process,
% and then checks the logical value of the \meta{boolean expression}
% as described for \cs{bool_if:nTF}. If it is \texttt{true} then the
-% \meta{code} will be inserted into the input stream again and the
-% process will loop until the \meta{boolean expression} evaluates to
+% \meta{code} is inserted into the input stream again and the
+% process loops until the \meta{boolean expression} evaluates to
% \texttt{false}.
% \end{function}
%
@@ -570,8 +570,8 @@
% \meta{boolean expression} (as described for \cs{bool_if:nTF}).
% If it is \texttt{false} the \meta{code} is placed in the input stream
% and expanded. After the completion of the \meta{code} the truth
-% of the \meta{boolean expression} is re-evaluated. The process will
-% then loop until the \meta{boolean expression} is \texttt{true}.
+% of the \meta{boolean expression} is re-evaluated. The process
+% then loops until the \meta{boolean expression} is \texttt{true}.
% \end{function}
%
% \begin{function}[rEXP, updated = 2012-07-08]{\bool_while_do:nn}
@@ -582,8 +582,8 @@
% \meta{boolean expression} (as described for \cs{bool_if:nTF}).
% If it is \texttt{true} the \meta{code} is placed in the input stream
% and expanded. After the completion of the \meta{code} the truth
-% of the \meta{boolean expression} is re-evaluated. The process will
-% then loop until the \meta{boolean expression} is \texttt{false}.
+% of the \meta{boolean expression} is re-evaluated. The process
+% then loops until the \meta{boolean expression} is \texttt{false}.
% \end{function}
%
% \section{Producing multiple copies}
@@ -667,7 +667,7 @@
% \tn{halign}. This is necessary to allow grabbing of tokens
% for testing purposes, as \TeX{} uses group level to determine the
% effect of alignment tokens. Without the special grouping, the use of
-% a function such as \cs{peek_after:Nw} will result in a forbidden
+% a function such as \cs{peek_after:Nw} would result in a forbidden
% comparison of the internal \tn{endtemplate} token, yielding a
% fatal error. Each \cs{group_align_safe_begin:} must be matched by a
% \cs{group_align_safe_end:}, although this does not have to occur
@@ -1052,7 +1052,7 @@
% }
% First issue a \cs{group_align_safe_begin:} as we are using |&&|
% as syntax shorthand for the And operation and we need to hide it for
-% \TeX{}. This will be closed at the end of the expression parsing
+% \TeX{}. This is closed at the end of the expression parsing
% (see |S| below).
%
% Minimal (\enquote{short-circuit}) evaluation of boolean expressions
@@ -1061,14 +1061,14 @@
% parenthesis when \meta{false}|&&| is seen. To avoid having separate
% functions for the two cases, we transform the boolean expression by
% doubling each parenthesis and adding parenthesis around each
-% \verb"||". This ensures that |&&| will bind tighter than \verb"||".
+% \verb"||". This ensures that |&&| binds tighter than \verb"||".
%
% The replacement is done in three passes, for left and right
% parentheses and for \verb"||". At each pass, the part of the
% expression that has been transformed is stored before \cs{q_nil},
% the rest lies until the first \cs{q_mark}, followed by an empty
% brace group. A trailing marker ensures that the auxiliaries'
-% delimited arguments will not run-away. As long as the delimiter
+% delimited arguments do not run-away. As long as the delimiter
% matches inside the expression, material is moved before \cs{q_nil}
% and we continue. Afterwards, the trailing marker is taken as a
% delimiter, |#4| is the next auxiliary, immediately followed by a new
@@ -1098,7 +1098,7 @@
%
% \begin{macro}[EXP, aux]{\@@_if_parse:NNNww}
% After removing extra tokens from the transformation phase, start
-% evaluating. At the end, we will need to finish the special
+% evaluating. At the end, we need to finish the special
% \texttt{align_safe} group before finally
% returning a \cs{c_true_bool} or \cs{c_false_bool} as there might
% otherwise be something left in front in the input stream. For this
@@ -1540,7 +1540,7 @@
% requires two steps of expansion.
%
% This function has one flaw though: Since it constantly passes down
-% ten copies of its previous argument it will severely affect the main
+% ten copies of its previous argument it severely affects the main
% memory once you start demanding hundreds of thousands of copies. Now
% I don't think this is a real limitation for any ordinary use, and if
% necessary, it is possible to write \cs{prg_replicate:nn} |{1000}|
@@ -1665,9 +1665,9 @@
% whenever \tn{halign} or \tn{valign} work, [\ldots]} One problem relates
% to commands that internally issues a \tn{cr} but also peek ahead for
% the next character for use in, say, an optional argument. If the
-% next token happens to be a |&| with category code~4 we will get some
+% next token happens to be a |&| with category code~4 we get some
% sort of weird error message because the underlying
-% \tn{futurelet} will store the token at the end of the alignment
+% \tn{futurelet} stores the token at the end of the alignment
% template. This could be a |&|$_4$ giving a message like
% |! Misplaced \cr.| or even worse: it could be the \tn{endtemplate}
% token causing even more trouble! To solve this we have to open a
Modified: trunk/l3kernel/l3prop.dtx
===================================================================
--- trunk/l3kernel/l3prop.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3prop.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -56,7 +56,7 @@
%
% Each entry in a property list must have a unique \meta{key}: if an entry is
% added to a property list which already contains the \meta{key} then the new
-% entry will overwrite the existing one. The \meta{keys} are compared on a
+% entry overwrites the existing one. The \meta{keys} are compared on a
% string basis, using the same method as \cs{str_if_eq:nn}.
%
% Property lists are intended for storing key-based information for use within
@@ -70,8 +70,8 @@
% \cs{prop_new:N} \meta{property list}
% \end{syntax}
% Creates a new \meta{property list} or raises an error if the name is
-% already taken. The declaration is global. The \meta{property list} will
-% initially contain no entries.
+% already taken. The declaration is global. The \meta{property list}
+% initially contains no entries.
% \end{function}
%
% \begin{function}
@@ -162,8 +162,8 @@
% Recovers the \meta{value} stored with \meta{key} from the
% \meta{property list}, and places this in the \meta{token list
% variable}. If the \meta{key} is not found in the
-% \meta{property list} then the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}. The \meta{token list
+% \meta{property list} then the \meta{token list variable} is set
+% to the special marker \cs{q_no_value}. The \meta{token list
% variable} is set within the current \TeX{} group. See also
% \cs{prop_get:NnNTF}.
% \end{function}
@@ -176,8 +176,8 @@
% Recovers the \meta{value} stored with \meta{key} from the
% \meta{property list}, and places this in the \meta{token list
% variable}. If the \meta{key} is not found in the
-% \meta{property list} then the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}. The \meta{key} and
+% \meta{property list} then the \meta{token list variable} is set
+% to the special marker \cs{q_no_value}. The \meta{key} and
% \meta{value} are then deleted from the property list. Both
% assignments are local. See also \cs{prop_pop:NnNTF}.
% \end{function}
@@ -190,8 +190,8 @@
% Recovers the \meta{value} stored with \meta{key} from the
% \meta{property list}, and places this in the \meta{token list
% variable}. If the \meta{key} is not found in the
-% \meta{property list} then the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}. The \meta{key} and
+% \meta{property list} then the \meta{token list variable} is set
+% to the special marker \cs{q_no_value}. The \meta{key} and
% \meta{value} are then deleted from the property list.
% The \meta{property list} is modified globally, while the assignment of
% the \meta{token list variable} is local. See also \cs{prop_gpop:NnNTF}.
@@ -209,7 +209,7 @@
% \cs{prop_get:NnN}.
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{value}
-% will not expand further when appearing in an \texttt{x}-type
+% does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -335,7 +335,7 @@
% \cs{prop_map_function:NN} \meta{property list} \meta{function}
% \end{syntax}
% Applies \meta{function} to every \meta{entry} stored in the
-% \meta{property list}. The \meta{function} will receive two argument for
+% \meta{property list}. The \meta{function} receives two argument for
% each iteration: the \meta{key} and associated \meta{value}.
% The order in which \meta{entries} are returned is not defined and
% should not be relied upon.
@@ -348,7 +348,7 @@
% \end{syntax}
% Applies \meta{inline function} to every \meta{entry} stored
% within the \meta{property list}. The \meta{inline function} should
-% consist of code which will receive the \meta{key} as |#1| and the
+% consist of code which receives the \meta{key} as |#1| and the
% \meta{value} as |#2|.
% The order in which \meta{entries} are returned is not defined and
% should not be relied upon.
@@ -359,8 +359,8 @@
% \cs{prop_map_break:}
% \end{syntax}
% Used to terminate a \cs[no-index]{prop_map_\ldots} function before all
-% entries in the \meta{property list} have been processed. This will
-% normally take place within a conditional statement, for example
+% entries in the \meta{property list} have been processed. This
+% normally takes place within a conditional statement, for example
% \begin{verbatim}
% \prop_map_inline:Nn \l_my_prop
% {
@@ -371,7 +371,7 @@
% }
% }
% \end{verbatim}
-% Use outside of a \cs[no-index]{prop_map_\ldots} scenario will lead to low
+% Use outside of a \cs[no-index]{prop_map_\ldots} scenario leads to low
% level \TeX{} errors.
% \end{function}
%
@@ -381,8 +381,8 @@
% \end{syntax}
% Used to terminate a \cs[no-index]{prop_map_\ldots} function before all
% entries in the \meta{property list} have been processed, inserting
-% the \meta{tokens} after the mapping has ended. This will
-% normally take place within a conditional statement, for example
+% the \meta{tokens} after the mapping has ended. This
+% normally takes place within a conditional statement, for example
% \begin{verbatim}
% \prop_map_inline:Nn \l_my_prop
% {
@@ -393,7 +393,7 @@
% }
% }
% \end{verbatim}
-% Use outside of a \cs[no-index]{prop_map_\ldots} scenario will lead to low
+% Use outside of a \cs[no-index]{prop_map_\ldots} scenario leads to low
% level \TeX{} errors.
% \end{function}
%
@@ -448,7 +448,7 @@
% \end{syntax}
% The internal token used to begin each key--value pair in the
% property list. If expanded outside of a mapping or manipulation
-% function, an error will be raised. The definition should always be
+% function, an error is raised. The definition should always be
% set globally.
% \end{variable}
%
Modified: trunk/l3kernel/l3quark.dtx
===================================================================
--- trunk/l3kernel/l3quark.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3quark.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -102,8 +102,8 @@
% \cs{quark_new:N} \meta{quark}
% \end{syntax}
% Creates a new \meta{quark} which expands only to \meta{quark}.
-% The \meta{quark} will be defined globally, and an error message
-% will be raised if the name was already taken.
+% The \meta{quark} is defined globally, and an error message
+% is raised if the name was already taken.
% \end{function}
%
% \begin{variable}{\q_stop}
@@ -262,7 +262,7 @@
%
%
% Here's the definition of |\my_map_dbl:nn|.
-% First of all, define the function that will do the processing based on the
+% First of all, define the function that does the processing based on the
% inline function argument |#2|.
% Then initiate the recursion using an internal function.
% The token list |#1| is terminated using \cs{q_recursion_tail}, with
@@ -294,7 +294,7 @@
% }
%\end{verbatim}
% Note that contrarily to \LaTeX3 built-in mapping functions, this
-% mapping function cannot be nested, since the second map will overwrite
+% mapping function cannot be nested, since the second map would overwrite
% the definition of |\__my_map_dbl_fn:nn|.
%
%
@@ -317,7 +317,7 @@
% \section{Scan marks}
%
% Scan marks are control sequences set equal to \cs{scan_stop:},
-% hence will never expand in an expansion context and will be (largely)
+% hence never expand in an expansion context and are (largely)
% invisible if they are encountered in a typesetting context.
%
% Like quarks, they can be used as delimiters in weird functions
@@ -336,8 +336,8 @@
% \cs{__scan_new:N} \meta{scan mark}
% \end{syntax}
% Creates a new \meta{scan mark} which is set equal to \cs{scan_stop:}.
-% The \meta{scan mark} will be defined globally, and an error message
-% will be raised if the name was already taken by another scan mark.
+% The \meta{scan mark} is defined globally, and an error message
+% is raised if the name was already taken by another scan mark.
% \end{function}
%
% \begin{variable}{\s__stop}
Modified: trunk/l3kernel/l3regex.dtx
===================================================================
--- trunk/l3kernel/l3regex.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3regex.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -114,7 +114,7 @@
% \item spaces should always be escaped (even in character
% classes);
% \item any other character may be escaped or not, without any
-% effect: both versions will match exactly that character.
+% effect: both versions match exactly that character.
% \end{itemize}
% Note that these rules play nicely with the fact that many
% non-alphanumeric characters are difficult to input into \TeX{}
@@ -161,7 +161,7 @@
% \item[\\V] Any token not matched by |\v|.
% \item[\\W] Any token not matched by |\w|.
% \end{l3regex-syntax}
-% Of those, |.|, |\D|, |\H|, |\N|, |\S|, |\V|, and |\W| will match arbitrary
+% Of those, |.|, |\D|, |\H|, |\N|, |\S|, |\V|, and |\W| match arbitrary
% control sequences.
%
% Character classes match exactly one token in the subject.
@@ -225,7 +225,7 @@
% \item[(?:\ldots{})] Non-capturing group.
% \item[(?\char`|\ldots{})] Non-capturing group which resets
% the group number for capturing groups in each alternative.
-% The following group will be numbered with the first unused
+% The following group is numbered with the first unused
% group number.
% \end{l3regex-syntax}
%
@@ -415,7 +415,7 @@
% \end{syntax}
% Creates a new \meta{regex~var} or raises an error if the
% name is already taken. The declaration is global. The
-% \meta{regex~var} will initially be such that it never matches.
+% \meta{regex~var} is initially such that it never matches.
% \end{function}
%
% \begin{function}[added = 2017-05-26]
@@ -432,7 +432,7 @@
% \end{verbatim}
% The assignment is local for \cs{regex_set:Nn} and global for
% \cs{regex_gset:Nn}. Use \cs{regex_const:Nn} for compiled expressions
-% which will never change.
+% which never change.
% \end{function}
%
% \begin{function}[added = 2017-05-26]{\regex_show:n, \regex_show:N}
@@ -517,9 +517,9 @@
% { true } { false }
% \end{verbatim}
% Then the regular expression (anchored at the start with |\A| and
-% at the end with |\Z|) will match the whole token list. The first
+% at the end with |\Z|) must match the whole token list. The first
% capturing group, |(La)?|, matches |La|, and the second capturing
-% group, |(!*)|, matches |!!!|. Thus, |\l_foo_seq| will contain
+% group, |(!*)|, matches |!!!|. Thus, |\l_foo_seq| contains as a result
% the items |{LaTeX!!!}|, |{La}|, and |{!!!}|, and the \texttt{true}
% branch is left in the input stream.
% \end{function}
@@ -543,7 +543,7 @@
% \regex_extract_all:nnNTF { \w+ } { Hello,~world! } \l_foo_seq
% { true } { false }
% \end{verbatim}
-% Then the regular expression will match twice, and the resulting
+% Then the regular expression matches twice, the resulting
% sequence contains the two items |{Hello}| and |{world}|,
% and the \texttt{true} branch is left in the input stream.
% \end{function}
@@ -1028,7 +1028,7 @@
% \begin{macro}[int]{\@@_item_reverse:n}
% This function makes showing regular expressions easier, and lets us
% define |\D| in terms of |\d| for instance. There is a subtlety: the
-% end of the query is marked by $-2$, and will thus match |\D| and
+% end of the query is marked by $-2$, and thus matches |\D| and
% other negated properties; this case is caught by another part of
% the code.
% \begin{macrocode}
@@ -2613,7 +2613,7 @@
% \end{macro}
%
% \begin{macro}[aux]{\@@_compile_class_normal:w}
-% In the \enquote{normal} case, we will insert \cs{@@_class:NnnnN}
+% In the \enquote{normal} case, we insert \cs{@@_class:NnnnN}
% \meta{boolean} in the compiled code. The \meta{boolean} is true for
% positive classes, and false for negative classes, characterized by a
% leading |^|. The auxiliary \cs{@@_compile_class:TFNN} also
@@ -2860,8 +2860,7 @@
% \begin{macro}[aux]{\@@_compile_special_group_::w}
% \begin{macro}[aux]+\@@_compile_special_group_|:w+
% Non-capturing, and resetting groups are easy to take care of during
-% compilation; for those groups, the harder parts will come when
-% building.
+% compilation; for those groups, the harder parts come when building.
% \begin{macrocode}
\cs_new_protected:cpn { @@_compile_special_group_::w }
{ \@@_compile_group_begin:N \@@_group_no_capture:nnnN }
@@ -3121,8 +3120,8 @@
% catcode test. Otherwise, it must be followed by a left brace. We
% then collect the characters for the argument of |\u| within an
% \texttt{x}-expanding assignment. In principle we could just wait to
-% encounter a right brace, but this is unsafe: if the right brace is
-% missing, then we will reach the end-markers of the regex, and
+% encounter a right brace, but this is unsafe: if the right brace was
+% missing, then we would reach the end-markers of the regex, and
% continue, leading to obscure fatal errors. Instead, we only allow
% raw and special characters, and stop when encountering a special
% right brace, any escaped character, or the end-marker.
@@ -3508,8 +3507,8 @@
% \end{variable}
%
% \begin{variable}{\l_@@_capturing_group_int}
-% \cs{l_@@_capturing_group_int} is the \textsc{id} number that will
-% be assigned to a capturing group if one was opened now. This starts
+% \cs{l_@@_capturing_group_int} is the next \textsc{id} number to
+% be assigned to a capturing group. This starts
% at $0$ for the group enclosing the full regular expression, and
% groups are counted in the order of their left parenthesis, except
% when encountering \texttt{resetting} groups.
@@ -3548,8 +3547,8 @@
% We strive to preserve the following properties while building.
% \begin{itemize}
% \item The current capturing group is
-% $\text{\texttt{capturing_group}}-1$, and if a group is opened now,
-% it will be labelled \texttt{capturing_group}.
+% $\text{\texttt{capturing_group}}-1$, and if a group opened now
+% it would be labelled \texttt{capturing_group}.
% \item The last allocated state is $\text{\texttt{max_state}}-1$, so
% \texttt{max_state} is a free state.
% \item The \texttt{left_state} points to a state to the left of the
@@ -3564,7 +3563,7 @@
% The \texttt{n}-type function first compiles its argument. Reset some
% variables. Allocate two states, and put a wildcard in state $0$
% (transitions to state $1$ and $0$ state). Then build the regex
-% within a (capturing) group, which will be numbered $0$ (current
+% within a (capturing) group numbered $0$ (current
% value of \texttt{capturing_group}). Finally, if the match reaches the
% last state, it is successful.
% \begin{macrocode}
@@ -3821,7 +3820,7 @@
% building the group, so that the thread which skips the group does
% not also set the start-point of the submatch. After adding one more
% state, the \texttt{left_state} is the left end of the group, from
-% which all branches will stem, and the \texttt{right_state} is the
+% which all branches stem, and the \texttt{right_state} is the
% right end of the group, and all branches end their course in that
% state. We store those two integers to be queried for each branch, we
% build the \textsc{nfa} states for the contents |#2| of the group,
@@ -3974,7 +3973,7 @@
% \begin{macro}[aux]{\@@_group_repeat_aux:n}
% Here we repeat \tn{toks} ranging from \texttt{left_state} to
% \texttt{max_state}, $|#1|>0$ times. First add a transition so that
-% the copies will \enquote{chain} properly. Compute the shift
+% the copies \enquote{chain} properly. Compute the shift
% \texttt{c} between the original copy and the last copy we
% want. Shift the \texttt{right_state} and \texttt{max_state} to their
% final values. We then want to perform \texttt{c} copy operations. At
@@ -4189,15 +4188,15 @@
% transitions, the instruction at the new state of the \textsc{nfa} is
% performed immediately. When a transition consumes a character, the
% new state is appended to a list of \enquote{active states}, stored in
-% \cs{g_@@_thread_state_intarray}: this thread will be active again when the next
+% \cs{g_@@_thread_state_intarray}: this thread is made active again when the next
% token is read from the query. At every step (for each token in the
% query), we unpack that list of active states and the corresponding
% submatch props, and empty those.
%
% If two paths through the \textsc{nfa} \enquote{collide} in the sense
% that they reach the same state after reading a given token, then they
-% only differ in how they previously matched, and the future execution
-% will be identical for both. (Note that this would be wrong in the
+% only differ in how they previously matched, and any future execution
+% would be identical for both. (Note that this would be wrong in the
% presence of back-references.) Hence, we only need to keep one of the
% two threads: the thread with the highest priority. Our \textsc{nfa} is
% built in such a way that higher priority actions always come before
@@ -4217,7 +4216,7 @@
% We solve this by distinguishing \enquote{normal} free transitions
% \cs{@@_action_free:n} from transitions
% \cs{@@_action_free_group:n} which go back to the start of the
-% group. The former will keep threads unless they have been visited by a
+% group. The former keeps threads unless they have been visited by a
% \enquote{completed} thread, while the latter kind of transition also
% prevents going back to a state visited by the current thread.
%
@@ -4291,7 +4290,7 @@
% retrieved when matching at the next position. When a thread
% succeeds, this property list is copied to
% \cs{l_@@_success_submatches_prop}: only the last successful thread
-% will remain there.
+% remains there.
% \begin{macrocode}
\prop_new:N \l_@@_current_submatches_prop
\prop_new:N \l_@@_success_submatches_prop
@@ -4334,7 +4333,7 @@
% \begin{variable}{\g_@@_state_active_intarray, \g_@@_thread_state_intarray}
% \cs{g_@@_state_active_intarray} stores the last \meta{step} in which
% each \meta{state} was active. \cs{g_@@_thread_state_intarray} stores
-% threads that will be considered in the next step, more precisely the
+% threads to be considered in the next step, more precisely the
% states in which these threads are.
% \begin{macrocode}
\__intarray_new:Nn \g_@@_state_active_intarray { 65536 }
@@ -4449,8 +4448,8 @@
% successful, and has no submatches yet; clear the array of active
% threads, and put the starting state $0$ in it. We are then almost
% ready to read our first token in the query, but we actually start
-% one position earlier than the start, and \texttt{get} that token, so
-% that the \texttt{last_char} will be set properly for word
+% one position earlier than the start, and \texttt{get} that token, to
+% set \texttt{last_char} properly for word
% boundaries. Then call \cs{@@_match_loop:}, which runs through the
% query until the end or until a successful match breaks early.
% \begin{macrocode}
@@ -4666,7 +4665,7 @@
% has not been encountered yet: the \texttt{group} version is
% stricter, and will not use a state if it was used earlier in the
% current thread, hence forcefully breaking the loop, while the
-% \enquote{normal} version will revisit a state when within the thread
+% \enquote{normal} version will revisit a state even within the thread
% itself.
% \begin{macrocode}
\cs_new_protected:Npn \@@_action_free:n
@@ -4844,7 +4843,7 @@
% replacement text. Hence concatenating the result of this function
% with all possible arguments (one call for each match), as well as
% the range from the end of the last match to the end of the string,
-% will produce the fully replaced token list. The initialization does
+% produces the fully replaced token list. The initialization does
% not matter, but (as an example) we set it as for an empty replacement.
% \begin{macrocode}
\cs_new:Npn \@@_replacement_do_one_match:n #1
@@ -4879,7 +4878,7 @@
% exclusive. The function \cs{@@_query_range:nn} \Arg{min}
% \Arg{max} unpacks registers from the position \meta{min} to the
% position $\meta{max}-1$ included. Once this is expanded, a second
-% \texttt{x}-expansion will result in the actual tokens from the
+% \texttt{x}-expansion results in the actual tokens from the
% query. That second expansion is only done by user functions at the
% very end of their operation, after checking (and correcting) the
% brace balance first.
@@ -4956,7 +4955,7 @@
% The replacement text is built incrementally by abusing \tn{toks}
% within a group (see \pkg{l3tl-build}). We keep track in
% \cs{l_@@_balance_int} of the balance of explicit begin- and
-% end-group tokens and \cs{l_@@_balance_tl} will consist of some
+% end-group tokens and we store in \cs{l_@@_balance_tl} some
% code to compute the brace balance from submatches (see its
% description). Detect unescaped right braces, and escaped characters,
% with trailing \cs{prg_do_nothing:} because some of the later
@@ -5076,7 +5075,7 @@
% submatch number is larger than the number of capturing groups.
% Unless the submatch appears inside a |\c{...}| or |\u{...}|
% construction, it must be taken into account in the brace balance.
-% Here, |##1| will receive a pointer to the $0$-th submatch for a
+% Later on, |##1| will be replaced by a pointer to the $0$-th submatch for a
% given match. We cannot use \cs{int_eval:n} because it is
% expandable, and would be expanded too early (short of adding
% \cs{exp_not:N}, making the code messy again).
@@ -5163,7 +5162,7 @@
% \end{macro}
%
% \begin{macro}[aux]{\@@_replacement_cu_aux:Nw}
-% Start a control sequence with \cs{cs:w}, which will be protected
+% Start a control sequence with \cs{cs:w}, protected
% from expansion by |#1| (either \cs{@@_replacement_exp_not:N} or
% \cs{exp_not:V}), or turned to a string by \cs{tl_to_str:V} if inside
% another csname construction |\c| or |\u|. We use \cs{tl_to_str:V}
@@ -5248,7 +5247,7 @@
% \end{macrocode}
% \end{macro}
%
-% We will need to change the category code of the null character many
+% We now need to change the category code of the null character many
% times, hence work in a group. The catcode-specific macros below are
% defined in alphabetical order; if you are trying to understand the
% code, start from the end of the alphabet as those categories are
Modified: trunk/l3kernel/l3seq.dtx
===================================================================
--- trunk/l3kernel/l3seq.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3seq.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -62,8 +62,8 @@
% \cs{seq_new:N} \meta{sequence}
% \end{syntax}
% Creates a new \meta{sequence} or raises an error if the name is
-% already taken. The declaration is global. The \meta{sequence} will
-% initially contain no items.
+% already taken. The declaration is global. The \meta{sequence}
+% initially contains no items.
% \end{function}
%
% \begin{function}{\seq_clear:N, \seq_clear:c, \seq_gclear:N, \seq_gclear:c}
@@ -141,7 +141,7 @@
% \end{syntax}
% Concatenates the content of \meta{sequence_2} and \meta{sequence_3}
% together and saves the result in \meta{sequence_1}. The items in
-% \meta{sequence_2} will be placed at the left side of the new sequence.
+% \meta{sequence_2} are placed at the left side of the new sequence.
% \end{function}
%
% \begin{function}[EXP, pTF, added=2012-03-03]
@@ -204,8 +204,8 @@
% Stores the left-most item from a \meta{sequence} in the
% \meta{token list variable} without removing it from the
% \meta{sequence}. The \meta{token list variable} is assigned locally.
-% If \meta{sequence} is empty the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}.
+% If \meta{sequence} is empty the \meta{token list variable}
+% is set to the special marker \cs{q_no_value}.
% \end{function}
%
% \begin{function}[updated = 2012-05-19]{\seq_get_right:NN, \seq_get_right:cN}
@@ -215,8 +215,8 @@
% Stores the right-most item from a \meta{sequence} in the
% \meta{token list variable} without removing it from the
% \meta{sequence}. The \meta{token list variable} is assigned locally.
-% If \meta{sequence} is empty the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}.
+% If \meta{sequence} is empty the \meta{token list variable}
+% is set to the special marker \cs{q_no_value}.
% \end{function}
%
% \begin{function}[updated = 2012-05-14]{\seq_pop_left:NN, \seq_pop_left:cN}
@@ -227,8 +227,8 @@
% \meta{token list variable}, \emph{i.e.}~removes the item from the
% sequence and stores it in the \meta{token list variable}.
% Both of the variables are assigned locally. If \meta{sequence} is
-% empty the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}.
+% empty the \meta{token list variable} is set to
+% the special marker \cs{q_no_value}.
% \end{function}
%
% \begin{function}[updated = 2012-05-14]{\seq_gpop_left:NN, \seq_gpop_left:cN}
@@ -240,8 +240,8 @@
% sequence and stores it in the \meta{token list variable}.
% The \meta{sequence} is modified globally, while the assignment of
% the \meta{token list variable} is local.
-% If \meta{sequence} is empty the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}.
+% If \meta{sequence} is empty the \meta{token list variable} is set to
+% the special marker \cs{q_no_value}.
% \end{function}
%
% \begin{function}[updated = 2012-05-19]{\seq_pop_right:NN, \seq_pop_right:cN}
@@ -252,8 +252,8 @@
% \meta{token list variable}, \emph{i.e.}~removes the item from the
% sequence and stores it in the \meta{token list variable}.
% Both of the variables are assigned locally. If \meta{sequence} is
-% empty the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}.
+% empty the \meta{token list variable} is set to
+% the special marker \cs{q_no_value}.
% \end{function}
%
% \begin{function}[updated = 2012-05-19]{\seq_gpop_right:NN, \seq_gpop_right:cN}
@@ -265,8 +265,8 @@
% sequence and stores it in the \meta{token list variable}.
% The \meta{sequence} is modified globally, while the assignment of
% the \meta{token list variable} is local.
-% If \meta{sequence} is empty the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}.
+% If \meta{sequence} is empty the \meta{token list variable} is set to
+% the special marker \cs{q_no_value}.
% \end{function}
%
% \begin{function}[added = 2014-07-17, EXP]{\seq_item:Nn, \seq_item:cn}
@@ -274,17 +274,17 @@
% \cs{seq_item:Nn} \meta{sequence} \Arg{integer expression}
% \end{syntax}
% Indexing items in the \meta{sequence} from~$1$ at the top (left), this
-% function will evaluate the \meta{integer expression} and leave the
+% function evaluates the \meta{integer expression} and leaves the
% appropriate item from the sequence in the input stream. If the
% \meta{integer expression} is negative, indexing occurs from the
-% bottom (right) of the sequence. When the \meta{integer expression}
+% bottom (right) of the sequence. If the \meta{integer expression}
% is larger than the number of items in the \meta{sequence} (as
-% calculated by \cs{seq_count:N}) then the function will expand to
+% calculated by \cs{seq_count:N}) then the function expands to
% nothing.
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
-% will not expand further when appearing in an \texttt{x}-type
+% does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -515,8 +515,8 @@
% \cs{seq_map_break:}
% \end{syntax}
% Used to terminate a \cs[no-index]{seq_map_\ldots} function before all
-% entries in the \meta{sequence} have been processed. This will
-% normally take place within a conditional statement, for example
+% entries in the \meta{sequence} have been processed. This
+% normally takes place within a conditional statement, for example
% \begin{verbatim}
% \seq_map_inline:Nn \l_my_seq
% {
@@ -527,12 +527,12 @@
% }
% }
% \end{verbatim}
-% Use outside of a \cs[no-index]{seq_map_\ldots} scenario will lead to low
+% Use outside of a \cs[no-index]{seq_map_\ldots} scenario leads to low
% level \TeX{} errors.
% \begin{texnote}
% When the mapping is broken, additional tokens may be inserted by the
% internal macro \cs{__prg_break_point:Nn} before further items are taken
-% from the input stream. This will depend on the design of the mapping
+% from the input stream. This depends on the design of the mapping
% function.
% \end{texnote}
% \end{function}
@@ -543,8 +543,8 @@
% \end{syntax}
% Used to terminate a \cs[no-index]{seq_map_\ldots} function before all
% entries in the \meta{sequence} have been processed, inserting
-% the \meta{tokens} after the mapping has ended. This will
-% normally take place within a conditional statement, for example
+% the \meta{tokens} after the mapping has ended. This
+% normally takes place within a conditional statement, for example
% \begin{verbatim}
% \seq_map_inline:Nn \l_my_seq
% {
@@ -555,13 +555,13 @@
% }
% }
% \end{verbatim}
-% Use outside of a \cs[no-index]{seq_map_\ldots} scenario will lead to low
+% Use outside of a \cs[no-index]{seq_map_\ldots} scenario leads to low
% level \TeX{} errors.
% \begin{texnote}
% When the mapping is broken, additional tokens may be inserted by the
% internal macro \cs{__prg_break_point:Nn} before the \meta{tokens} are
% inserted into the input stream.
-% This will depend on the design of the mapping function.
+% This depends on the design of the mapping function.
% \end{texnote}
% \end{function}
%
@@ -571,7 +571,7 @@
% \end{syntax}
% Leaves the number of items in the \meta{sequence} in the input
% stream as an \meta{integer denotation}. The total number of items
-% in a \meta{sequence} will include those which are empty and duplicates,
+% in a \meta{sequence} includes those which are empty and duplicates,
% \emph{i.e.}~every item in a \meta{sequence} is unique.
% \end{function}
%
@@ -589,7 +589,7 @@
% sequence has exactly two items, then they are placed in the input stream
% separated by the \meta{separator between two}. If the sequence has
% a single item, it is placed in the input stream, and an empty sequence
-% produces no output. An error will be raised if the variable does
+% produces no output. An error is raised if the variable does
% not exist or if it is invalid.
%
% For example,
@@ -597,13 +597,13 @@
% \seq_set_split:Nnn \l_tmpa_seq { | } { a | b | c | {de} | f }
% \seq_use:Nnnn \l_tmpa_seq { ~and~ } { ,~ } { ,~and~ }
% \end{verbatim}
-% will insert \enquote{\texttt{a, b, c, de, and f}} in the input
+% inserts \enquote{\texttt{a, b, c, de, and f}} in the input
% stream. The first separator argument is not used in this case
% because the sequence has more than $2$ items.
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{items}
-% will not expand further when appearing in an \texttt{x}-type
+% do not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -615,7 +615,7 @@
% Places the contents of the \meta{seq~var} in the input stream, with
% the \meta{separator} between the items. If the sequence has
% a single item, it is placed in the input stream with no \meta{separator},
-% and an empty sequence produces no output. An error will be raised if
+% and an empty sequence produces no output. An error is raised if
% the variable does not exist or if it is invalid.
%
% For example,
@@ -623,12 +623,12 @@
% \seq_set_split:Nnn \l_tmpa_seq { | } { a | b | c | {de} | f }
% \seq_use:Nn \l_tmpa_seq { ~and~ }
% \end{verbatim}
-% will insert \enquote{\texttt{a and b and c and de and f}} in the input
+% inserts \enquote{\texttt{a and b and c and de and f}} in the input
% stream.
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{items}
-% will not expand further when appearing in an \texttt{x}-type
+% do not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -649,8 +649,8 @@
% Reads the top item from a \meta{sequence} into the
% \meta{token list variable} without removing it from the
% \meta{sequence}. The \meta{token list variable} is assigned locally.
-% If \meta{sequence} is empty the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}.
+% If \meta{sequence} is empty the \meta{token list variable} is set to
+% the special marker \cs{q_no_value}.
% \end{function}
%
% \begin{function}[updated = 2012-05-14]{\seq_pop:NN, \seq_pop:cN}
@@ -659,8 +659,8 @@
% \end{syntax}
% Pops the top item from a \meta{sequence} into the
% \meta{token list variable}. Both of the variables are assigned
-% locally. If \meta{sequence} is empty the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}.
+% locally. If \meta{sequence} is empty the \meta{token list variable}
+% is set to the special marker \cs{q_no_value}.
% \end{function}
%
% \begin{function}[updated = 2012-05-14]{\seq_gpop:NN, \seq_gpop:cN}
@@ -670,8 +670,8 @@
% Pops the top item from a \meta{sequence} into the
% \meta{token list variable}. The \meta{sequence} is modified globally,
% while the \meta{token list variable} is assigned locally. If
-% \meta{sequence} is empty the \meta{token list variable} will
-% contain the special marker \cs{q_no_value}.
+% \meta{sequence} is empty the \meta{token list variable} is set to
+% the special marker \cs{q_no_value}.
% \end{function}
%
% \begin{function}[TF, added = 2012-05-14, updated = 2012-05-19]{\seq_get:NN, \seq_get:cN}
@@ -869,7 +869,7 @@
% \cs{__seq_item:n} \Arg{item}
% \end{syntax}
% The internal token used to begin each sequence entry. If expanded
-% outside of a mapping or manipulation function, an error will be
+% outside of a mapping or manipulation function, an error is
% raised. The definition should always be set globally.
% \end{function}
%
@@ -1304,11 +1304,10 @@
% \texttt{x}-type expansion uses \cs{str_if_eq:nnT} to find potential
% matches. If one is found, the expansion is halted and the necessary
% set up takes place to use the \cs{tl_if_eq:NNT} test. The \texttt{x}-type
-% is started again, including all of the items copied already. This will
-% happen repeatedly until the entire sequence has been scanned. The code
+% is started again, including all of the items copied already. This
+% happens repeatedly until the entire sequence has been scanned. The code
% is set up to avoid needing and intermediate scratch list: the lead-off
-% \texttt{x}-type expansion (|#1 #2 {#2}|) will ensure that nothing is
-% lost.
+% \texttt{x}-type expansion (|#1 #2 {#2}|) ensures that nothing is lost.
% \begin{macrocode}
\cs_new_protected:Npn \seq_remove_all:Nn
{ \@@_remove_all_aux:NNn \tl_set:Nx }
@@ -1436,7 +1435,7 @@
% argument with the test sequence. If the two items are equal, the
% mapping is terminated and \cs{group_end:} \cs{prg_return_true:}
% is inserted after skipping over the rest of the recursion. On the
-% other hand, if there is no match then the loop will break returning
+% other hand, if there is no match then the loop breaks, returning
% \cs{prg_return_false:}.
% Everything is inside a group so that \cs{@@_item:n} is preserved
% in nested situations.
@@ -1591,7 +1590,7 @@
% supplied by the |{ \if_false: } \fi:| \ldots
% |\if_false: { \fi: }| construct. Using an \texttt{x}-type
% expansion and a \enquote{non-expanding} definition for \cs{@@_item:n},
-% the left-most $n - 1$ entries in a sequence of $n$ items will be stored
+% the left-most $n - 1$ entries in a sequence of $n$ items are stored
% back in the sequence. That needs a loop of unknown length, hence using the
% strange \cs{if_false:} way of including braces. When the last item
% of the sequence is reached, the closing brace for the assignment is
@@ -1687,7 +1686,7 @@
% \begin{macro}[aux]{\@@_item:wNn, \@@_item:nN, \@@_item:nnn}
% The idea here is to find the offset of the item from the left, then use
% a loop to grab the correct item. If the resulting offset is too large,
-% then the stop code |{ ? \__prg_break: } { }| will be used by the auxiliary,
+% then the stop code |{ ? \__prg_break: } { }| is used by the auxiliary,
% terminating the loop and returning nothing at all.
% \begin{macrocode}
\cs_new:Npn \seq_item:Nn #1
Modified: trunk/l3kernel/l3skip.dtx
===================================================================
--- trunk/l3kernel/l3skip.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3skip.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -66,7 +66,7 @@
% \end{syntax}
% Creates a new \meta{dimension} or raises an error if the name is
% already taken. The declaration is global. The \meta{dimension}
-% will initially be equal to $0$\,pt.
+% is initially equal to $0$\,pt.
% \end{function}
%
% \begin{function}[added = 2012-03-05]{\dim_const:Nn, \dim_const:cn}
@@ -74,7 +74,7 @@
% \cs{dim_const:Nn} \meta{dimension} \Arg{dimension expression}
% \end{syntax}
% Creates a new constant \meta{dimension} or raises an error if the
-% name is already taken. The value of the \meta{dimension} will be set
+% name is already taken. The value of the \meta{dimension} is set
% globally to the \meta{dimension expression}.
% \end{function}
%
@@ -185,7 +185,7 @@
% \tl_set:Nx \l_my_tl { \dim_ratio:nn { 5 pt } { 10 pt } }
% \tl_show:N \l_my_tl
% \end{verbatim}
-% will display |327680/655360| on the terminal.
+% displays |327680/655360| on the terminal.
% \end{function}
%
% \section{Dimension expression conditionals}
@@ -285,7 +285,7 @@
% }
% { No idea! }
% \end{verbatim}
-% will leave \enquote{\texttt{Medium}} in the input stream.
+% leaves \enquote{\texttt{Medium}} in the input stream.
% \end{function}
%
% \section{Dimension expression loops}
@@ -297,8 +297,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the relationship between the two
% \meta{dimension expressions} as described for \cs{dim_compare:nNnTF}.
-% If the test is \texttt{false} then the \meta{code} will be inserted
-% into the input stream again and a loop will occur until the
+% If the test is \texttt{false} then the \meta{code} is inserted
+% into the input stream again and a loop occurs until the
% \meta{relation} is \texttt{true}.
% \end{function}
%
@@ -309,8 +309,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the relationship between the two
% \meta{dimension expressions} as described for \cs{dim_compare:nNnTF}.
-% If the test is \texttt{true} then the \meta{code} will be inserted
-% into the input stream again and a loop will occur until the
+% If the test is \texttt{true} then the \meta{code} is inserted
+% into the input stream again and a loop occurs until the
% \meta{relation} is \texttt{false}.
% \end{function}
%
@@ -322,7 +322,7 @@
% as described for \cs{dim_compare:nNnTF}, and then places the
% \meta{code} in the input stream if the \meta{relation} is
% \texttt{false}. After the \meta{code} has been processed by \TeX{} the
-% test will be repeated, and a loop will occur until the test is
+% test is repeated, and a loop occurs until the test is
% \texttt{true}.
% \end{function}
%
@@ -334,7 +334,7 @@
% as described for \cs{dim_compare:nNnTF}, and then places the
% \meta{code} in the input stream if the \meta{relation} is
% \texttt{true}. After the \meta{code} has been processed by \TeX{} the
-% test will be repeated, and a loop will occur until the test is
+% test is repeated, and a loop occurs until the test is
% \texttt{false}.
% \end{function}
%
@@ -345,8 +345,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the \meta{dimension relation}
% as described for \cs{dim_compare:nTF}.
-% If the test is \texttt{false} then the \meta{code} will be inserted
-% into the input stream again and a loop will occur until the
+% If the test is \texttt{false} then the \meta{code} is inserted
+% into the input stream again and a loop occurs until the
% \meta{relation} is \texttt{true}.
% \end{function}
%
@@ -357,8 +357,8 @@
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the \meta{dimension relation}
% as described for \cs{dim_compare:nTF}.
-% If the test is \texttt{true} then the \meta{code} will be inserted
-% into the input stream again and a loop will occur until the
+% If the test is \texttt{true} then the \meta{code} is inserted
+% into the input stream again and a loop occurs until the
% \meta{relation} is \texttt{false}.
% \end{function}
%
@@ -370,7 +370,7 @@
% as described for \cs{dim_compare:nTF}, and then places the
% \meta{code} in the input stream if the \meta{relation} is
% \texttt{false}. After the \meta{code} has been processed by \TeX{} the
-% test will be repeated, and a loop will occur until the test is
+% test is repeated, and a loop occurs until the test is
% \texttt{true}.
% \end{function}
%
@@ -382,7 +382,7 @@
% as described for \cs{dim_compare:nTF}, and then places the
% \meta{code} in the input stream if the \meta{relation} is
% \texttt{true}. After the \meta{code} has been processed by \TeX{} the
-% test will be repeated, and a loop will occur until the test is
+% test is repeated, and a loop occurs until the test is
% \texttt{false}.
% \end{function}
%
@@ -397,8 +397,8 @@
% to their content (without requiring \cs{dim_use:N}/\cs{tl_use:N})
% and applying the standard mathematical rules. The result of the
% calculation is left in the input stream as a
-% \meta{dimension denotation} after two expansions. This will be
-% expressed in points (\texttt{pt}), and will require suitable
+% \meta{dimension denotation} after two expansions. This is
+% expressed in points (\texttt{pt}), and requires suitable
% termination if used in a \TeX{}-style assignment as it is \emph{not}
% an \meta{internal dimension}.
% \end{function}
@@ -408,7 +408,7 @@
% \cs{dim_use:N} \meta{dimension}
% \end{syntax}
% Recovers the content of a \meta{dimension} and places it directly
-% in the input stream. An error will be raised if the variable does
+% in the input stream. An error is raised if the variable does
% not exist or if it is invalid. Can be omitted in places where a
% \meta{dimension} is required (such as in the argument of
% \cs{dim_eval:n}).
@@ -460,7 +460,7 @@
% \end{syntax}
% Evaluates the \meta{dimension expression}, and leaves the result,
% expressed in scaled points (\texttt{sp}) in the input stream, with \emph{no
-% units}. The result will necessarily be an integer.
+% units}. The result is necessarily an integer.
% \end{function}
%
% \begin{function}[added = 2014-07-15, EXP]
@@ -569,7 +569,7 @@
% \end{syntax}
% Creates a new \meta{skip} or raises an error if the name is
% already taken. The declaration is global. The \meta{skip}
-% will initially be equal to $0$\,pt.
+% is initially equal to $0$\,pt.
% \end{function}
%
% \begin{function}[added = 2012-03-05]{\skip_const:Nn, \skip_const:cn}
@@ -577,7 +577,7 @@
% \cs{skip_const:Nn} \meta{skip} \Arg{skip expression}
% \end{syntax}
% Creates a new constant \meta{skip} or raises an error if the
-% name is already taken. The value of the \meta{skip} will be set
+% name is already taken. The value of the \meta{skip} is set
% globally to the \meta{skip expression}.
% \end{function}
%
@@ -686,8 +686,8 @@
% to their content (without requiring \cs{skip_use:N}/\cs{tl_use:N})
% and applying the standard mathematical rules. The result of the
% calculation is left in the input stream as a \meta{glue denotation}
-% after two expansions. This will be expressed in points (\texttt{pt}),
-% and will require suitable termination if used in a \TeX{}-style
+% after two expansions. This is expressed in points (\texttt{pt}),
+% and requires suitable termination if used in a \TeX{}-style
% assignment as it is \emph{not} an \meta{internal glue}.
% \end{function}
%
@@ -696,7 +696,7 @@
% \cs{skip_use:N} \meta{skip}
% \end{syntax}
% Recovers the content of a \meta{skip} and places it directly
-% in the input stream. An error will be raised if the variable does
+% in the input stream. An error is raised if the variable does
% not exist or if it is invalid. Can be omitted in places where a
% \meta{dimension} is required (such as in the argument of
% \cs{skip_eval:n}).
@@ -799,7 +799,7 @@
% \end{syntax}
% Creates a new \meta{muskip} or raises an error if the name is
% already taken. The declaration is global. The \meta{muskip}
-% will initially be equal to $0$\,mu.
+% is initially equal to $0$\,mu.
% \end{function}
%
% \begin{function}[added = 2012-03-05]{\muskip_const:Nn, \muskip_const:cn}
@@ -807,7 +807,7 @@
% \cs{muskip_const:Nn} \meta{muskip} \Arg{muskip expression}
% \end{syntax}
% Creates a new constant \meta{muskip} or raises an error if the
-% name is already taken. The value of the \meta{muskip} will be set
+% name is already taken. The value of the \meta{muskip} is set
% globally to the \meta{muskip expression}.
% \end{function}
%
@@ -898,8 +898,8 @@
% to their content (without requiring \cs{muskip_use:N}/\cs{tl_use:N})
% and applying the standard mathematical rules. The result of the
% calculation is left in the input stream as a \meta{muglue denotation}
-% after two expansions. This will be expressed in \texttt{mu},
-% and will require suitable termination if used in a \TeX{}-style
+% after two expansions. This is expressed in \texttt{mu},
+% and requires suitable termination if used in a \TeX{}-style
% assignment as it is \emph{not} an \meta{internal muglue}.
% \end{function}
%
@@ -908,7 +908,7 @@
% \cs{muskip_use:N} \meta{muskip}
% \end{syntax}
% Recovers the content of a \meta{skip} and places it directly
-% in the input stream. An error will be raised if the variable does
+% in the input stream. An error is raised if the variable does
% not exist or if it is invalid. Can be omitted in places where a
% \meta{dimension} is required (such as in the argument of
% \cs{muskip_eval:n}).
@@ -1209,7 +1209,7 @@
%
% \begin{macro}{\dim_ratio:nn}
% \begin{macro}[aux]{\@@_ratio:n}
-% With dimension expressions, something like |10 pt * ( 5 pt / 10 pt )| will
+% With dimension expressions, something like |10 pt * ( 5 pt / 10 pt )| does
% not work. Instead, the ratio part needs to be converted to an integer
% expression. Using \cs{__int_value:w} forces everything into |sp|, avoiding
% any decimal parts.
Modified: trunk/l3kernel/l3sort.dtx
===================================================================
--- trunk/l3kernel/l3sort.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3sort.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -63,7 +63,7 @@
% { \sort_return_same: }
% }
% \end{verbatim}
-% will result in \cs{l_foo_clist} holding the values
+% results in \cs{l_foo_clist} holding the values
% |{ -2 , 01 , +1 , 3 , 5 }| sorted in non-decreasing order.
%
% The code defining the comparison should call
@@ -73,10 +73,10 @@
% the order of this pair of items should not be changed.
%
% For instance, a \meta{comparison code} consisting only
-% of \cs{sort_return_same:} with no test will yield a trivial
+% of \cs{sort_return_same:} with no test yields a trivial
% sort: the final order is identical to the original order.
% Conversely, using a \meta{comparison code} consisting only
-% of \cs{sort_return_swapped:} will reverse the list (in a fairly
+% of \cs{sort_return_swapped:} reverses the list (in a fairly
% inefficient way).
%
% \begin{texnote}
@@ -116,7 +116,7 @@
% \cs{l_@@_min_int} to $\cs{l_@@_top_int}-1$. While reading the
% sequence in memory, we check that \cs{l_@@_top_int} remains at most
% \cs{l_@@_max_int}, precomputed by \cs{@@_compute_range:}. That
-% bound is such that the merge sort will only use \tn{toks} registers
+% bound is such that the merge sort only uses \tn{toks} registers
% less than \cs{l_@@_true_max_int}, namely those that have not been
% allocated for use in other code: the user's comparison code could
% alter these.
@@ -489,7 +489,7 @@
% pair of blocks). If shifting by one block to the right we reach
% the end of the list, then this pass has ended: the end of the
% list is sorted already. Otherwise, store the result of that shift in $A$,
-% which will index the first block starting from the top end.
+% which indexes the first block starting from the top end.
% Then locate the end-point (maximum) of the second block: shift
% \texttt{end} upwards by one more block, but keeping it
% $\leq\texttt{top}$. Copy this upper block of \tn{toks}
@@ -710,7 +710,7 @@
%
% In the simple version of the code, \cs{@@:nnNnn} is called
% \(O(n\ln n)\) times on average (the number of comparisons required by
-% the quicksort algorithm). Hence most of our focus will be on
+% the quicksort algorithm). Hence most of our focus is on
% optimizing that function.
%
% The first speed up is to avoid testing for the end of the list at
@@ -830,7 +830,7 @@
% when~|#4| contains \cs{__prg_break_point:}, then the
% \texttt{prepare_end} auxiliary finds the prepared token list
% as~|#4|. The scene is then set up for \cs{@@_quick_split:NnNn},
-% which will sort the prepared list and perform the post action placed
+% which sorts the prepared list and perform the post action placed
% after \cs{q_mark}, namely removing the trailing \cs{s__stop} and
% \cs{q_stop} and leaving \cs{exp_stop_f:} to stop
% \texttt{f}-expansion.
Modified: trunk/l3kernel/l3str.dtx
===================================================================
--- trunk/l3kernel/l3str.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3str.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -57,7 +57,7 @@
% which have category code $12$ (\enquote{other}) with the exception of
% space characters which have category code $10$ (\enquote{space}). Thus
% at a technical level, a \TeX{} string is a token list with the appropriate
-% category codes. In this documentation, these will simply be referred to as
+% category codes. In this documentation, these are simply referred to as
% strings.
%
% String variables are simply specialised token lists, but by convention
@@ -66,7 +66,7 @@
% spaces, which have category code $10$ (blank space). All the
% functions in this module which accept a token list argument first
% convert it to a string using \cs{tl_to_str:n} for internal processing,
-% and will not treat a token list or the corresponding string
+% and do not treat a token list or the corresponding string
% representation differently.
%
% Note that as string variables are a special case of token list variables
@@ -74,7 +74,7 @@
% \cs[no-index]{tl_\ldots{}:N}.
%
% The functions \cs{cs_to_str:N}, \cs{tl_to_str:n}, \cs{tl_to_str:N} and
-% \cs{token_to_str:N} (and variants) will generate strings from the appropriate
+% \cs{token_to_str:N} (and variants) generate strings from the appropriate
% input: these are documented in \pkg{l3basics}, \pkg{l3tl} and \pkg{l3token},
% respectively.
%
@@ -97,8 +97,8 @@
% \cs{str_new:N} \meta{str~var}
% \end{syntax}
% Creates a new \meta{str~var} or raises an error if the name is
-% already taken. The declaration is global. The \meta{str~var} will
-% initially be empty.
+% already taken. The declaration is global. The \meta{str~var} is
+% initially empty.
% \end{function}
%
% \begin{function}[added = 2015-09-18]
@@ -107,7 +107,7 @@
% \cs{str_const:Nn} \meta{str~var} \Arg{token list}
% \end{syntax}
% Creates a new constant \meta{str~var} or raises an error if the name
-% is already taken. The value of the \meta{str~var} will be set
+% is already taken. The value of the \meta{str~var} is set
% globally to the \meta{token list}, converted to a string.
% \end{function}
%
@@ -307,7 +307,7 @@
% \cs{str_use:N} \meta{str~var}
% \end{syntax}
% Recovers the content of a \meta{str~var} and places it
-% directly in the input stream. An error will be raised if the variable
+% directly in the input stream. An error is raised if the variable
% does not exist or if it is invalid. Note that it is possible to use
% a \meta{str} directly without an accessor function.
% \end{function}
@@ -362,7 +362,7 @@
% character, and leaves the remaining characters (if any) in the input
% stream, with category codes $12$ and $10$ (for spaces). The
% functions differ in the case where the first character is a space:
-% \cs{str_tail:N} and \cs{str_tail:n} will trim only that space, while
+% \cs{str_tail:N} and \cs{str_tail:n} only trim that space, while
% \cs{str_tail_ignore_spaces:n} removes the first non-space character
% and any space before it. If the \meta{token list} is empty (or
% blank in the case of the \texttt{_ignore_spaces} variant), then
@@ -406,7 +406,7 @@
% \iow_term:x { \str_range:nnn { abcdef } { -2 } { -1 } }
% \iow_term:x { \str_range:nnn { abcdef } { 0 } { -1 } }
% \end{verbatim}
-% will print \texttt{bcde}, \texttt{cdef}, \texttt{ef}, and an empty
+% prints \texttt{bcde}, \texttt{cdef}, \texttt{ef}, and an empty
% line to the terminal. The \meta{start index} must always be smaller than
% or equal to the \meta{end index}: if this is not the case then no output
% is generated. Thus
@@ -471,7 +471,7 @@
% As with all \pkg{expl3} functions, the input supported by
% \cs{str_fold_case:n} is \emph{engine-native} characters which are or
% interoperate with \textsc{utf-8}. As such, when used with \pdfTeX{}
-% \emph{only} the Latin alphabet characters A--Z will be case-folded
+% \emph{only} the Latin alphabet characters A--Z are case-folded
% (\emph{i.e.}~the \textsc{ascii} range which coincides with
% \textsc{utf-8}). Full \textsc{utf-8} support is available with both
% \XeTeX{} and \LuaTeX{}, subject only to the fact that \XeTeX{} in
@@ -515,7 +515,7 @@
% As with all \pkg{expl3} functions, the input supported by
% \cs{str_fold_case:n} is \emph{engine-native} characters which are or
% interoperate with \textsc{utf-8}. As such, when used with \pdfTeX{}
-% \emph{only} the Latin alphabet characters A--Z will be case-folded
+% \emph{only} the Latin alphabet characters A--Z are case-folded
% (\emph{i.e.}~the \textsc{ascii} range which coincides with
% \textsc{utf-8}). Full \textsc{utf-8} support is available with both
% \XeTeX{} and \LuaTeX{}, subject only to the fact that \XeTeX{} in
@@ -766,7 +766,7 @@
% spaces are not skipped for ease-of-input. The need to detokenize and force
% expansion of input arises from the case where a |#| token is used in the
% input, \emph{e.g.}~|\__str_if_eq_x:nn {#} { \tl_to_str:n {#} }|, which
-% otherwise will fail as \cs{luatex_luaescapestring:D} does not double
+% otherwise would fail as \cs{luatex_luaescapestring:D} does not double
% such tokens.
% \begin{macrocode}
\cs_new:Npn \@@_if_eq_x:nn #1#2 { \pdftex_strcmp:D {#1} {#2} }
@@ -1204,7 +1204,7 @@
% trick again, so that the $8$ first arguments of
% \cs{@@_collect_end:nnnnnnnnw} are some \cs{or:}, followed by an
% \cs{fi:}, followed by |#1| characters from the input stream. Simply
-% leaving this in the input stream will close the conditional properly
+% leaving this in the input stream closes the conditional properly
% and the \cs{or:} disappear.
% \begin{macrocode}
\cs_new:Npn \@@_collect_delimit_by_q_stop:w #1;
@@ -1614,7 +1614,7 @@
% Set up to read each file. As they use C-style comments, there is a need to
% deal with |#|. At the same time, spaces are important so they need to be
% picked up as they are important. Beyond that, the current category code
-% scheme works fine. With no I/O loop available, hard-code one that will work
+% scheme works fine. With no I/O loop available, hard-code one that works
% quickly.
% \begin{macrocode}
\cs_set_protected:Npn \@@_map_inline:n #1
@@ -1665,8 +1665,8 @@
}
% \end{macrocode}
% Storing each exception is always done in the same way: create a constant
-% token list which expands to exactly the mapping. These will have the
-% category codes \enquote{now} (so should be letters) but will be detokenized
+% token list which expands to exactly the mapping. These have the
+% category codes \enquote{now} (so should be letters) but are later detokenized
% for string use.
% \begin{macrocode}
\cs_set_protected:Npn \@@_store:nnnnn #1#2#3#4#5
@@ -1681,7 +1681,7 @@
}
% \end{macrocode}
% Parse the main Unicode data file for title case exceptions (the one-to-one
-% lower and upper case mappings it contains will all be covered by the \TeX{}
+% lower and upper case mappings it contains are all be covered by the \TeX{}
% data).
% \begin{macrocode}
\cs_set_protected:Npn \@@_parse_auxi:w
Modified: trunk/l3kernel/l3styleguide.tex
===================================================================
--- trunk/l3kernel/l3styleguide.tex 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3styleguide.tex 2017-06-26 04:00:28 UTC (rev 7310)
@@ -131,8 +131,8 @@
means that an additional two-space indent should be used to show that
these lines are all part of the brace group.
-The result of these lay-out conventions is code which will in general
-look like the example:
+The result of these lay-out conventions is code which in general
+looks like the example:
\begin{verbatim*}
\cs_new:Npn \module_foo:nn #1#2
{
@@ -238,7 +238,7 @@
\section{Auxiliary functions}
In general, the team encourages the use of descriptive names in \LaTeX3 code.
-Thus many helper functions will have names which describe briefly what they do,
+Thus many helper functions would have names which describe briefly what they do,
rather than simply indicating that they are auxiliary to some higher-level
function. However, there are places where one or more \texttt{aux} functions
are required. Where possible, these should be differentiated by signature
Modified: trunk/l3kernel/l3sys.dtx
===================================================================
--- trunk/l3kernel/l3sys.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3sys.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -98,7 +98,7 @@
% \end{function}
%
% \begin{variable}[added = 2015-09-19]{\c_sys_engine_str}
-% The current engine given as a lower case string: will be one of
+% The current engine given as a lower case string: one of
% |luatex|, |pdftex|, |ptex|, |uptex| or |xetex|.
% \end{variable}
%
@@ -113,14 +113,14 @@
% \cs{sys_if_output_dvi:TF} \Arg{true code} \Arg{false code}
% \end{syntax}
% Conditionals which give the current output mode the \TeX{} run is
-% operating in. This will always be one of two outcomes, DVI mode or
+% operating in. This is always one of two outcomes, DVI mode or
% PDF mode. The two sets of conditionals are thus complementary and
% are both provided to allow the programmer to emphasise the most
% appropriate case.
% \end{function}
%
% \begin{variable}[added = 2015-09-19]{\c_sys_output_str}
-% The current output mode given as a lower case string: will be one of
+% The current output mode given as a lower case string: one of
% |dvi| or |pdf|.
% \end{variable}
%
Modified: trunk/l3kernel/l3tl-analysis.dtx
===================================================================
--- trunk/l3kernel/l3tl-analysis.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3tl-analysis.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -344,14 +344,14 @@
% \end{itemize}
% The only tokens which are not valid \texttt{N}-type arguments are true
% begin-group characters, true end-group characters, and true spaces.
-% We will detect those characters by scanning ahead with \tn{futurelet},
+% We detect those characters by scanning ahead with \tn{futurelet},
% then distinguishing true characters from control sequences set equal
% to them using the \tn{string} representation.
%
% The second pass is a simple exercise in expandable loops.
%
% \begin{macro}[int]{\@@:n}
-% Everything is done within a group, and all definitions will be
+% Everything is done within a group, and all definitions are
% local. We use \cs{group_align_safe_begin/end:} to avoid problems in
% case \cs{@@:n} is used within an alignment and its argument
% contains alignment tab tokens.
@@ -442,7 +442,7 @@
% \end{itemize}
% Our first tool is \tn{futurelet}. This cannot distinguish
% case $8$ from $1$ or $2$, nor case $9$ from $3$ or $4$,
-% nor case $10$ from case $5$. Those cases will be distinguished
+% nor case $10$ from case $5$. Those cases are later distinguished
% by applying the \tn{string} primitive to the following token,
% after possibly changing the escape character to ensure that
% a control sequence's string representation cannot be mistaken
@@ -631,7 +631,7 @@
% \item 1 begin-group character.
% \end{itemize}
% We need to distinguish further the case of a space character
-% (code $32$) from other character codes, because those will
+% (code $32$) from other character codes, because those
% behave differently in the second pass. Namely, after testing
% the \tn{lccode} of $0$ (which holds the present character code)
% we change the cases above to
@@ -722,8 +722,8 @@
% \begin{macro}[int]{\@@_b:n}
% \begin{macro}[int, EXP]{\@@_b_loop:w}
% Start the loop with the index $0$. No need for an end-marker:
-% the loop will stop by itself when the last index is read.
-% We will repeatedly oscillate between reading long stretches
+% the loop stops by itself when the last index is read.
+% We repeatedly oscillate between reading long stretches
% of normal tokens, and reading special tokens.
% \begin{macrocode}
\cs_new_protected:Npn \@@_b:n #1
Modified: trunk/l3kernel/l3tl.dtx
===================================================================
--- trunk/l3kernel/l3tl.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3tl.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -92,7 +92,7 @@
% \end{syntax}
% Creates a new \meta{tl~var} or raises an error if the
% name is already taken. The declaration is global. The
-% \meta{tl~var} will initially be empty.
+% \meta{tl~var} is initially empty.
% \end{function}
%
% \begin{function}{\tl_const:Nn, \tl_const:Nx, \tl_const:cn, \tl_const:cx}
@@ -101,8 +101,7 @@
% \end{syntax}
% Creates a new constant \meta{tl~var} or raises an error
% if the name is already taken. The value of the
-% \meta{tl~var} will be set globally to the
-% \meta{token list}.
+% \meta{tl~var} is set globally to the \meta{token list}.
% \end{function}
%
% \begin{function}{\tl_clear:N, \tl_clear:c, \tl_gclear:N, \tl_gclear:c}
@@ -144,7 +143,7 @@
% \end{syntax}
% Concatenates the content of \meta{tl~var_2} and \meta{tl~var_3}
% together and saves the result in \meta{tl~var_1}. The \meta{tl~var_2}
-% will be placed at the left side of the new token list.
+% is placed at the left side of the new token list.
% \end{function}
%
% \begin{function}[EXP, pTF, added=2012-03-03]{\tl_if_exist:N, \tl_if_exist:c}
@@ -273,7 +272,7 @@
% \cs{tl_set:Nn} \cs{l_tmpa_tl} |{abbccd}|
% \cs{tl_remove_all:Nn} \cs{l_tmpa_tl} |{bc}|
% \end{quote}
-% will result in \cs{l_tmpa_tl} containing \texttt{abcd}.
+% results in \cs{l_tmpa_tl} containing \texttt{abcd}.
% \end{function}
%
% \section{Reassigning token list category codes}
@@ -299,7 +298,7 @@
% Sets \meta{tl~var} to contain \meta{tokens}, applying the category
% code r\'{e}gime specified in the \meta{setup} before carrying out
% the assignment. (Category codes applied to tokens not explicitly covered
-% by the \meta{setup} will be those in force at the point of use of
+% by the \meta{setup} are those in force at the point of use of
% \cs{tl_set_rescan:Nnn}.)
% This allows the \meta{tl~var} to contain material
% with category codes other than those that apply when \meta{tokens}
@@ -329,7 +328,7 @@
% Rescans \meta{tokens} applying the category code r\'{e}gime
% specified in the \meta{setup}, and leaves the resulting tokens in
% the input stream. (Category codes applied to tokens not explicitly covered
-% by the \meta{setup} will be those in force at the point of use of
+% by the \meta{setup} are those in force at the point of use of
% \cs{tl_rescan:nn}.)
% The \meta{setup} is run within a group and may
% contain any valid input, although only changes in category codes
@@ -491,7 +490,7 @@
% \cs{tl_map_function:NN} \meta{tl~var} \meta{function}
% \end{syntax}
% Applies \meta{function} to every \meta{item} in the \meta{tl~var}.
-% The \meta{function} will receive one argument for each iteration.
+% The \meta{function} receives one argument for each iteration.
% This may be a number of tokens if the \meta{item} was stored within
% braces. Hence the \meta{function} should anticipate receiving
% \texttt{n}-type arguments. See also \cs{tl_map_function:nN}.
@@ -502,7 +501,7 @@
% \cs{tl_map_function:nN} \meta{token list} \meta{function}
% \end{syntax}
% Applies \meta{function} to every \meta{item} in the \meta{token list},
-% The \meta{function} will receive one argument for each iteration.
+% The \meta{function} receives one argument for each iteration.
% This may be a number of tokens if the \meta{item} was stored within
% braces. Hence the \meta{function} should anticipate receiving
% \texttt{n}-type arguments. See also \cs{tl_map_function:NN}.
@@ -515,7 +514,7 @@
% \end{syntax}
% Applies the \meta{inline function} to every \meta{item} stored within the
% \meta{tl~var}. The \meta{inline function} should consist of code which
-% will receive the \meta{item} as |#1|. One in line mapping can be nested
+% receives the \meta{item} as |#1|. One in line mapping can be nested
% inside another. See also \cs{tl_map_function:NN}.
% \end{function}
%
@@ -525,7 +524,7 @@
% \end{syntax}
% Applies the \meta{inline function} to every \meta{item} stored within the
% \meta{token list}. The \meta{inline function} should consist of code which
-% will receive the \meta{item} as |#1|. One in line mapping can be nested
+% receives the \meta{item} as |#1|. One in line mapping can be nested
% inside another. See also \cs{tl_map_function:nN}.
% \end{function}
%
@@ -536,7 +535,7 @@
% \end{syntax}
% Applies the \meta{function} to every \meta{item} stored
% within the \meta{tl~var}. The \meta{function} should consist of code
-% which will receive the \meta{item} stored in the \meta{variable}.
+% which receives the \meta{item} stored in the \meta{variable}.
% One variable mapping can be nested inside another. See also
% \cs{tl_map_inline:Nn}.
% \end{function}
@@ -547,7 +546,7 @@
% \end{syntax}
% Applies the \meta{function} to every \meta{item} stored
% within the \meta{token list}. The \meta{function} should consist of code
-% which will receive the \meta{item} stored in the \meta{variable}.
+% which receives the \meta{item} stored in the \meta{variable}.
% One variable mapping can be nested inside another. See also
% \cs{tl_map_inline:nn}.
% \end{function}
@@ -558,7 +557,7 @@
% \end{syntax}
% Used to terminate a \cs[no-index]{tl_map_\ldots} function before all
% entries in the \meta{token list variable} have been processed. This
-% will normally take place within a conditional statement, for example
+% normally takes place within a conditional statement, for example
% \begin{verbatim}
% \tl_map_inline:Nn \l_my_tl
% {
@@ -567,13 +566,13 @@
% }
% \end{verbatim}
% See also \cs{tl_map_break:n}.
-% Use outside of a \cs[no-index]{tl_map_\ldots} scenario will lead to low
+% Use outside of a \cs[no-index]{tl_map_\ldots} scenario leads to low
% level \TeX{} errors.
% \begin{texnote}
% When the mapping is broken, additional tokens may be inserted by the
% internal macro \cs{__prg_break_point:Nn} before the \meta{tokens} are
% inserted into the input stream.
-% This will depend on the design of the mapping function.
+% This depends on the design of the mapping function.
% \end{texnote}
% \end{function}
%
@@ -583,8 +582,8 @@
% \end{syntax}
% Used to terminate a \cs[no-index]{tl_map_\ldots} function before all
% entries in the \meta{token list variable} have been processed, inserting
-% the \meta{tokens} after the mapping has ended. This will
-% normally take place within a conditional statement, for example
+% the \meta{tokens} after the mapping has ended. This
+% normally takes place within a conditional statement, for example
% \begin{verbatim}
% \tl_map_inline:Nn \l_my_tl
% {
@@ -593,13 +592,13 @@
% % Do something useful
% }
% \end{verbatim}
-% Use outside of a \cs[no-index]{tl_map_\ldots} scenario will lead to low
+% Use outside of a \cs[no-index]{tl_map_\ldots} scenario leads to low
% level \TeX{} errors.
% \begin{texnote}
% When the mapping is broken, additional tokens may be inserted by the
% internal macro \cs{__prg_break_point:Nn} before the \meta{tokens} are
% inserted into the input stream.
-% This will depend on the design of the mapping function.
+% This depends on the design of the mapping function.
% \end{texnote}
% \end{function}
%
@@ -657,7 +656,7 @@
% \cs{tl_use:N} \meta{tl~var}
% \end{syntax}
% Recovers the content of a \meta{tl~var} and places it
-% directly in the input stream. An error will be raised if the variable
+% directly in the input stream. An error is raised if the variable
% does not exist or if it is invalid. Note that it is possible to use
% a \meta{tl~var} directly without an accessor function.
% \end{function}
@@ -671,8 +670,8 @@
% \end{syntax}
% Counts the number of \meta{items} in \meta{tokens} and leaves this
% information in the input stream. Unbraced tokens count as one
-% element as do each token group (|{|\ldots|}|). This process will
-% ignore any unprotected spaces within \meta{tokens}. See also
+% element as do each token group (|{|\ldots|}|). This process
+% ignores any unprotected spaces within \meta{tokens}. See also
% \cs{tl_count:N}. This function requires three expansions,
% giving an \meta{integer denotation}.
% \end{function}
@@ -684,7 +683,7 @@
% Counts the number of token groups in the \meta{tl~var}
% and leaves this information in the input stream. Unbraced tokens
% count as one element as do each token group (|{|\ldots|}|). This
-% process will ignore any unprotected spaces within the \meta{tl~var}.
+% process ignores any unprotected spaces within the \meta{tl~var}.
% See also \cs{tl_count:n}. This function requires three expansions,
% giving an \meta{integer denotation}.
% \end{function}
@@ -697,7 +696,7 @@
% Reverses the order of the \meta{items} in the \meta{token list},
% so that \meta{item_1}\meta{item_2}\meta{item_3} \ldots \meta{item_n}
% becomes \meta{item_n}\ldots \meta{item_3}\meta{item_2}\meta{item_1}.
-% This process will preserve unprotected space within the
+% This process preserves unprotected space within the
% \meta{token list}. Tokens are not reversed within braced token
% groups, which keep their outer set of braces.
% In situations where performance is important,
@@ -705,7 +704,7 @@
% See also \cs{tl_reverse:N}.
% \begin{texnote}
% The result is returned within \tn{unexpanded}, which means that the token
-% list will not expand further when appearing in an \texttt{x}-type
+% list does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -718,7 +717,7 @@
% Reverses the order of the \meta{items} stored in \meta{tl~var}, so
% that \meta{item_1}\meta{item_2}\meta{item_3} \ldots \meta{item_n}
% becomes \meta{item_n}\ldots \meta{item_3}\meta{item_2}\meta{item_1}.
-% This process will preserve unprotected spaces within the
+% This process preserves unprotected spaces within the
% \meta{token list variable}. Braced token groups are copied without
% reversing the order of tokens, but keep the outer set of braces.
% See also \cs{tl_reverse:n}, and, for improved performance,
@@ -732,7 +731,7 @@
% Reverses the order of the \meta{items} stored in \meta{tl~var},
% so that \Arg{item_1}\Arg{item_2}\Arg{item_3} \ldots \Arg{item_n}
% becomes \Arg{item_n} \ldots{} \Arg{item_3}\Arg{item_2}\Arg{item_1}.
-% This process will remove any unprotected space within the
+% This process removes any unprotected space within the
% \meta{token list}. Braced token groups are copied without
% reversing the order of tokens, and keep the outer set of braces.
% Items which are initially not braced are copied with braces in
@@ -740,7 +739,7 @@
% consider the slower function \cs{tl_reverse:n}.
% \begin{texnote}
% The result is returned within \tn{unexpanded}, which means that the token
-% list will not expand further when appearing in an \texttt{x}-type
+% list does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -756,7 +755,7 @@
% stream.
% \begin{texnote}
% The result is returned within \tn{unexpanded}, which means that the token
-% list will not expand further when appearing in an \texttt{x}-type
+% list does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -799,7 +798,7 @@
% described in Section~\ref{sec:l3sort:mech}.
% \begin{texnote}
% The result is returned within \cs{exp_not:n}, which means that the
-% token list will not expand further when appearing in an
+% token list does not expand further when appearing in an
% \texttt{x}-type argument expansion.
% \end{texnote}
% \end{function}
@@ -826,18 +825,18 @@
% \begin{verbatim}
% \tl_head:n { ~ abc }
% \end{verbatim}
-% will both leave |a| in the input stream. If the \enquote{head} is a
-% brace group, rather than a single token, the braces will be removed, and
+% both leave |a| in the input stream. If the \enquote{head} is a
+% brace group, rather than a single token, the braces are removed, and
% so
% \begin{verbatim}
% \tl_head:n { ~ { ~ ab } c }
% \end{verbatim}
% yields \verb*| ab|.
-% A blank \meta{token list} (see \cs{tl_if_blank:nTF}) will result in
+% A blank \meta{token list} (see \cs{tl_if_blank:nTF}) results in
% \cs{tl_head:n} leaving nothing in the input stream.
% \begin{texnote}
% The result is returned within \cs{exp_not:n}, which means that the token
-% list will not expand further when appearing in an \texttt{x}-type
+% list does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -852,7 +851,7 @@
% (explicit tokens with character code~$32$ and category code~$10$)
% are discarded.
% A blank \meta{token list} (which consists only of space characters)
-% will result in a low-level \TeX{} error, which may be avoided by the
+% results in a low-level \TeX{} error, which may be avoided by the
% inclusion of an empty group in the input (as shown), without the need
% for an explicit test. Alternatively, \cs{tl_if_blank:nF} may be used to
% avoid using the function with a \enquote{blank} argument.
@@ -877,12 +876,12 @@
% \begin{verbatim}
% \tl_tail:n { ~ a ~ {bc} d }
% \end{verbatim}
-% will both leave \verb*| {bc}d| in the input stream. A blank
-% \meta{token list} (see \cs{tl_if_blank:nTF}) will result
+% both leave \verb*| {bc}d| in the input stream. A blank
+% \meta{token list} (see \cs{tl_if_blank:nTF}) results
% in \cs{tl_tail:n} leaving nothing in the input stream.
% \begin{texnote}
% The result is returned within \cs{exp_not:n}, which means that the
-% token list will not expand further when appearing in an \texttt{x}-type
+% token list does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -895,7 +894,7 @@
% \end{syntax}
% Tests if the first \meta{token} in the \meta{token list} has the
% same category code as the \meta{test token}. In the case where the
-% \meta{token list} is empty, the test will always be \texttt{false}.
+% \meta{token list} is empty, the test is always \texttt{false}.
% \end{function}
%
% \begin{function}[updated = 2012-07-09, EXP, pTF]
@@ -907,7 +906,7 @@
% \end{syntax}
% Tests if the first \meta{token} in the \meta{token list} has the
% same character code as the \meta{test token}. In the case where the
-% \meta{token list} is empty, the test will always be \texttt{false}.
+% \meta{token list} is empty, the test is always \texttt{false}.
% \end{function}
%
% \begin{function}[updated = 2012-07-09, EXP, pTF]{\tl_if_head_eq_meaning:nN}
@@ -918,7 +917,7 @@
% \end{syntax}
% Tests if the first \meta{token} in the \meta{token list} has the
% same meaning as the \meta{test token}. In the case where
-% \meta{token list} is empty, the test will always be \texttt{false}.
+% \meta{token list} is empty, the test is always \texttt{false}.
% \end{function}
%
% \begin{function}[added = 2012-07-08, EXP, pTF]{\tl_if_head_is_group:n}
@@ -976,7 +975,7 @@
% \cs{tl_item:nn} \Arg{token list} \Arg{integer expression}
% \end{syntax}
% Indexing items in the \meta{token list} from~$1$ on the left, this
-% function will evaluate the \meta{integer expression} and leave the
+% function evaluates the \meta{integer expression} and leaves the
% appropriate item from the \meta{token list} in the input stream.
% If the \meta{integer expression} is negative, indexing occurs from
% the right of the token list, starting at $-1$ for the right-most item.
@@ -984,7 +983,7 @@
% \begin{texnote}
% The result is returned within the \tn{unexpanded}
% primitive (\cs{exp_not:n}), which means that the \meta{item}
-% will not expand further when appearing in an \texttt{x}-type
+% does not expand further when appearing in an \texttt{x}-type
% argument expansion.
% \end{texnote}
% \end{function}
@@ -1126,7 +1125,7 @@
% \begin{macro}{\tl_clear:N, \tl_clear:c}
% \begin{macro}{\tl_gclear:N, \tl_gclear:c}
% Clearing a token list variable means setting it to an empty value.
-% Error checking will be sorted out by the parent function.
+% Error checking is sorted out by the parent function.
% \begin{macrocode}
\cs_new_protected:Npn \tl_clear:N #1
{ \tl_set_eq:NN #1 \c_empty_tl }
@@ -1141,7 +1140,7 @@
% \begin{macro}{\tl_clear_new:N, \tl_clear_new:c}
% \begin{macro}{\tl_gclear_new:N, \tl_gclear_new:c}
% Clearing a token list variable means setting it to an empty value.
-% Error checking will be sorted out by the parent function.
+% Error checking is sorted out by the parent function.
% \begin{macrocode}
\cs_new_protected:Npn \tl_clear_new:N #1
{ \tl_if_exist:NTF #1 { \tl_clear:N #1 } { \tl_new:N #1 } }
@@ -1332,7 +1331,7 @@
%
% When used as a package, there is an option to be picky and to
% check definitions exist. This part of the process is done now, so that
-% variable types based on |tl| (for example |clist|, |seq| and |prop|) will
+% variable types based on |tl| (for example |clist|, |seq| and |prop|)
% inherit the appropriate definitions.
% No \cs[no-index]{tl_map_\ldots} yet as the mechanisms are not fully in place. Thus
% instead do a more low level set up for a mapping, as in \pkg{l3basics}.
@@ -1452,7 +1451,7 @@
% The standard solution is to use an \texttt{x}-expanding assignment
% and set \tn{everyeof} to \cs{exp_not:N} to suppress the error at
% the end of the file. Since the rescanned tokens should not be
-% expanded, they will be taken as a delimited argument of an
+% expanded, they are taken as a delimited argument of an
% auxiliary which wraps them in \cs{exp_not:n} (in fact
% \cs{exp_not:o}, as there is a \cs{prg_do_nothing:} to avoid losing
% braces). The delimiter cannot appear within the rescanned token
@@ -1536,8 +1535,8 @@
% ignored at the beginning of lines, and spaces and tabs (character
% code $32$ and $9$) are ignored at the end of lines.
%
-% For a single line, no \tn{endlinechar} should be added, so it will
-% be set to $-1$, and spaces should not be removed.
+% For a single line, no \tn{endlinechar} should be added, so it is
+% set to $-1$, and spaces should not be removed.
%
% Trailing spaces and tabs are a difficult matter, as \TeX{} removes
% these at a very low level. The only way to preserve them is to
@@ -1681,7 +1680,7 @@
% \@@_replace_wrap:w,
% }
% To implement the actual replacement auxiliary
-% \cs{@@_replace_auxii:nNNNnn} we will need a \meta{delimiter} with
+% \cs{@@_replace_auxii:nNNNnn} we need a \meta{delimiter} with
% the following properties:
% \begin{itemize}
% \item all occurrences of the \meta{pattern}~|#6| in
@@ -1715,7 +1714,7 @@
% at most $O(n^{3/2})$. Bear in mind that these upper bounds are
% reached only in very contrived scenarios: we include the case
% \enquote{\meta{A}} in the list of delimiters to try, so that the
-% \meta{delimiter} will simply be \cs{q_mark} in the most common
+% \meta{delimiter} is simply \cs{q_mark} in the most common
% situation where neither the \meta{token list} nor the \meta{pattern}
% contains \cs{q_mark}.
%
@@ -1920,7 +1919,7 @@
% \end{macro}
%
% \begin{macro}[pTF]{\tl_if_empty:n, \tl_if_empty:V}
-% Convert the argument to a string: this will be empty if and only if
+% Convert the argument to a string: this is empty if and only if
% the argument is. Then |\if_meaning:w \q_nil ... \q_nil| is
% \texttt{true} if and only if the string |...| is empty.
% It could be tempting to use |\if_meaning:w \q_nil #1 \q_nil| directly.
@@ -2082,10 +2081,10 @@
% there are no odd category codes. An earlier version would compare
% the result to a single~|?| using string comparison, but the Lua call
% is slow in \LuaTeX{}. Instead, \cs{@@_if_single:nnw} picks the
-% second token in front of it. If |#1| is empty, this token will be
+% second token in front of it. If |#1| is empty, this token is
% the trailing~|?| and the catcode test yields \texttt{false}. If
-% |#1| has a single item, the token will be~|^| and the catcode test
-% yields \texttt{true}. Otherwise, it will be one of the characters
+% |#1| has a single item, the token is~|^| and the catcode test
+% yields \texttt{true}. Otherwise, it is one of the characters
% resulting from \cs{tl_to_str:n}, and the catcode test yields
% \texttt{false}. Note that \cs{if_catcode:w} takes care of the
% expansions, and that \cs{tl_to_str:n} (the \tn{detokenize}
@@ -2115,7 +2114,7 @@
% using a known number of expansion steps (two), and without
% needing to use an explicit \enquote{end of recursion} marker.
% That is achieved by using the test input as the final case,
-% as this will always be true. The trick is then to tidy up
+% as this is always true. The trick is then to tidy up
% the output such that the appropriate case code plus either
% the \texttt{true} or \texttt{false} branch code is inserted.
% \begin{macrocode}
@@ -2153,14 +2152,14 @@
\cs_generate_variant:Nn \tl_case:NnTF { c }
% \end{macrocode}
% To tidy up the recursion, there are two outcomes. If there was a hit to
-% one of the cases searched for, then |#1| will be the code to insert,
-% |#2| will be the \emph{next} case to check on and |#3| will be all of
-% the rest of the cases code. That means that |#4| will be the \texttt{true}
-% branch code, and |#5| will be tidy up the spare \cs{q_mark} and the
+% one of the cases searched for, then |#1| is the code to insert,
+% |#2| is the \emph{next} case to check on and |#3| is all of
+% the rest of the cases code. That means that |#4| is the \texttt{true}
+% branch code, and |#5| tidies up the spare \cs{q_mark} and the
% \texttt{false} branch. On the other hand, if none of the cases matched
% then we arrive here using the \enquote{termination} case of comparing
-% the search with itself. That means that |#1| will be empty, |#2| will be
-% the first \cs{q_mark} and so |#4| will be the \texttt{false} code (the
+% the search with itself. That means that |#1| is empty, |#2| is
+% the first \cs{q_mark} and so |#4| is the \texttt{false} code (the
% \texttt{true} code is mopped up by |#3|).
% \begin{macrocode}
\cs_new:Npn \__prg_case_end:nw #1#2#3 \q_mark #4#5 \q_stop
@@ -2180,7 +2179,7 @@
% \begin{macro}[aux]{\@@_map_function:Nn}
% Expandable loop macro for token lists. These have the advantage of not
% needing to test if the argument is empty, because if it is, the stop
-% marker will be read immediately and the loop terminated.
+% marker is read immediately and the loop terminated.
% \begin{macrocode}
\cs_new:Npn \tl_map_function:nN #1#2
{
@@ -2284,7 +2283,7 @@
% \end{macro}
%
% \begin{macro}{\tl_use:N, \tl_use:c}
-% Token lists which are simply not defined will give a clear \TeX{}
+% Token lists which are simply not defined give a clear \TeX{}
% error here. No such luck for ones equal to \cs{scan_stop:} so
% instead a test is made and if there is an issue an error is forced.
% \begin{macrocode}
@@ -2365,10 +2364,10 @@
% Trimming spaces from around the input is deferred to an internal
% function whose first argument is the token list to trim, augmented
% by an initial \cs{q_mark}, and whose second argument is a
-% \meta{continuation}, which will receive as a braced argument
+% \meta{continuation}, which receives as a braced argument
% \cs{use_none:n} \cs{q_mark} \meta{trimmed token list}. In the case
% at hand, we take \cs{exp_not:o} as our continuation, so that space
-% trimming will behave correctly within an \texttt{x}-type expansion.
+% trimming behaves correctly within an \texttt{x}-type expansion.
% \begin{macrocode}
\cs_new:Npn \tl_trim_spaces:n #1
{ \@@_trim_spaces:nn { \q_mark #1 } \exp_not:o }
@@ -2606,7 +2605,7 @@
% \begin{macro}[aux]{\@@_head_auxi:nw, \@@_head_auxii:n}
% \begin{macro}{\tl_head:w}
% \begin{macro}{\tl_tail:N, \tl_tail:n, \tl_tail:V, \tl_tail:v, \tl_tail:f}
-% Finding the head of a token list expandably will always strip braces, which
+% Finding the head of a token list expandably always strips braces, which
% is fine as this is consistent with for example mapping to a list. The
% empty brace groups in \cs{tl_head:n} ensure that a blank argument gives an
% empty result. The result is returned within the \tn{unexpanded} primitive.
@@ -2643,14 +2642,14 @@
\cs_new:Npn \tl_head:w #1#2 \q_stop {#1}
\cs_new:Npn \tl_head:N { \exp_args:No \tl_head:n }
% \end{macrocode}
-% To corrected leave the tail of a token list, it's important \emph{not} to
+% To correctly leave the tail of a token list, it's important \emph{not} to
% absorb any of the tail part as an argument. For example, the simple
% definition
% \begin{verbatim}
% \cs_new:Npn \tl_tail:n #1 { \tl_tail:w #1 \q_stop }
% \cs_new:Npn \tl_tail:w #1#2 \q_stop
% \end{verbatim}
-% will give the wrong result for |\tl_tail:n { a { bc } }| (the braces will
+% would give the wrong result for |\tl_tail:n { a { bc } }| (the braces would
% be stripped). Thus the only safe way to proceed is to first check that
% there is an item to grab (\emph{i.e.}~that the argument is not blank) and
% assuming there is to dispose of the first item. As with \cs{tl_head:n},
@@ -2695,8 +2694,8 @@
% token lists to the \texttt{true} branch of this test). In those
% cases, the first token is a character, and since we only care about
% its character code, we can use \cs{str_head:n} to access it (this
-% works even if it is a space character). An empty argument will
-% result in \cs{tl_head:w} leaving two tokens: |?| which is taken in
+% works even if it is a space character). An empty argument
+% results in \cs{tl_head:w} leaving two tokens: |?| which is taken in
% the \cs{if_charcode:w} test, and \cs{use_none:nn}, which ensures
% that \cs{prg_return_false:} is returned regardless of whether the
% charcode test was \texttt{true} or \texttt{false}.
Modified: trunk/l3kernel/l3token.dtx
===================================================================
--- trunk/l3kernel/l3token.dtx 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/l3token.dtx 2017-06-26 04:00:28 UTC (rev 7310)
@@ -57,11 +57,11 @@
% comes to document commands) is looking ahead in the token stream to
% see if a certain character is present and maybe even remove it or
% disregard other tokens while scanning. This module provides
-% functions for both and as such will have two primary function
+% functions for both and as such has two primary function
% categories: |\token_| for anything that deals with tokens and
% |\peek_| for looking ahead in the token stream.
%
-% Most functions we will describe here can be used on control sequences,
+% Most functions we describe here can be used on control sequences,
% as those are tokens as well.
%
% It is important to distinguish two aspects of a token: its
@@ -78,7 +78,7 @@
% character code. They have the same meaning hence behave identically
% in many situations. However, \TeX{} distinguishes them when searching
% for a delimited argument. Namely, the example function
-% |\show_until_if:w| defined below will take everything until \cs{if:w}
+% |\show_until_if:w| defined below takes everything until \cs{if:w}
% as an argument, despite the presence of other copies of \cs{if:w}
% under different names.
% \begin{verbatim}
@@ -139,7 +139,7 @@
% \item $11$ (letter)
% \item $12$ (other)
% \end{itemize}
-% and other values will raise an error.
+% and other values raise an error.
%
% The \meta{charcode} may be any one valid for the engine in use. Note
% however that for \XeTeX{} releases prior to 0.99992 only the 8-bit
@@ -243,7 +243,7 @@
% \cs{char_set_lccode:nn} \Arg{intexpr_1} \Arg{intexpr_2}
% \end{syntax}
% Sets up the behaviour of the \meta{character} when
-% found inside \cs{tl_to_lowercase:n}, such that \meta{character_1}
+% found inside \cs{tl_lower_case:n}, such that \meta{character_1}
% will be converted into \meta{character_2}. The two \meta{characters}
% may be specified using an \meta{integer expression} for the character code
% concerned. This may include the \TeX{} |`|\meta{character}
@@ -396,7 +396,7 @@
% \cs{token_new:Nn} \meta{token_1} \Arg{token_2}
% \end{syntax}
% Defines \meta{token_1} to globally be a snapshot of \meta{token_2}.
-% This will be an implicit representation of \meta{token_2}.
+% This is an implicit representation of \meta{token_2}.
% \end{function}
%
% \begin{variable}
@@ -439,9 +439,9 @@
% \end{syntax}
% Inserts the current meaning of the \meta{token} into the input
% stream as a series of characters of category code $12$ (other).
-% This will be the primitive \TeX{} description of the \meta{token},
+% This is the primitive \TeX{} description of the \meta{token},
% thus for example both functions defined by \cs{cs_set_nopar:Npn}
-% and token list variables defined using \cs{tl_new:N} will be described
+% and token list variables defined using \cs{tl_new:N} are described
% as |macro|s.
% \begin{texnote}
% This is the \TeX{} primitive \tn{meaning}.
@@ -453,8 +453,8 @@
% \cs{token_to_str:N} \meta{token}
% \end{syntax}
% Converts the given \meta{token} into a series of characters with
-% category code $12$ (other). The current escape character will be
-% the first character in the sequence, although this will also have
+% category code $12$ (other). If the \meta{token} is a control
+% sequence, this will start with the current escape character with
% category code $12$ (the escape character is part of the
% \meta{token}). This function requires only a single expansion.
% \begin{texnote}
@@ -630,8 +630,8 @@
% \cs{token_if_protected_macro_p:N} \meta{token} \\
% \cs{token_if_protected_macro:NTF} \meta{token} \Arg{true code} \Arg{false code}
% \end{syntax}
-% Tests if the \meta{token} is a protected macro: a macro which
-% is both protected and long will return logical \texttt{false}.
+% Tests if the \meta{token} is a protected macro: for a macro which
+% is both protected and long this returns \texttt{false}.
% \end{function}
%
% \begin{function}[EXP,pTF, updated=2012-01-20]{\token_if_protected_long_macro:N}
@@ -650,7 +650,7 @@
% Tests if the \meta{token} is defined to be a chardef.
% \begin{texnote}
% Booleans, boxes and small integer constants are implemented as
-% chardefs.
+% \tn{chardef}s.
% \end{texnote}
% \end{function}
%
@@ -678,7 +678,7 @@
% Tests if the \meta{token} is defined to be a integer register.
% \begin{texnote}
% Constant integers may be implemented as integer registers,
-% chardefs, or mathchardefs depending on their value.
+% \tn{chardef}s, or \tn{mathchardef}s depending on their value.
% \end{texnote}
% \end{function}
%
@@ -730,7 +730,7 @@
% \end{syntax}
% Locally sets the test variable \cs{l_peek_token} equal to \meta{token}
% (as an implicit token, \emph{not} as a token list), and then
-% expands the \meta{function}. The \meta{token} will remain in
+% expands the \meta{function}. The \meta{token} remains in
% the input stream as the next item after the \meta{function}.
% The \meta{token} here may be \verb*| |, |{| or |}| (assuming
% normal \TeX{} category codes), \emph{i.e.}~it is not necessarily the
@@ -743,7 +743,7 @@
% \end{syntax}
% Globally sets the test variable \cs{g_peek_token} equal to \meta{token}
% (as an implicit token, \emph{not} as a token list), and then
-% expands the \meta{function}. The \meta{token} will remain in
+% expands the \meta{function}. The \meta{token} remains in
% the input stream as the next item after the \meta{function}.
% The \meta{token} here may be \verb*| |, |{| or |}| (assuming
% normal \TeX{} category codes), \emph{i.e.}~it is not necessarily the
@@ -767,7 +767,7 @@
% Tests if the next \meta{token} in the input stream has the same
% category code as the \meta{test token} (as defined by the test
% \cs{token_if_eq_catcode:NNTF}). Spaces are respected by the test
-% and the \meta{token} will be left in the input stream after
+% and the \meta{token} is left in the input stream after
% the \meta{true code} or \meta{false code} (as appropriate to the
% result of the test).
% \end{function}
@@ -780,7 +780,7 @@
% same category code as the \meta{test token} (as defined by the test
% \cs{token_if_eq_catcode:NNTF}). Explicit and implicit space tokens
% (with character code 32 and category code 10) are ignored and
-% removed by the test and the \meta{token} will be left in the input
+% removed by the test and the \meta{token} is left in the input
% stream after the \meta{true code} or \meta{false code} (as
% appropriate to the result of the test).
% \end{function}
@@ -792,8 +792,8 @@
% Tests if the next \meta{token} in the input stream has the same
% category code as the \meta{test token} (as defined by the test
% \cs{token_if_eq_catcode:NNTF}). Spaces are respected by the test
-% and the \meta{token} will be removed from the input stream if the
-% test is true. The function will then place either the
+% and the \meta{token} is removed from the input stream if the
+% test is true. The function then places either the
% \meta{true code} or \meta{false code} in the input stream (as
% appropriate to the result of the test).
% \end{function}
@@ -807,8 +807,8 @@
% same category code as the \meta{test token} (as defined by the test
% \cs{token_if_eq_catcode:NNTF}). Explicit and implicit space tokens
% (with character code 32 and category code 10) are ignored and
-% removed by the test and the \meta{token} will be removed from the
-% input stream if the test is true. The function will then place
+% removed by the test and the \meta{token} is removed from the
+% input stream if the test is true. The function then places
% either the \meta{true code} or \meta{false code} in the input stream
% (as appropriate to the result of the test).
% \end{function}
@@ -820,7 +820,7 @@
% Tests if the next \meta{token} in the input stream has the same
% character code as the \meta{test token} (as defined by the test
% \cs{token_if_eq_charcode:NNTF}). Spaces are respected by the test
-% and the \meta{token} will be left in the input stream after
+% and the \meta{token} is left in the input stream after
% the \meta{true code} or \meta{false code} (as appropriate to the
% result of the test).
% \end{function}
@@ -833,7 +833,7 @@
% same character code as the \meta{test token} (as defined by the test
% \cs{token_if_eq_charcode:NNTF}). Explicit and implicit space tokens
% (with character code 32 and category code 10) are ignored and removed by
-% the test and the \meta{token} will be left in the input stream after
+% the test and the \meta{token} is left in the input stream after
% the \meta{true code} or \meta{false code} (as appropriate to the
% result of the test).
% \end{function}
@@ -845,8 +845,8 @@
% Tests if the next \meta{token} in the input stream has the same
% character code as the \meta{test token} (as defined by the test
% \cs{token_if_eq_charcode:NNTF}). Spaces are respected by the test
-% and the \meta{token} will be removed from the input stream if the
-% test is true. The function will then place either the
+% and the \meta{token} is removed from the input stream if the
+% test is true. The function then places either the
% \meta{true code} or \meta{false code} in the input stream (as
% appropriate to the result of the test).
% \end{function}
@@ -861,8 +861,8 @@
% same character code as the \meta{test token} (as defined by the test
% \cs{token_if_eq_charcode:NNTF}). Explicit and implicit space tokens
% (with character code 32 and category code 10) are ignored and
-% removed by the test and the \meta{token} will be removed from the
-% input stream if the test is true. The function will then place
+% removed by the test and the \meta{token} is removed from the
+% input stream if the test is true. The function then places
% either the \meta{true code} or \meta{false code} in the input stream
% (as appropriate to the result of the test).
% \end{function}
@@ -874,7 +874,7 @@
% Tests if the next \meta{token} in the input stream has the same
% meaning as the \meta{test token} (as defined by the test
% \cs{token_if_eq_meaning:NNTF}). Spaces are respected by the test
-% and the \meta{token} will be left in the input stream after
+% and the \meta{token} is left in the input stream after
% the \meta{true code} or \meta{false code} (as appropriate to the
% result of the test).
% \end{function}
@@ -887,7 +887,7 @@
% same meaning as the \meta{test token} (as defined by the test
% \cs{token_if_eq_meaning:NNTF}). Explicit and implicit space tokens
% (with character code 32 and category code 10) are ignored and
-% removed by the test and the \meta{token} will be left in the input
+% removed by the test and the \meta{token} is left in the input
% stream after the \meta{true code} or \meta{false code} (as
% appropriate to the result of the test).
% \end{function}
@@ -899,8 +899,8 @@
% Tests if the next \meta{token} in the input stream has the same
% meaning as the \meta{test token} (as defined by the test
% \cs{token_if_eq_meaning:NNTF}). Spaces are respected by the test
-% and the \meta{token} will be removed from the input stream if the
-% test is true. The function will then place either the
+% and the \meta{token} is removed from the input stream if the
+% test is true. The function then places either the
% \meta{true code} or \meta{false code} in the input stream (as
% appropriate to the result of the test).
% \end{function}
@@ -915,8 +915,8 @@
% same meaning as the \meta{test token} (as defined by the test
% \cs{token_if_eq_meaning:NNTF}). Explicit and implicit space tokens
% (with character code 32 and category code 10) are ignored and
-% removed by the test and the \meta{token} will be removed from the
-% input stream if the test is true. The function will then place
+% removed by the test and the \meta{token} is removed from the
+% input stream if the test is true. The function then places
% either the \meta{true code} or \meta{false code} in the input stream
% (as appropriate to the result of the test).
% \end{function}
@@ -932,18 +932,18 @@
% \begin{syntax}
% \cs{token_get_arg_spec:N} \meta{token}
% \end{syntax}
-% If the \meta{token} is a macro, this function will leave
+% If the \meta{token} is a macro, this function leaves
% the primitive \TeX{} argument specification in input stream as
% a string of tokens of category code $12$ (with spaces having category
% code $10$). Thus for example for a token \cs{next} defined by
% \begin{verbatim}
% \cs_set:Npn \next #1#2 { x #1 y #2 }
% \end{verbatim}
-% will leave |#1#2| in the input stream. If the \meta{token} is
-% not a macro then \cs{scan_stop:} will be left in the input stream.
+% leaves |#1#2| in the input stream. If the \meta{token} is
+% not a macro then \cs{scan_stop:} is left in the input stream.
% \begin{texnote}
% If the arg~spec. contains the string |->|, then the |spec| function
-% will produce incorrect results.
+% produces incorrect results.
% \end{texnote}
% \end{function}
%
@@ -951,18 +951,18 @@
% \begin{syntax}
% \cs{token_get_replacement_spec:N} \meta{token}
% \end{syntax}
-% If the \meta{token} is a macro, this function will leave
+% If the \meta{token} is a macro, this function leaves
% the replacement text in input stream as
% a string of tokens of category code $12$ (with spaces having category
% code $10$). Thus for example for a token \cs{next} defined by
% \begin{verbatim}
% \cs_set:Npn \next #1#2 { x #1~y #2 }
% \end{verbatim}
-% will leave \verb|x#1 y#2| in the input stream. If the \meta{token} is
-% not a macro then \cs{scan_stop:} will be left in the input stream.
+% leaves \verb|x#1 y#2| in the input stream. If the \meta{token} is
+% not a macro then \cs{scan_stop:} is left in the input stream.
% \begin{texnote}
% If the arg~spec. contains the string |->|, then the |spec| function
-% will produce incorrect results.
+% produces incorrect results.
% \end{texnote}
% \end{function}
%
@@ -970,15 +970,15 @@
% \begin{syntax}
% \cs{token_get_prefix_spec:N} \meta{token}
% \end{syntax}
-% If the \meta{token} is a macro, this function will leave
+% If the \meta{token} is a macro, this function leaves
% the \TeX{} prefixes applicable in input stream as
% a string of tokens of category code $12$ (with spaces having category
% code $10$). Thus for example for a token \cs{next} defined by
% \begin{verbatim}
% \cs_set:Npn \next #1#2 { x #1~y #2 }
% \end{verbatim}
-% will leave |\long| in the input stream. If the \meta{token} is
-% not a macro then \cs{scan_stop:} will be left in the input stream
+% leaves |\long| in the input stream. If the \meta{token} is
+% not a macro then \cs{scan_stop:} is left in the input stream
% \end{function}
%
% \section{Description of all possible tokens}
@@ -1011,7 +1011,7 @@
% There are also a few internal tokens. The following list may be
% incomplete in some engines.
% \begin{itemize}
-% \item Expanding \tn{the}\th{font} results in a token that looks
+% \item Expanding \tn{the}\tn{font} results in a token that looks
% identical to the command that was used to select the current font
% (such as \tn{tenrm}) but it differs from it in shape.
% \item A \enquote{frozen} |\relax|, which differs from the primitive in
@@ -1030,7 +1030,7 @@
% \end{itemize}
%
% The meaning of a (non-active) character token is fixed by its category
-% code (and character code) and cannot be changed. We will call these
+% code (and character code) and cannot be changed. We call these
% tokens \emph{explicit} character tokens. Category codes that a
% character token can have are listed below by giving a sample output of
% the \TeX{} primitive \tn{meaning}, together with their \LaTeX3 names
@@ -1055,7 +1055,7 @@
%
% The meaning of a control sequence or active character can be identical
% to that of any character token listed above (with any character code),
-% and we will call such tokens \emph{implicit} character tokens. The
+% and we call such tokens \emph{implicit} character tokens. The
% meaning is otherwise in the following list:
% \begin{itemize}
% \item a macro, used in \LaTeX3 for most functions and some variables
@@ -1499,9 +1499,9 @@
\char_set_catcode_math_toggle:n { 0 }
\tl_put_right:Nn \l_@@_tmp_tl { \or: ^^@ }
% \end{macrocode}
-% As \TeX{} will be very unhappy if if finds an alignment character inside
+% As \TeX{} is very unhappy if if finds an alignment character inside
% a primitive \tn{halign} even when skipping false branches, some precautions
-% are required. \TeX{} will be happy if the token is hidden inside
+% are required. \TeX{} is happy if the token is hidden inside
% \tn{unexpanded} (which needs to be the primitive). The expansion chain here
% is required so that the conditional gets cleaned up correctly (other code
% assumes there is exactly one token to skip during the clean-up).
@@ -1715,7 +1715,7 @@
% avoid an error message: within a group we prevent
% \cs{c_parameter_token} from behaving like a macro parameter character.
% The definitions of \cs{prg_new_conditional:Npnn} are global, so they
-% will remain after the group.
+% remain after the group.
% \begin{macrocode}
\group_begin:
\cs_set_eq:NN \c_parameter_token \scan_stop:
@@ -1838,7 +1838,7 @@
%
% \begin{macro}[pTF]{\token_if_macro:N}
% \begin{macro}[aux]{\@@_if_macro_p:w}
-% When a token is a macro, \cs{token_to_meaning:N} will always output
+% When a token is a macro, \cs{token_to_meaning:N} always outputs
% something like |\long macro:#1->#1| so we could naively check to
% see if the meaning contains |->|. However, this can fail the five
% \tn[no-index]{...mark} primitives, whose meaning has the form
@@ -1901,8 +1901,8 @@
% \end{macro}
%
% \begin{macro}[pTF]{\token_if_expandable:N}
-% Check if token is expandable. We use the fact that \TeX{} will
-% temporarily convert \cs{exp_not:N} \meta{token} into \cs{scan_stop:}
+% Check if token is expandable. We use the fact that \TeX{}
+% temporarily converts \cs{exp_not:N} \meta{token} into \cs{scan_stop:}
% if \meta{token} is expandable. An \texttt{undefined} token is not
% considered as expandable. No problem nesting the conditionals,
% since the third |#1| is only skipped if it is non-expandable (hence
@@ -1938,7 +1938,7 @@
% argument begins with a particular string. Each auxiliary takes an
% argument delimited by a string, a second one delimited by
% \cs{q_stop}, and returns the first one and its delimiter.
-% This result will eventually be compared to another string.
+% This result is eventually compared to another string.
% \begin{macrocode}
\group_begin:
\cs_set_protected:Npn \@@_tmp:w #1
@@ -2088,7 +2088,7 @@
%
% We start by removing the two first (non-space) characters from
% the meaning. This removes the escape character (which may be
-% inexistent depending on \tn{endlinechar}), and takes care
+% nonexistent depending on \tn{endlinechar}), and takes care
% of three of the exceptions: \tn{space}, \tn{italiccorr}
% and \tn{hyphen}, whose meaning is at most two characters.
% This leaves a string terminated by some |:|, and \cs{q_stop}.
@@ -2336,7 +2336,7 @@
% The catcode and charcode tests are very similar, and in order to use
% the same auxiliaries we do something a little bit odd, firing
% \cs{if_catcode:w} and \cs{if_charcode:w} before finding the operands
-% for those tests, which will only be given in the |auxii:N| and
+% for those tests, which are only given in the |auxii:N| and
% |auxiii:| auxiliaries. For our purposes, three kinds of tokens may
% follow the peeking function:
% \begin{itemize}
Modified: trunk/l3kernel/source3.tex
===================================================================
--- trunk/l3kernel/source3.tex 2017-06-26 00:05:10 UTC (rev 7309)
+++ trunk/l3kernel/source3.tex 2017-06-26 04:00:28 UTC (rev 7310)
@@ -37,8 +37,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% This document will typeset the LaTeX3 sources as a single document.
-% This will produce quite a large file (more than 780 pages).
+% This document typesets the LaTeX3 sources as a single document.
+% This produces quite a large file (more than 780 pages).
%
% There is also a shorter version (interface3.tex) that only typesets the
% command % interface descriptions.
More information about the latex3-commits
mailing list