diff options
author | Karl Berry <karl@freefriends.org> | 2017-07-15 21:27:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-07-15 21:27:01 +0000 |
commit | b1ce47fe4d0e1f06d1b019c3c6eb5f1b0ecd5e14 (patch) | |
tree | 58362abe4b603bb5f6db898b9b835bc8af730b3e /Master/texmf-dist/source/latex/l3kernel/l3skip.dtx | |
parent | 03b8dcfa3435f0265dfad4fd09aaab8f4ff9c617 (diff) |
l3 (15jul17)
git-svn-id: svn://tug.org/texlive/trunk@44813 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3skip.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3skip.dtx | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx index e43dd6320b6..8f2e175ecaa 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2017/05/29} +% \date{Released 2017/07/15} % % \maketitle % @@ -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} @@ -267,7 +267,8 @@ % This function evaluates the \meta{test dimension expression} and % compares this in turn to each of the % \meta{dimension expression cases}. If the two are equal then the -% associated \meta{code} is left in the input stream. If any of the +% associated \meta{code} is left in the input stream +% and other cases are discarded. If any of the % cases are matched, the \meta{true code} is also inserted into the % input stream (after the code for the appropriate case), while if none % match then the \meta{false code} is inserted. The function @@ -284,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} @@ -296,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} % @@ -308,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} % @@ -321,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} % @@ -333,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} % @@ -344,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} % @@ -356,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} % @@ -369,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} % @@ -381,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} % @@ -396,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} @@ -407,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}). @@ -459,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] @@ -497,7 +498,7 @@ % the \meta{dimexpr} in \texttt{pt}. Since dimension expressions are % evaluated much faster than their floating point equivalent, % \cs{dim_to_fp:n} can be used to speed up parts of a computation -% where a low precision is acceptable. +% where a low precision and a smaller range are acceptable. % \end{function} % % \section{Viewing \texttt{dim} variables} @@ -568,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} @@ -576,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} % @@ -685,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} % @@ -695,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}). @@ -798,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} @@ -806,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} % @@ -897,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} % @@ -907,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}). @@ -1208,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. @@ -1216,7 +1217,7 @@ \cs_new:Npn \dim_ratio:nn #1#2 { \@@_ratio:n {#1} / \@@_ratio:n {#2} } \cs_new:Npn \@@_ratio:n #1 - { \__int_value:w \@@_eval:w #1 \@@_eval_end: } + { \__int_value:w \@@_eval:w (#1) \@@_eval_end: } % \end{macrocode} % \end{macro} % \end{macro} |