summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-16 22:35:41 +0000
committerKarl Berry <karl@freefriends.org>2011-09-16 22:35:41 +0000
commit6d95b4a2c1bbdaea1a3802c822808f476ac5703b (patch)
tree1abf9117bf53f2de53fbcc62c352acc92780365b /Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
parentb7f762397f5df2d732326713423e31e1bf91b903 (diff)
l3kernel 2828 (15sep11)
git-svn-id: svn://tug.org/texlive/trunk@23983 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.dtx148
1 files changed, 68 insertions, 80 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
index 8655a41201c..5c3263f4227 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
@@ -9,7 +9,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3skip.dtx 2665 2011-08-25 22:15:27Z joseph $
+\GetIdInfo$Id: l3skip.dtx 2818 2011-09-12 14:47:38Z will $
{L3 Experimental dimensions and skips}
%</driver|package>
%<*driver>
@@ -140,7 +140,7 @@
% component (for example |1 cm plus 0.5 cm|. This assignment is
% global and is not limited to the current \TeX{} group level.
% \end{function}
-%
+%
% \begin{function}
% {\dim_set_eq:NN, \dim_set_eq:cN, \dim_set_eq:Nc, \dim_set_eq:cc}
% \begin{syntax}
@@ -214,9 +214,9 @@
% Subtracts the result of the \meta{dimension expression} to the
% current content of the \meta{dimension}. This assignment is global.
% \end{function}
-%
+%
% \section{Utilities for dimension calculations}
-%
+%
% \begin{function}[EXP]{\dim_ratio:nn}
% \begin{syntax}
% \cs{dim_ratio:nn} \Arg{dimexpr1} \Arg{dimexpr2}
@@ -230,7 +230,7 @@
% \end{verbatim}
% The output of \cs{dim_ratio:nn} on full expansion is a ration expression
% between two integers, with all distances converted to scaled points.
-% Thus
+% Thus
% \begin{verbatim}
% \tl_set:Nx \l_my_tl { \dim_ratio:nn { 5 pt } { 10 pt } }
% \tl_show:N \l_my_tl
@@ -242,8 +242,7 @@
%
% \begin{function}[EXP,pTF]{\dim_compare:nNn}
% \begin{syntax}
-% \cs{dim_compare_p:nNn}
-% ~~\Arg{dimexpr1} \meta{relation} \Arg{dimexpr2}
+% \cs{dim_compare_p:nNn} \Arg{dimexpr1} \meta{relation} \Arg{dimexpr2} \\
% \cs{dim_compare:nNnTF}
% ~~\Arg{dimexpr1} \meta{relation} \Arg{dimexpr2}
% ~~\Arg{true code} \Arg{false code}
@@ -262,8 +261,7 @@
%
% \begin{function}[EXP,pTF]{\dim_compare:n}
% \begin{syntax}
-% \cs{dim_compare_p:n}
-% ~~\{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \}
+% \cs{dim_compare_p:n} \{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \} \\
% \cs{dim_compare:nTF}
% ~~\{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \}
% ~~\Arg{true code} \Arg{false code}
@@ -285,10 +283,9 @@
%
% \section{Dimension expression loops}
%
-% \begin{function}[EXP]{\dim_do_while:nNnn}
+% \begin{function}[rEXP]{\dim_do_while:nNnn}
% \begin{syntax}
-% \cs{dim_do_while:nNnn}
-% ~~\Arg{dimexpr1} \meta{relation} \Arg{dimexpr2} \Arg{code}
+% \cs{dim_do_while:nNnn} \Arg{dimexpr1} \meta{relation} \Arg{dimexpr2} \Arg{code}
% \end{syntax}
% Evaluates the relationship between the two \meta{dimension expressions}
% as described for \cs{dim_compare:nNnTF}, and then places the
@@ -298,10 +295,9 @@
% \texttt{false}.
% \end{function}
%
-% \begin{function}[EXP]{\dim_do_until:nNnn}
+% \begin{function}[rEXP]{\dim_do_until:nNnn}
% \begin{syntax}
-% \cs{dim_do_until:nNnn}
-% ~~\Arg{dimexpr1} \meta{relation} \Arg{dimexpr2} \Arg{code}
+% \cs{dim_do_until:nNnn} \Arg{dimexpr1} \meta{relation} \Arg{dimexpr2} \Arg{code}
% \end{syntax}
% Evaluates the relationship between the two \meta{dimension expressions}
% as described for \cs{dim_compare:nNnTF}, and then places the
@@ -311,10 +307,9 @@
% \texttt{true}.
% \end{function}
%
-% \begin{function}[EXP]{\dim_until_do:nNnn}
+% \begin{function}[rEXP]{\dim_until_do:nNnn}
% \begin{syntax}
-% \cs{dim_until_do:nNnn}
-% ~~\Arg{dimexpr1} \meta{relation} \Arg{dimexpr2} \Arg{code}
+% \cs{dim_until_do:nNnn} \Arg{dimexpr1} \meta{relation} \Arg{dimexpr2} \Arg{code}
% \end{syntax}
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the relationship between the two
@@ -324,10 +319,9 @@
% \meta{relation} is \texttt{true}.
% \end{function}
%
-% \begin{function}[EXP]{\dim_while_do:nNnn}
+% \begin{function}[rEXP]{\dim_while_do:nNnn}
% \begin{syntax}
-% \cs{dim_while_do:nNnn}
-% ~~\Arg{dimexpr1} \meta{relation} \Arg{dimexpr2} \Arg{code}
+% \cs{dim_while_do:nNnn} \Arg{dimexpr1} \meta{relation} \Arg{dimexpr2} \Arg{code}
% \end{syntax}
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the relationship between the two
@@ -337,10 +331,9 @@
% \meta{relation} is \texttt{false}.
% \end{function}
%
-% \begin{function}[EXP]{\dim_do_while:nn}
+% \begin{function}[rEXP]{\dim_do_while:nn}
% \begin{syntax}
-% \cs{dim_do_while:nNnn}
-% ~~\{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \} \Arg{code}
+% \cs{dim_do_while:nNnn} \{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \} \Arg{code}
% \end{syntax}
% Evaluates the relationship between the two \meta{dimension expressions}
% as described for \cs{dim_compare:nTF}, and then places the
@@ -350,10 +343,9 @@
% \texttt{false}.
% \end{function}
%
-% \begin{function}[EXP]{\dim_do_until:nn}
+% \begin{function}[rEXP]{\dim_do_until:nn}
% \begin{syntax}
-% \cs{dim_do_until:nn}
-% ~~\{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \} \Arg{code}
+% \cs{dim_do_until:nn} \{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \} \Arg{code}
% \end{syntax}
% Evaluates the relationship between the two \meta{dimension expressions}
% as described for \cs{dim_compare:nTF}, and then places the
@@ -363,10 +355,9 @@
% \texttt{true}.
% \end{function}
%
-% \begin{function}[EXP]{\dim_until_do:nn}
+% \begin{function}[rEXP]{\dim_until_do:nn}
% \begin{syntax}
-% \cs{dim_until_do:nn}
-% ~~\{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \} \Arg{code}
+% \cs{dim_until_do:nn} \{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \} \Arg{code}
% \end{syntax}
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the relationship between the two
@@ -376,10 +367,9 @@
% \meta{relation} is \texttt{true}.
% \end{function}
%
-% \begin{function}[EXP]{\dim_while_do:nn}
+% \begin{function}[rEXP]{\dim_while_do:nn}
% \begin{syntax}
-% \cs{dim_while_do:nn}
-% ~~\{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \} \Arg{code}
+% \cs{dim_while_do:nn} \{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \} \Arg{code}
% \end{syntax}
% Places the \meta{code} in the input stream for \TeX{} to process, and
% then evaluates the relationship between the two
@@ -416,7 +406,7 @@
% \meta{dimension} is required (such as in the argument of
% \cs{dim_eval:n}).
% \begin{texnote}
-% \cs{dim_use:N} is the \TeX{} primitive \cs{the}: this is one of
+% \cs{dim_use:N} is the \TeX{} primitive \tn{the}: this is one of
% several \LaTeX3 names for this primitive.
% \end{texnote}
% \end{function}
@@ -512,16 +502,6 @@
% restricted to the current \TeX{} group.
% \end{function}
%
-% \begin{function}
-% {\skip_gset_eq:NN, \skip_gset_eq:cN, \skip_gset_eq:Nc, \skip_gset_eq:cc}
-% \begin{syntax}
-% \cs{skip_gset_eq:NN} \meta{skip1} \meta{skip2}
-% \end{syntax}
-% Sets the content of \meta{skip1} equal to that of \meta{skip2}.
-% This assignment is global and so is not limited by the current
-% \TeX{} group level.
-% \end{function}
-%
% \begin{function}{\skip_gset:Nn, \skip_gset:cn}
% \begin{syntax}
% \cs{skip_gset:Nn} \meta{skip} \Arg{skip expression}
@@ -531,7 +511,7 @@
% component (for example |1 cm plus 0.5 cm|. This assignment is
% global and is not limited to the current \TeX{} group level.
% \end{function}
-%
+%
% \begin{function}
% {\skip_set_eq:NN, \skip_set_eq:cN, \skip_set_eq:Nc, \skip_set_eq:cc}
% \begin{syntax}
@@ -542,6 +522,16 @@
% \TeX{} group level.
% \end{function}
%
+% \begin{function}
+% {\skip_gset_eq:NN, \skip_gset_eq:cN, \skip_gset_eq:Nc, \skip_gset_eq:cc}
+% \begin{syntax}
+% \cs{skip_gset_eq:NN} \meta{skip1} \meta{skip2}
+% \end{syntax}
+% Sets the content of \meta{skip1} equal to that of \meta{skip2}.
+% This assignment is global and so is not limited by the current
+% \TeX{} group level.
+% \end{function}
+%
% \begin{function}{\skip_sub:Nn, \skip_sub:cn}
% \begin{syntax}
% \cs{skip_sub:Nn} \meta{skip} \Arg{skip expression}
@@ -562,10 +552,9 @@
%
% \begin{function}[EXP,pTF]{\skip_if_eq:nn}
% \begin{syntax}
-% \cs{skip_if_eq_p:nn}
-% ~~\Arg{skipexpr1} \Arg{skipexpr2}
+% \cs{skip_if_eq_p:nn} \Arg{skipexpr1} \Arg{skipexpr2}
% \cs{dim_compare:nTF}
-% ~~\Arg{skipexpr1} \Arg{skipexpr2}
+% ~~\Arg{skip expr1} \Arg{skip expr2}
% ~~\Arg{true code} \Arg{false code}
% \end{syntax}
% This function first evaluates each of the
@@ -578,8 +567,7 @@
% \begin{function}[EXP,pTF]{\skip_if_infinite_glue:n}
% \begin{syntax}
% \cs{skip_if_infinite_glue_p:n} \Arg{skipexpr}
-% \cs{skip_if_infinite_glue:nTF} \Arg{skipexpr}
-% ~~\Arg{true code} \Arg{false code}
+% \cs{skip_if_infinite_glue:nTF} \Arg{skipexpr} \Arg{true code} \Arg{false code}
% \end{syntax}
% Evaluates the \meta{skip expression} as described for \cs{skip_eval:n},
% and then tests if this contains an infinite stretch or shrink
@@ -612,7 +600,7 @@
% \meta{dimension} is required (such as in the argument of
% \cs{skip_eval:n}).
% \begin{texnote}
-% \cs{skip_use:N} is the \TeX{} primitive \cs{the}: this is one of
+% \cs{skip_use:N} is the \TeX{} primitive \tn{the}: this is one of
% several \LaTeX3 names for this primitive.
% \end{texnote}
% \end{function}
@@ -717,7 +705,7 @@
% component (for example |1 mu plus 0.5 mu|. This assignment is
% global and is not limited to the current \TeX{} group level.
% \end{function}
-%
+%
% \begin{function}
% {
% \muskip_set_eq:NN, \muskip_set_eq:cN,
@@ -786,7 +774,7 @@
% \meta{dimension} is required (such as in the argument of
% \cs{muskip_eval:n}).
% \begin{texnote}
-% \cs{muskip_use:N} is the \TeX{} primitive \cs{the}: this is one of
+% \cs{muskip_use:N} is the \TeX{} primitive \tn{the}: this is one of
% several \LaTeX3 names for this primitive.
% \end{texnote}
% \end{function}
@@ -800,7 +788,7 @@
% \end{syntax}
% Inserts a horizontal \meta{skip} into the current list.
% \begin{texnote}
-% \cs{skip_horizontal:N} is the \TeX{} primitive \cs{hskip} renamed.
+% \cs{skip_horizontal:N} is the \TeX{} primitive \tn{hskip} renamed.
% \end{texnote}
% \end{function}
%
@@ -811,7 +799,7 @@
% \end{syntax}
% Inserts a vertical \meta{skip} into the current list.
% \begin{texnote}
-% \cs{skip_vertical:N} is the \TeX{} primitive \cs{vskip} renamed.
+% \cs{skip_vertical:N} is the \TeX{} primitive \tn{vskip} renamed.
% \end{texnote}
% \end{function}
%
@@ -837,10 +825,10 @@
% Compare two dimensions. The \meta{relation} is one of
% |<|, |=| or |>| with category code $12$.
% \begin{texnote}
-% This is the \TeX{} primitive \cs{ifdim}.
+% This is the \TeX{} primitive \tn{ifdim}.
% \end{texnote}
% \end{function}
-%
+%
% \begin{function}[EXP]{\dim_eval:w, \dim_eval_end:}
% \begin{syntax}
% \cs{dim_eval:w} \meta{dimexpr} \cs{dim_eval_end:}
@@ -852,7 +840,7 @@
% \cs{dim_eval_end:} itself is unexpandable but used correctly
% the entire construct is expandable.
% \begin{texnote}
-% This is the \eTeX{} primitive \cs{dimexpr}.
+% This is the \eTeX{} primitive \tn{dimexpr}.
% \end{texnote}
% \end{function}
%
@@ -926,7 +914,7 @@
% Reset the register to zero.
% \begin{macrocode}
\cs_new_protected_nopar:Npn \dim_zero:N #1 { #1 \c_zero_dim }
-\cs_new_protected_nopar:Npn \dim_gzero:N { \pref_global:D \dim_zero:N }
+\cs_new_protected_nopar:Npn \dim_gzero:N { \tex_global:D \dim_zero:N }
\cs_generate_variant:Nn \dim_zero:N { c }
\cs_generate_variant:Nn \dim_gzero:N { c }
% \end{macrocode}
@@ -941,13 +929,13 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \dim_set:Nn #1#2
{ #1 ~ \dim_eval:w #2 \dim_eval_end: }
-\cs_new_protected_nopar:Npn \dim_gset:Nn { \pref_global:D \dim_set:Nn }
+\cs_new_protected_nopar:Npn \dim_gset:Nn { \tex_global:D \dim_set:Nn }
\cs_generate_variant:Nn \dim_set:Nn { c }
\cs_generate_variant:Nn \dim_gset:Nn { c }
% \end{macrocode}
% \end{macro}
% \end{macro}
-%
+%
% \begin{macro}{\dim_set_eq:NN,\dim_set_eq:cN, \dim_set_eq:Nc,\dim_set_eq:cc}
% \begin{macro}
% {\dim_gset_eq:NN,\dim_gset_eq:cN, \dim_gset_eq:Nc,\dim_gset_eq:cc}
@@ -956,7 +944,7 @@
\cs_new_protected_nopar:Npn \dim_set_eq:NN #1#2 { #1 = #2 }
\cs_generate_variant:Nn \dim_set_eq:NN { c }
\cs_generate_variant:Nn \dim_set_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \dim_gset_eq:NN #1#2 { \pref_global:D #1 = #2 }
+\cs_new_protected_nopar:Npn \dim_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
\cs_generate_variant:Nn \dim_gset_eq:NN { c }
\cs_generate_variant:Nn \dim_gset_eq:NN { Nc , cc }
% \end{macrocode}
@@ -996,12 +984,12 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \dim_add:Nn #1#2
{ \tex_advance:D #1 by \dim_eval:w #2 \dim_eval_end: }
-\cs_new_protected_nopar:Npn \dim_gadd:Nn { \pref_global:D \dim_add:Nn }
+\cs_new_protected_nopar:Npn \dim_gadd:Nn { \tex_global:D \dim_add:Nn }
\cs_generate_variant:Nn \dim_add:Nn { c }
\cs_generate_variant:Nn \dim_gadd:Nn { c }
\cs_new_protected_nopar:Npn \dim_sub:Nn #1#2
{ \tex_advance:D #1 by - \dim_eval:w #2 \dim_eval_end: }
-\cs_new_protected_nopar:Npn \dim_gsub:Nn { \pref_global:D \dim_sub:Nn }
+\cs_new_protected_nopar:Npn \dim_gsub:Nn { \tex_global:D \dim_sub:Nn }
\cs_generate_variant:Nn \dim_sub:Nn { c }
\cs_generate_variant:Nn \dim_gsub:Nn { c }
% \end{macrocode}
@@ -1009,7 +997,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
-%
+%
% \subsection{Utilities for dimension calculations}
%
% \begin{macro}{\dim_ratio:nn}
@@ -1273,7 +1261,7 @@
% The source for these depends on whether we are in package mode.
% \begin{macrocode}
%<*initex>
-\dim_new:N \c_zero_dim
+\dim_new:N \c_zero_dim
\dim_new:N \c_max_dim
\dim_set:Nn \c_max_dim { 16383.99999 pt }
%</initex>
@@ -1322,7 +1310,7 @@
% Reset the register to zero.
% \begin{macrocode}
\cs_new_protected_nopar:Npn \skip_zero:N #1 { #1 \c_zero_skip }
-\cs_new_protected_nopar:Npn \skip_gzero:N { \pref_global:D \skip_zero:N }
+\cs_new_protected_nopar:Npn \skip_gzero:N { \tex_global:D \skip_zero:N }
\cs_generate_variant:Nn \skip_zero:N { c }
\cs_generate_variant:Nn \skip_gzero:N { c }
% \end{macrocode}
@@ -1337,13 +1325,13 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \skip_set:Nn #1#2
{ #1 ~ \etex_glueexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \skip_gset:Nn { \pref_global:D \skip_set:Nn }
+\cs_new_protected_nopar:Npn \skip_gset:Nn { \tex_global:D \skip_set:Nn }
\cs_generate_variant:Nn \skip_set:Nn { c }
\cs_generate_variant:Nn \skip_gset:Nn { c }
% \end{macrocode}
% \end{macro}
% \end{macro}
-%
+%
% \begin{macro}
% {\skip_set_eq:NN,\skip_set_eq:cN, \skip_set_eq:Nc,\skip_set_eq:cc}
% \begin{macro}
@@ -1353,7 +1341,7 @@
\cs_new_protected_nopar:Npn \skip_set_eq:NN #1#2 { #1 = #2 }
\cs_generate_variant:Nn \skip_set_eq:NN { c }
\cs_generate_variant:Nn \skip_set_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \skip_gset_eq:NN #1#2 { \pref_global:D #1 = #2 }
+\cs_new_protected_nopar:Npn \skip_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
\cs_generate_variant:Nn \skip_gset_eq:NN { c }
\cs_generate_variant:Nn \skip_gset_eq:NN { Nc , cc }
% \end{macrocode}
@@ -1368,12 +1356,12 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \skip_add:Nn #1#2
{ \tex_advance:D #1 by \etex_glueexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \skip_gadd:Nn { \pref_global:D \skip_add:Nn }
+\cs_new_protected_nopar:Npn \skip_gadd:Nn { \tex_global:D \skip_add:Nn }
\cs_generate_variant:Nn \skip_add:Nn { c }
\cs_generate_variant:Nn \skip_gadd:Nn { c }
\cs_new_protected_nopar:Npn \skip_sub:Nn #1#2
{ \tex_advance:D #1 by - \etex_glueexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \skip_gsub:Nn { \pref_global:D \skip_sub:Nn }
+\cs_new_protected_nopar:Npn \skip_gsub:Nn { \tex_global:D \skip_sub:Nn }
\cs_generate_variant:Nn \skip_sub:Nn { c }
\cs_generate_variant:Nn \skip_gsub:Nn { c }
% \end{macrocode}
@@ -1519,7 +1507,7 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \muskip_zero:N #1
{ #1 \c_zero_muskip }
-\cs_new_protected_nopar:Npn \muskip_gzero:N { \pref_global:D \muskip_zero:N }
+\cs_new_protected_nopar:Npn \muskip_gzero:N { \tex_global:D \muskip_zero:N }
\cs_generate_variant:Nn \muskip_zero:N { c }
\cs_generate_variant:Nn \muskip_gzero:N { c }
% \end{macrocode}
@@ -1534,13 +1522,13 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \muskip_set:Nn #1#2
{ #1 ~ \etex_muexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \muskip_gset:Nn { \pref_global:D \muskip_set:Nn }
+\cs_new_protected_nopar:Npn \muskip_gset:Nn { \tex_global:D \muskip_set:Nn }
\cs_generate_variant:Nn \muskip_set:Nn { c }
\cs_generate_variant:Nn \muskip_gset:Nn { c }
% \end{macrocode}
% \end{macro}
% \end{macro}
-%
+%
% \begin{macro}
% {
% \muskip_set_eq:NN, \muskip_set_eq:cN,
@@ -1556,7 +1544,7 @@
\cs_new_protected_nopar:Npn \muskip_set_eq:NN #1#2 { #1 = #2 }
\cs_generate_variant:Nn \muskip_set_eq:NN { c }
\cs_generate_variant:Nn \muskip_set_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \muskip_gset_eq:NN #1#2 { \pref_global:D #1 = #2 }
+\cs_new_protected_nopar:Npn \muskip_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
\cs_generate_variant:Nn \muskip_gset_eq:NN { c }
\cs_generate_variant:Nn \muskip_gset_eq:NN { Nc , cc }
% \end{macrocode}
@@ -1571,12 +1559,12 @@
% \begin{macrocode}
\cs_new_protected_nopar:Npn \muskip_add:Nn #1#2
{ \tex_advance:D #1 by \etex_muexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \muskip_gadd:Nn { \pref_global:D \muskip_add:Nn }
+\cs_new_protected_nopar:Npn \muskip_gadd:Nn { \tex_global:D \muskip_add:Nn }
\cs_generate_variant:Nn \muskip_add:Nn { c }
\cs_generate_variant:Nn \muskip_gadd:Nn { c }
\cs_new_protected_nopar:Npn \muskip_sub:Nn #1#2
{ \tex_advance:D #1 by - \etex_muexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \muskip_gsub:Nn { \pref_global:D \muskip_sub:Nn }
+\cs_new_protected_nopar:Npn \muskip_gsub:Nn { \tex_global:D \muskip_sub:Nn }
\cs_generate_variant:Nn \muskip_sub:Nn { c }
\cs_generate_variant:Nn \muskip_gsub:Nn { c }
% \end{macrocode}
@@ -1617,7 +1605,7 @@
%
% \begin{macro}{\skip_split_finite_else_action:nnNN}
% This macro is useful when performing error checking in certain
-% circumstances. If the \m{skip} register holds finite glue it sets
+% circumstances. If the \meta{skip} register holds finite glue it sets
% |#3| and |#4| to the stretch and shrink component, resp. If it holds
% infinite glue set |#3| and |#4| to zero and issue the special action
% |#2| which is probably an error message.