[latex3-commits] [l3svn] 04/04: Remove nopar from l3trial
noreply at latex-project.org
noreply at latex-project.org
Mon Jun 13 14:43:07 CEST 2016
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
commit ccdda1e475fa6e44a7f4ec44a5e0d60b5cf80777
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Jun 13 13:42:21 2016 +0100
Remove nopar from l3trial
There is one use retained as it is a low-level operation.
---
l3trial/l3benchmark/l3benchmark.dtx | 12 +-
l3trial/l3bigint/l3bigint.dtx | 28 +--
l3trial/l3check/l3check.dtx | 244 ++++++++++++-------------
l3trial/l3fp-extras/l3fp-functions.dtx | 2 +-
l3trial/l3hooks/l3hooks.dtx | 20 +-
l3trial/l3htoks/l3htoks.dtx | 68 +++----
l3trial/l3kernel-extras/l3kernel-extras.dtx | 20 +-
l3trial/l3ldb/l3ldb.dtx | 4 +-
l3trial/l3ldb/l3ldbparse.dtx | 34 ++--
l3trial/l3ldb/l3precom.dtx | 4 +-
l3trial/l3rand/l3rand.dtx | 32 ++--
l3trial/l3str-format-new/l3str-format-new.dtx | 6 +-
l3trial/l3trace/l3trace.dtx | 12 +-
l3trial/l3tree/l3tree.dtx | 4 +-
l3trial/xbox/xbox.dtx | 6 +-
l3trial/xfont/l3font.dtx | 36 ++--
l3trial/xfont/xfss.dtx | 78 ++++----
17 files changed, 305 insertions(+), 305 deletions(-)
diff --git a/l3trial/l3benchmark/l3benchmark.dtx b/l3trial/l3benchmark/l3benchmark.dtx
index 765aea0..07efbad 100644
--- a/l3trial/l3benchmark/l3benchmark.dtx
+++ b/l3trial/l3benchmark/l3benchmark.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3benchmark.dtx Copyright (C) 2011,2012,2014 The LaTeX3 Project
+%% File l3benchmark.dtx Copyright (C) 2011,2012,2014,2016 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -175,7 +175,7 @@
\msg_error:nn { benchmark } { no-time }
\int_zero:N #1
}
- \cs_new_protected_nopar:Npn \clock_zero:
+ \cs_new_protected:Npn \clock_zero:
{ \msg_error:nn { benchmark } { no-time } }
\cs_new_protected:Npn \benchmark:n #1
{
@@ -236,8 +236,8 @@
\sys_if_engine_xetex:F
{
\sys_if_engine_pdftex:TF
- { \cs_new_protected_nopar:Npn \clock_zero: { \pdfresettimer } }
- { \cs_new_protected_nopar:Npn \clock_zero: { \pdf at resettimer } }
+ { \cs_new_protected:Npn \clock_zero: { \pdfresettimer } }
+ { \cs_new_protected:Npn \clock_zero: { \pdf at resettimer } }
}
% \end{macrocode}
% \end{macro}
@@ -312,7 +312,7 @@
\sys_if_engine_xetex:T
{
\fp_new:N \g_@@_base_fp
- \cs_new_protected_nopar:Npn \clock_zero:
+ \cs_new_protected:Npn \clock_zero:
{ \@@_gget:N \g_@@_base_fp }
}
% \end{macrocode}
@@ -393,7 +393,7 @@
\@@_outer_do_nothing:
\clock_get:N \l_@@_time_b_tl
}
-\tex_outer:D \cs_set_nopar:Npn \@@_outer_do_nothing: { }
+\tex_outer:D \cs_set:Npn \@@_outer_do_nothing: { }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3trial/l3bigint/l3bigint.dtx b/l3trial/l3bigint/l3bigint.dtx
index 3619342..58f33d1 100644
--- a/l3trial/l3bigint/l3bigint.dtx
+++ b/l3trial/l3bigint/l3bigint.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3bigint.dtx Copyright (C) 2011-2015 The LaTeX3 Project
+%% File l3bigint.dtx Copyright (C) 2011-2016 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -874,7 +874,7 @@
% \begin{macro}[aux, EXP]{\@@_parse_do_aux:w}
% Parse an expression and run some code~|#2| on the result.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_parse_do:nn
+\cs_new:Npn \@@_parse_do:nn
{
\exp_after:wN \@@_parse_do_aux:w
\exp:w \@@_parse:n
@@ -1206,12 +1206,12 @@
% |1| construction (the |1| avoids losing leading zeros in a block),
% with a setup removing the |1| after expansion.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_parse_decimal:N
+\cs_new:Npn \@@_parse_decimal:N
{
\exp_after:wN \@@_parse_decimal_count:w
\exp:w \exp_end_continue_f:w \@@_parse_decimal_aux:N
}
-\cs_new_nopar:Npn \@@_parse_decimal_aux:N
+\cs_new:Npn \@@_parse_decimal_aux:N
{
\exp_after:wN \@@_parse_decimal_auxii:w
\@@_int_value:w 1 \@@_parse_digits_viii:NN 0
@@ -1438,7 +1438,7 @@
% \begin{macrocode}
\group_begin:
%<*package>
- \cs_set_nopar:Npn \+ { }
+ \cs_set:Npn \+ { }
%</package>
\char_set_catcode_letter:N \*
\char_set_catcode_letter:N \/
@@ -1547,7 +1547,7 @@
% \end{verbatim}
%}
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_tree_dp:n % expects "{<digits>}" (non-zero multiple of 8 digits, first block non-zero), outputs "<depth>.<tree>"
+\cs_new:Npn \@@_tree_dp:n % expects "{<digits>}" (non-zero multiple of 8 digits, first block non-zero), outputs "<depth>.<tree>"
{
\@@_int_value:w \@@_int_eval:w \c_minus_one
\@@_tree_dp_aux:n
@@ -1670,7 +1670,7 @@
+ #1 - \c_two
\@@_int_eval_end:
}
-\cs_new_protected_nopar:Npn \@@:w
+\cs_new_protected:Npn \@@:w
{
\exp_after:wN \@@_carry:N
\@@_int_value:w \@@_int_eval:w \c_@@_carry_int +
@@ -2208,7 +2208,7 @@
% \begin{macrocode}
\cs_new:Npn \bigint_use:N #1 { \exp_after:wN \@@_use:w #1 }
\cs_generate_variant:Nn \bigint_use:N { c }
-\cs_new_nopar:Npn \bigint_eval:n
+\cs_new:Npn \bigint_eval:n
{ \exp_after:wN \@@_use:w \exp:w \@@_parse:n }
\cs_new:Npn \@@_use:w \s_@@ \@@_chk:w #1 . #2#3 ;
{
@@ -2233,7 +2233,7 @@
% \begin{macro}[EXP]{\bigint_abs:n}
% \begin{macro}[int, EXP]{\@@_abs:w}
% \begin{macrocode}
-\cs_new_nopar:Npn \bigint_abs:n
+\cs_new:Npn \bigint_abs:n
{ \exp_after:wN \@@_abs:w \exp:w \@@_parse:n }
\cs_new:Npn \@@_abs:w \s_@@ \@@_chk:w #1 . #2#3 ;
{
@@ -2287,7 +2287,7 @@
% \begin{macro}[int, EXP]{\@@_sign:w}
% Parse the expression with \cs{@@_parse:n}, then \cs{@@_sign:w}.
% \begin{macrocode}
-\cs_new_nopar:Npn \bigint_sign:n
+\cs_new:Npn \bigint_sign:n
{ \exp_after:wN \@@_sign:w \exp:w \@@_parse:n }
\cs_new:Npn \@@_sign:w \s_@@ \@@_chk:w #1 . #2#3 ;
{
@@ -2622,7 +2622,7 @@
% whether we are left with a prime number) goes beyond $2^31$, so
% leave that to big integers.
% \begin{macrocode}
-\cs_new_nopar:Npn \bigint_factor:n
+\cs_new:Npn \bigint_factor:n
{ \exp_after:wN \@@_factor:w \exp:w \@@_parse:n }
\cs_new:Npn \@@_factor:w \s_@@ \@@_chk:w #1 . #2 #3 ;
{
@@ -2782,12 +2782,12 @@
\__msg_show_variable:NNNnn #1 \bigint_if_exist:NTF ? { }
{ > ~ \token_to_str:N #1 = \bigint_use:N #1 }
}
-\cs_new_protected_nopar:Npn \bigint_show:n
+\cs_new_protected:Npn \bigint_show:n
{ \__msg_show_wrap:Nn \bigint_eval:n }
\cs_generate_variant:Nn \bigint_show:N { c }
-\cs_new_protected_nopar:Npn \bigint_log:N
+\cs_new_protected:Npn \bigint_log:N
{ \__msg_log_next: \bigint_show:N }
-\cs_new_protected_nopar:Npn \bigint_log:n
+\cs_new_protected:Npn \bigint_log:n
{ \__msg_log_next: \bigint_show:n }
\cs_generate_variant:Nn \bigint_log:N { c }
% \end{macrocode}
diff --git a/l3trial/l3check/l3check.dtx b/l3trial/l3check/l3check.dtx
index 2afc838..8927e9f 100644
--- a/l3trial/l3check/l3check.dtx
+++ b/l3trial/l3check/l3check.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3check.dtx (C) Copyright 2012,2014-2015 The LaTeX3 Project
+%% File l3check.dtx (C) Copyright 2012,2014-2016 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -322,17 +322,17 @@
% \begin{macro}[EXP]{\@@_error_exp:nn, \@@_error_exp:nnn, \@@_error_exp:nnnn}
% Wrappers around errors, expandable or not.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_error:nn
+\cs_new:Npn \@@_error:nn
{ \msg_error:nnn { check } }
-\cs_new_nopar:Npn \@@_error:nnn
+\cs_new:Npn \@@_error:nnn
{ \msg_error:nnnn { check } }
-\cs_new_nopar:Npn \@@_error:nnnn
+\cs_new:Npn \@@_error:nnnn
{ \msg_error:nnnnn { check } }
-\cs_new_nopar:Npn \@@_error_exp:nn
+\cs_new:Npn \@@_error_exp:nn
{ \msg_expandable_error:nnn { check } }
-\cs_new_nopar:Npn \@@_error_exp:nnn
+\cs_new:Npn \@@_error_exp:nnn
{ \msg_expandable_error:nnnn { check } }
-\cs_new_nopar:Npn \@@_error_exp:nnnn
+\cs_new:Npn \@@_error_exp:nnnn
{ \msg_expandable_error:nnnnn { check } }
% \end{macrocode}
% \end{macro}
@@ -342,18 +342,18 @@
% \begin{macro}[EXP]{\@@_warning_exp:nn, \@@_warning_exp:nnn}
% A wrapper around warnings, expandable or not.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_warning:nn
+\cs_new:Npn \@@_warning:nn
{ \msg_warning:nnn { check } }
-\cs_new_nopar:Npn \@@_warning:nnn
+\cs_new:Npn \@@_warning:nnn
{ \msg_warning:nnnn { check } }
-\cs_new_nopar:Npn \@@_warning_exp:nn
+\cs_new:Npn \@@_warning_exp:nn
{
\@@_old_cs_if_exist:NTF \msg_expandable_warning:nnn
{ \msg_expandable_warning:nnn }
{ \msg_expandable_error:nnn }
{ check }
}
-\cs_new_nopar:Npn \@@_warning_exp:nnn
+\cs_new:Npn \@@_warning_exp:nnn
{
\@@_old_cs_if_exist:NTF \msg_expandable_warning:nnnn
{ \msg_expandable_warning:nnnn }
@@ -566,7 +566,7 @@
}
\cs_new_protected:Npn \@@_module_first_use:n #1
{
- \cs_gset_protected_nopar:cpx { @@_module_#1:N }
+ \cs_gset_protected:cpx { @@_module_#1:N }
{ \exp_not:N \cs_set_eq:NN \exp_not:c { @@_return_#1: } }
\cs_new_eq:cN { @@_return_#1: } \prg_return_false:
\cs_set_eq:cN { @@_return_#1: } \prg_return_true:
@@ -744,7 +744,7 @@
\cs_new_protected:Npn \@@_omit_aux:NNN #1#2#3
{
\cs_gset_eq:NN #1 #2
- \cs_gset_protected_nopar:Npn #2
+ \cs_gset_protected:Npn #2
{ \cs_gset_eq:NN #2 #1 #3 }
}
% \end{macrocode}
@@ -828,13 +828,13 @@
% \begin{macro}{\check_is_local_variable:N}
% \begin{macro}[EXP]{\check_is_local_variable_exp:N}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \check_is_local_variable:N
+\cs_new_protected:Npn \check_is_local_variable:N
{ \@@_is_scope_variable:NNN l \@@_error:nnn }
-\cs_new_protected_nopar:Npn \check_is_global_variable:N
+\cs_new_protected:Npn \check_is_global_variable:N
{ \@@_is_scope_variable:NNN g \@@_error:nnn }
-\cs_new_nopar:Npn \check_is_local_variable_exp:N
+\cs_new:Npn \check_is_local_variable_exp:N
{ \@@_is_scope_variable:NNN l \@@_error_exp:nnn }
-\cs_new_nopar:Npn \check_is_global_variable_exp:N
+\cs_new:Npn \check_is_global_variable_exp:N
{ \@@_is_scope_variable:NNN g \@@_error_exp:nnn }
\cs_new:Npn \@@_is_scope_variable:NNN #1#2#3
{
@@ -1115,9 +1115,9 @@
LaTeX~will~create~the~variable~and~continue.
}
\msg_new:nnn { check } { par-noarg }
- { The~function~'#1'~takes~no~argument~but~is~not~defined~to~be~"_nopar".~This~is~unusual. }
+ { The~function~'#1'~takes~no~argument~but~is~not~defined~to~be~"".~This~is~unusual. }
\msg_new:nnn { check } { arg-nopar }
- { The~function~'#1'~is~"_nopar"~but~takes~arguments.~This~is~risky. }
+ { The~function~'#1'~is~""~but~takes~arguments.~This~is~risky. }
\msg_new:nnn { check } { set-eq-undef }
{ The~function~'#1'~was~set~equal~to~'#2',~but~that~is~not~defined. }
\msg_new:nnn { check } { no-expansion }
@@ -1151,27 +1151,27 @@
% \end{macrocode}
%
% First standardize some definitions: the $16$ assignment functions
-% |\cs_(set/gset/new)(/_protected)(/_nopar):Np(n/x)| are normally
+% |\cs_(set/gset/new)(/_protected)(/):Np(n/x)| are normally
% defined in terms of each other, but that complicates checking, since
% some are defined as \cs{tex_long:D} or \cs{etex_protected:D} followed
% by others.
% \begin{macrocode}
- \cs_gset_protected_nopar:Npn \cs_set_nopar:Npn { \tex_def:D }
- \cs_gset_protected_nopar:Npn \cs_set_nopar:Npx { \tex_edef:D }
- \cs_gset_protected_nopar:Npn \cs_gset_nopar:Npn { \tex_gdef:D }
- \cs_gset_protected_nopar:Npn \cs_gset_nopar:Npx { \tex_xdef:D }
- \cs_gset_protected_nopar:Npn \cs_set:Npn { \tex_long:D \tex_def:D }
- \cs_gset_protected_nopar:Npn \cs_set:Npx { \tex_long:D \tex_edef:D }
- \cs_gset_protected_nopar:Npn \cs_gset:Npn { \tex_long:D \tex_gdef:D }
- \cs_gset_protected_nopar:Npn \cs_gset:Npx { \tex_long:D \tex_xdef:D }
- \cs_gset_protected_nopar:Npn \cs_set_protected_nopar:Npn { \etex_protected:D \tex_def:D }
- \cs_gset_protected_nopar:Npn \cs_set_protected_nopar:Npx { \etex_protected:D \tex_edef:D }
- \cs_gset_protected_nopar:Npn \cs_gset_protected_nopar:Npn { \etex_protected:D \tex_gdef:D }
- \cs_gset_protected_nopar:Npn \cs_gset_protected_nopar:Npx { \etex_protected:D \tex_xdef:D }
- \cs_gset_protected_nopar:Npn \cs_set_protected:Npn { \etex_protected:D \tex_long:D \tex_def:D }
- \cs_gset_protected_nopar:Npn \cs_set_protected:Npx { \etex_protected:D \tex_long:D \tex_edef:D }
- \cs_gset_protected_nopar:Npn \cs_gset_protected:Npn { \etex_protected:D \tex_long:D \tex_gdef:D }
- \cs_gset_protected_nopar:Npn \cs_gset_protected:Npx { \etex_protected:D \tex_long:D \tex_xdef:D }
+ \cs_gset_protected:Npn \cs_set:Npn { \tex_def:D }
+ \cs_gset_protected:Npn \cs_set:Npx { \tex_edef:D }
+ \cs_gset_protected:Npn \cs_gset:Npn { \tex_gdef:D }
+ \cs_gset_protected:Npn \cs_gset:Npx { \tex_xdef:D }
+ \cs_gset_protected:Npn \cs_set:Npn { \tex_long:D \tex_def:D }
+ \cs_gset_protected:Npn \cs_set:Npx { \tex_long:D \tex_edef:D }
+ \cs_gset_protected:Npn \cs_gset:Npn { \tex_long:D \tex_gdef:D }
+ \cs_gset_protected:Npn \cs_gset:Npx { \tex_long:D \tex_xdef:D }
+ \cs_gset_protected:Npn \cs_set_protected:Npn { \etex_protected:D \tex_def:D }
+ \cs_gset_protected:Npn \cs_set_protected:Npx { \etex_protected:D \tex_edef:D }
+ \cs_gset_protected:Npn \cs_gset_protected:Npn { \etex_protected:D \tex_gdef:D }
+ \cs_gset_protected:Npn \cs_gset_protected:Npx { \etex_protected:D \tex_xdef:D }
+ \cs_gset_protected:Npn \cs_set_protected:Npn { \etex_protected:D \tex_long:D \tex_def:D }
+ \cs_gset_protected:Npn \cs_set_protected:Npx { \etex_protected:D \tex_long:D \tex_edef:D }
+ \cs_gset_protected:Npn \cs_gset_protected:Npn { \etex_protected:D \tex_long:D \tex_gdef:D }
+ \cs_gset_protected:Npn \cs_gset_protected:Npx { \etex_protected:D \tex_long:D \tex_xdef:D }
% \end{macrocode}
% Simplify \cs{cs_gset_eq:NN} and \cs{cs_new_eq:NN} similarly rather
% than defining them in terms of \cs{cs_set_eq:NN}
@@ -1183,7 +1183,7 @@
% We could change \cs{group_begin:}, \cs{group_end:},
% \cs{group_insert_after:N}, but do not.
%
-% Let us do |\cs_(set/gset/new)(/_protected)(/_nopar):N(/p)(n/x)|, $48$
+% Let us do |\cs_(set/gset/new)(/_protected)(/):N(/p)(n/x)|, $48$
% assignment functions. For now, just check that the first argument is
% a single token, is a function (not yet), and for the |:Nn|/|:Nx|
% defining functions, check that the signature is right. Additionally,
@@ -1215,7 +1215,7 @@
% \check_is_function:N ##1
\tl_if_empty:nT {##2} { \@@_warning:nn { par-noarg } {##1} }
}
- \check_patch:cpnn { cs_ #1 #2 _nopar:Np #3 }
+ \check_patch:cpnn { cs_ #1 #2 :Np #3 }
##1 ##2 ## { ##1 ##2 }
{
\check_is_N:n {##1}
@@ -1230,7 +1230,7 @@
\check_signature_is_base:N ##1
\check_signature_should_be_nonempty:N ##1
}
- \check_patch:cpnn { cs_ #1 #2 _nopar:N #3 }
+ \check_patch:cpnn { cs_ #1 #2 :N #3 }
##1 ##2 ## { ##1 ##2 }
{
\check_is_N:n {##1}
@@ -1368,18 +1368,18 @@
%
% When outputting a message, a function definition is made using
% begin-group and end-group tokens which are spaces (character code
-% $32$), and that confuses the new \cs{cs_set_protected_nopar:Npn}. To
+% $32$), and that confuses the new \cs{cs_set_protected:Npn}. To
% avoid this, go back temporarily to the old definition of that
% function.
% \begin{macrocode}
- \cs_new_eq:NN \@@_new_cs_set_protected_nopar:Npn \cs_set_protected_nopar:Npn
+ \cs_new_eq:NN \@@_new_cs_set_protected:Npn \cs_set_protected:Npn
\use:x
{
\exp_not:n { \cs_gset_protected:Npn \__msg_interrupt_text:n #1 }
{
- \exp_not:n { \cs_set_eq:NN \cs_set_protected_nopar:Npn \@@_old_cs_set_protected_nopar:Npn }
+ \exp_not:n { \cs_set_eq:NN \cs_set_protected:Npn \@@_old_cs_set_protected:Npn }
\exp_not:o { \__msg_interrupt_text:n {#1} }
- \exp_not:n { \cs_set_eq:NN \cs_set_protected_nopar:Npn \@@_new_cs_set_protected_nopar:Npn }
+ \exp_not:n { \cs_set_eq:NN \cs_set_protected:Npn \@@_new_cs_set_protected:Npn }
}
}
% \end{macrocode}
@@ -1421,12 +1421,12 @@
% \cs_set_eq:cN, \cs_set_eq:Nc, \cs_set_eq:cc,
% \cs_gset_eq:cN, \cs_gset_eq:Nc, \cs_gset_eq:cc,
% \cs_new_eq:cN, \cs_new_eq:Nc, \cs_new_eq:cc,
-% \cs_set:cpn, \cs_set_protected:cpn, \cs_set_nopar:cpn, \cs_set_protected_nopar:cpn,
-% \cs_set:cpx, \cs_set_protected:cpx, \cs_set_nopar:cpx, \cs_set_protected_nopar:cpx,
-% \cs_gset:cpn, \cs_gset_protected:cpn, \cs_gset_nopar:cpn, \cs_gset_protected_nopar:cpn,
-% \cs_gset:cpx, \cs_gset_protected:cpx, \cs_gset_nopar:cpx, \cs_gset_protected_nopar:cpx,
-% \cs_new:cpn, \cs_new_protected:cpn, \cs_new_nopar:cpn, \cs_new_protected_nopar:cpn,
-% \cs_new:cpx, \cs_new_protected:cpx, \cs_new_nopar:cpx, \cs_new_protected_nopar:cpx,
+% \cs_set:cpn, \cs_set_protected:cpn, \cs_set:cpn, \cs_set_protected:cpn,
+% \cs_set:cpx, \cs_set_protected:cpx, \cs_set:cpx, \cs_set_protected:cpx,
+% \cs_gset:cpn, \cs_gset_protected:cpn, \cs_gset:cpn, \cs_gset_protected:cpn,
+% \cs_gset:cpx, \cs_gset_protected:cpx, \cs_gset:cpx, \cs_gset_protected:cpx,
+% \cs_new:cpn, \cs_new_protected:cpn, \cs_new:cpn, \cs_new_protected:cpn,
+% \cs_new:cpx, \cs_new_protected:cpx, \cs_new:cpx, \cs_new_protected:cpx,
% \tl_new:c, \tl_show:c, \tl_log:c, \tl_clear_new:c, \tl_gclear_new:c, \tl_const:cn, \tl_const:cx,
% \clist_new:c, \clist_show:c, \clist_log:c, \clist_clear_new:c, \clist_gclear_new:c, \clist_const:cn,
% \seq_new:c, \seq_show:c, \seq_log:c, \seq_clear_new:c, \seq_gclear_new:c,
@@ -1443,17 +1443,17 @@
% \begin{macrocode}
\tl_map_inline:nn { {set} {gset} {new} }
{
- \cs_gset_protected_nopar:cpx { cs_#1_eq:cN }
+ \cs_gset_protected:cpx { cs_#1_eq:cN }
{
\exp_not:N \@@_old_exp_args:Nc
\exp_not:c { cs_#1_eq:NN }
}
- \cs_gset_protected_nopar:cpx { cs_#1_eq:Nc }
+ \cs_gset_protected:cpx { cs_#1_eq:Nc }
{
\exp_not:N \@@_old_exp_args:NNc
\exp_not:c { cs_#1_eq:NN }
}
- \cs_gset_protected_nopar:cpx { cs_#1_eq:cc }
+ \cs_gset_protected:cpx { cs_#1_eq:cc }
{
\exp_not:N \@@_old_exp_args:Ncc
\exp_not:c { cs_#1_eq:NN }
@@ -1462,7 +1462,7 @@
\group_begin:
\cs_set_protected:Npn \check_tmp:w #1#2
{
- \exp_after:wN \cs_gset_protected_nopar:Npx \cs:w #1 : c #2 \cs_end:
+ \exp_after:wN \cs_gset_protected:Npx \cs:w #1 : c #2 \cs_end:
{
\exp_not:N \@@_old_exp_args:Nc
\exp_not:c { #1 : N#2 }
@@ -1470,7 +1470,7 @@
}
\tl_map_inline:nn { {set} {gset} {new} }
{
- \tl_map_inline:nn { { } { _protected } { _nopar } { _protected_nopar } }
+ \tl_map_inline:nn { { } { _protected } { } { _protected } }
{
\tl_map_inline:nn { n x }
{ \check_tmp:w { cs_#1##1 } { p ####1 } }
@@ -1504,7 +1504,7 @@
% Remove fine-tuning. Here \cs{use:N} does not exist so use
% \cs{use:n}.
% \begin{macrocode}
- \cs_gset_nopar:Npn \use:c { \exp_args:Nc \use:n }
+ \cs_gset:Npn \use:c { \exp_args:Nc \use:n }
% \end{macrocode}
% \end{macro}
%
@@ -1528,41 +1528,41 @@
% because the |n| variant is a primitive, which does not
% accept unbraced arguments.
% \begin{macrocode}
- \cs_gset_nopar:Npn \exp_not:o { \exp_args:No \exp_not:n }
- \cs_gset_nopar:Npn \exp_not:c { \exp_args:Nc \exp_not:N }
- \cs_gset_nopar:Npn \exp_not:f { \exp_args:Nf \exp_not:n }
- \cs_gset_nopar:Npn \exp_not:V { \exp_args:NV \exp_not:n }
- \cs_gset_nopar:Npn \exp_not:v { \exp_args:Nv \exp_not:n }
- \cs_gset_nopar:Npn \exp_args:No { \::o \::: }
- \cs_gset_nopar:Npn \exp_args:NNo { \::N \::o \::: }
- \cs_gset_nopar:Npn \exp_args:NNNo { \::N \::N \::o \::: }
- \cs_gset_nopar:Npn \exp_args:Nc { \::c \::: }
- \cs_gset_nopar:Npn \exp_args:Ncc { \::c \::c \::: }
- \cs_gset_nopar:Npn \exp_args:Nccc { \::c \::c \::c \::: }
- \cs_gset_nopar:Npn \exp_args:NNc { \::N \::c \::: }
- \cs_gset_nopar:Npn \exp_args:Nf { \::f \::: }
- \cs_gset_nopar:Npn \exp_args:Nv { \::v \::: }
- \cs_gset_nopar:Npn \exp_args:NV { \::V \::: }
- \cs_gset_nopar:Npn \exp_args:NNf { \::N \::f \::: }
- \cs_gset_nopar:Npn \exp_args:NNv { \::N \::v \::: }
- \cs_gset_nopar:Npn \exp_args:NNV { \::N \::V \::: }
- \cs_gset_nopar:Npn \exp_args:Nco { \::c \::o \::: }
- \cs_gset_nopar:Npn \exp_args:Ncf { \::c \::f \::: }
- \cs_gset_nopar:Npn \exp_args:NVV { \::V \::V \::: }
- \cs_gset_nopar:Npn \exp_args:NNNV { \::N \::N \::V \::: }
- \cs_gset_nopar:Npn \exp_args:NcNc { \::c \::N \::c \::: }
- \cs_gset_nopar:Npn \exp_args:NcNo { \::c \::N \::o \::: }
- \cs_gset_nopar:Npn \exp_args:Ncco { \::c \::c \::o \::: }
- \cs_gset_nopar:Npn \exp_last_unbraced:NV { \::V_unbraced \::: }
- \cs_gset_nopar:Npn \exp_last_unbraced:Nv { \::v_unbraced \::: }
- \cs_gset_nopar:Npn \exp_last_unbraced:No { \::o_unbraced \::: }
- \cs_gset_nopar:Npn \exp_last_unbraced:Nf { \::f_unbraced \::: }
- \cs_gset_nopar:Npn \exp_last_unbraced:Nco { \::c \::o_unbraced \::: }
- \cs_gset_nopar:Npn \exp_last_unbraced:NcV { \::c \::V_unbraced \::: }
- \cs_gset_nopar:Npn \exp_last_unbraced:NNV { \::N \::V_unbraced \::: }
- \cs_gset_nopar:Npn \exp_last_unbraced:NNo { \::N \::o_unbraced \::: }
- \cs_gset_nopar:Npn \exp_last_unbraced:NNNV { \::N \::N \::V_unbraced \::: }
- \cs_gset_nopar:Npn \exp_last_unbraced:NNNo { \::N \::N \::o_unbraced \::: }
+ \cs_gset:Npn \exp_not:o { \exp_args:No \exp_not:n }
+ \cs_gset:Npn \exp_not:c { \exp_args:Nc \exp_not:N }
+ \cs_gset:Npn \exp_not:f { \exp_args:Nf \exp_not:n }
+ \cs_gset:Npn \exp_not:V { \exp_args:NV \exp_not:n }
+ \cs_gset:Npn \exp_not:v { \exp_args:Nv \exp_not:n }
+ \cs_gset:Npn \exp_args:No { \::o \::: }
+ \cs_gset:Npn \exp_args:NNo { \::N \::o \::: }
+ \cs_gset:Npn \exp_args:NNNo { \::N \::N \::o \::: }
+ \cs_gset:Npn \exp_args:Nc { \::c \::: }
+ \cs_gset:Npn \exp_args:Ncc { \::c \::c \::: }
+ \cs_gset:Npn \exp_args:Nccc { \::c \::c \::c \::: }
+ \cs_gset:Npn \exp_args:NNc { \::N \::c \::: }
+ \cs_gset:Npn \exp_args:Nf { \::f \::: }
+ \cs_gset:Npn \exp_args:Nv { \::v \::: }
+ \cs_gset:Npn \exp_args:NV { \::V \::: }
+ \cs_gset:Npn \exp_args:NNf { \::N \::f \::: }
+ \cs_gset:Npn \exp_args:NNv { \::N \::v \::: }
+ \cs_gset:Npn \exp_args:NNV { \::N \::V \::: }
+ \cs_gset:Npn \exp_args:Nco { \::c \::o \::: }
+ \cs_gset:Npn \exp_args:Ncf { \::c \::f \::: }
+ \cs_gset:Npn \exp_args:NVV { \::V \::V \::: }
+ \cs_gset:Npn \exp_args:NNNV { \::N \::N \::V \::: }
+ \cs_gset:Npn \exp_args:NcNc { \::c \::N \::c \::: }
+ \cs_gset:Npn \exp_args:NcNo { \::c \::N \::o \::: }
+ \cs_gset:Npn \exp_args:Ncco { \::c \::c \::o \::: }
+ \cs_gset:Npn \exp_last_unbraced:NV { \::V_unbraced \::: }
+ \cs_gset:Npn \exp_last_unbraced:Nv { \::v_unbraced \::: }
+ \cs_gset:Npn \exp_last_unbraced:No { \::o_unbraced \::: }
+ \cs_gset:Npn \exp_last_unbraced:Nf { \::f_unbraced \::: }
+ \cs_gset:Npn \exp_last_unbraced:Nco { \::c \::o_unbraced \::: }
+ \cs_gset:Npn \exp_last_unbraced:NcV { \::c \::V_unbraced \::: }
+ \cs_gset:Npn \exp_last_unbraced:NNV { \::N \::V_unbraced \::: }
+ \cs_gset:Npn \exp_last_unbraced:NNo { \::N \::o_unbraced \::: }
+ \cs_gset:Npn \exp_last_unbraced:NNNV { \::N \::N \::V_unbraced \::: }
+ \cs_gset:Npn \exp_last_unbraced:NNNo { \::N \::N \::o_unbraced \::: }
% \end{macrocode}
% \end{macro}
%
@@ -1711,7 +1711,7 @@
{
\exp_not:n { \cs_set_eq:NN \exp_args:Nc \@@_old_exp_args:Nc }
\exp_not:o { \__char_set_catcode:Nn {#1} {#2} }
- \exp_not:n { \cs_set_nopar:Npn \exp_args:Nc { \::c \::: } }
+ \exp_not:n { \cs_set:Npn \exp_args:Nc { \::c \::: } }
}
}
}
@@ -1938,17 +1938,17 @@
% }
% Redefine some functions as proper variants of their base functions.
% \begin{macrocode}
- \cs_gset_protected_nopar:Npn \tl_set_eq:cN
+ \cs_gset_protected:Npn \tl_set_eq:cN
{ \exp_args:Nc \tl_set_eq:NN }
- \cs_gset_protected_nopar:Npn \tl_set_eq:Nc
+ \cs_gset_protected:Npn \tl_set_eq:Nc
{ \exp_args:NNc \tl_set_eq:NN }
- \cs_gset_protected_nopar:Npn \tl_set_eq:cc
+ \cs_gset_protected:Npn \tl_set_eq:cc
{ \exp_args:Ncc \tl_set_eq:NN }
- \cs_gset_protected_nopar:Npn \tl_gset_eq:cN
+ \cs_gset_protected:Npn \tl_gset_eq:cN
{ \exp_args:Nc \tl_gset_eq:NN }
- \cs_gset_protected_nopar:Npn \tl_gset_eq:Nc
+ \cs_gset_protected:Npn \tl_gset_eq:Nc
{ \exp_args:NNc \tl_gset_eq:NN }
- \cs_gset_protected_nopar:Npn \tl_gset_eq:cc
+ \cs_gset_protected:Npn \tl_gset_eq:cc
{ \exp_args:Ncc \tl_gset_eq:NN }
% \end{macrocode}
% \end{macro}
@@ -2266,27 +2266,27 @@
% Some functions should be redefined as true variants of their base
% function.
% \begin{macrocode}
- \cs_gset_protected_nopar:Npn \seq_new:c
+ \cs_gset_protected:Npn \seq_new:c
{ \exp_args:Nc \seq_new:N }
- \cs_gset_protected_nopar:Npn \seq_clear:c
+ \cs_gset_protected:Npn \seq_clear:c
{ \exp_args:Nc \seq_clear:N }
- \cs_gset_protected_nopar:Npn \seq_gclear:c
+ \cs_gset_protected:Npn \seq_gclear:c
{ \exp_args:Nc \seq_gclear:N }
- \cs_gset_protected_nopar:Npn \seq_clear_new:c
+ \cs_gset_protected:Npn \seq_clear_new:c
{ \exp_args:Nc \seq_clear_new:N }
- \cs_gset_protected_nopar:Npn \seq_gclear_new:c
+ \cs_gset_protected:Npn \seq_gclear_new:c
{ \exp_args:Nc \seq_gclear_new:N }
- \cs_gset_protected_nopar:Npn \seq_set_eq:cN
+ \cs_gset_protected:Npn \seq_set_eq:cN
{ \exp_args:Nc \seq_set_eq:NN }
- \cs_gset_protected_nopar:Npn \seq_set_eq:Nc
+ \cs_gset_protected:Npn \seq_set_eq:Nc
{ \exp_args:NNc \seq_set_eq:NN }
- \cs_gset_protected_nopar:Npn \seq_set_eq:cc
+ \cs_gset_protected:Npn \seq_set_eq:cc
{ \exp_args:Ncc \seq_set_eq:NN }
- \cs_gset_protected_nopar:Npn \seq_gset_eq:cN
+ \cs_gset_protected:Npn \seq_gset_eq:cN
{ \exp_args:Nc \seq_gset_eq:NN }
- \cs_gset_protected_nopar:Npn \seq_gset_eq:Nc
+ \cs_gset_protected:Npn \seq_gset_eq:Nc
{ \exp_args:NNc \seq_gset_eq:NN }
- \cs_gset_protected_nopar:Npn \seq_gset_eq:cc
+ \cs_gset_protected:Npn \seq_gset_eq:cc
{ \exp_args:Ncc \seq_gset_eq:NN }
% \end{macrocode}
% \end{macro}
@@ -2295,21 +2295,21 @@
% Expandable functions which should be redefined as true variants of
% their base function.
% \begin{macrocode}
- \cs_gset_nopar:Npn \seq_if_empty:cTF
+ \cs_gset:Npn \seq_if_empty:cTF
{ \exp_args:Nc \seq_if_empty:NTF }
- \cs_gset_nopar:Npn \seq_if_empty:cT
+ \cs_gset:Npn \seq_if_empty:cT
{ \exp_args:Nc \seq_if_empty:NT }
- \cs_gset_nopar:Npn \seq_if_empty:cF
+ \cs_gset:Npn \seq_if_empty:cF
{ \exp_args:Nc \seq_if_empty:NF }
- \cs_gset_nopar:Npn \seq_if_empty_p:c
+ \cs_gset:Npn \seq_if_empty_p:c
{ \exp_args:Nc \seq_if_empty_p:N }
- \cs_gset_nopar:Npn \seq_if_exist:cTF
+ \cs_gset:Npn \seq_if_exist:cTF
{ \exp_args:Nc \seq_if_exist:NTF }
- \cs_gset_nopar:Npn \seq_if_exist:cT
+ \cs_gset:Npn \seq_if_exist:cT
{ \exp_args:Nc \seq_if_exist:NT }
- \cs_gset_nopar:Npn \seq_if_exist:cF
+ \cs_gset:Npn \seq_if_exist:cF
{ \exp_args:Nc \seq_if_exist:NF }
- \cs_gset_nopar:Npn \seq_if_exist_p:c
+ \cs_gset:Npn \seq_if_exist_p:c
{ \exp_args:Nc \seq_if_exist_p:N }
% \end{macrocode}
% \end{macro}
@@ -2362,13 +2362,13 @@
% We redefine those to use |\cs_| functions rather than |\tl_|
% functions.
% \begin{macrocode}
- % \cs_gset_protected_nopar:Npn \seq_set_split:Nnn
- % { \__seq_set_split:NNnn \cs_set_nopar:Npx }
- % \cs_gset_protected_nopar:Npn \seq_gset_split:Nnn
- % { \__seq_set_split:NNnn \cs_gset_nopar:Npx }
- % \cs_gset_protected_nopar:Npn \seq_pop_left:NN
+ % \cs_gset_protected:Npn \seq_set_split:Nnn
+ % { \__seq_set_split:NNnn \cs_set:Npx }
+ % \cs_gset_protected:Npn \seq_gset_split:Nnn
+ % { \__seq_set_split:NNnn \cs_gset:Npx }
+ % \cs_gset_protected:Npn \seq_pop_left:NN
% { \__seq_pop:NNNN \__seq_pop_left:NNN \@@_tl_set:Nn }
- % \cs_gset_protected_nopar:Npn \seq_gpop_left:NN
+ % \cs_gset_protected:Npn \seq_gpop_left:NN
% { \__seq_pop:NNNN \__seq_pop_left:NNN \@@_tl_gset:Nn }
% \cs_gset_eq:NN \seq_pop:NN \seq_pop_left:NN
% \cs_gset_eq:NN \seq_gpop:NN \seq_gpop_left:NN
diff --git a/l3trial/l3fp-extras/l3fp-functions.dtx b/l3trial/l3fp-extras/l3fp-functions.dtx
index 9160a1b..56ab0c1 100644
--- a/l3trial/l3fp-extras/l3fp-functions.dtx
+++ b/l3trial/l3fp-extras/l3fp-functions.dtx
@@ -119,7 +119,7 @@
}
\cs_new:Npn \@@_function_set_parsing_aux:NNn #1#2#3
{
- \cs_set_nopar:Npx \@@_tmp:w
+ \cs_set:Npx \@@_tmp:w
{
\exp_not:N \@@_parse_function:NNN
\exp_not:N \@@_function_o:w
diff --git a/l3trial/l3hooks/l3hooks.dtx b/l3trial/l3hooks/l3hooks.dtx
index f8cb57a..33f43b6 100644
--- a/l3trial/l3hooks/l3hooks.dtx
+++ b/l3trial/l3hooks/l3hooks.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3hooks.dtx Copyright (C) 2011,2012,2014 The LaTeX3 Project
+%% File l3hooks.dtx Copyright (C) 2011,2012,2014,2016 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -200,7 +200,7 @@
% by \cs{hook_use:n}.
% \end{itemize}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \hook_new:n #1
+\cs_new_protected:Npn \hook_new:n #1
{
\tl_new:c { g_hook_kernel_ #1 _tl }
\tl_gset:cx { g_hook_kernel_ #1 _tl }
@@ -215,7 +215,7 @@
% \cs{hook_use:N} with the \meta{hook} built
% from the given \meta{hook name}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \hook_use:n #1
+\cs_new_protected:Npn \hook_use:n #1
{
\cs_if_exist_use:cF { g_hook_kernel_ #1 _tl }
{ \msg_error:nnx { hook } { use-unknown-hook } {#1} }
@@ -232,7 +232,7 @@
% Actually, the \cs{hook_item:n} and \cs{hook_item_once:n} are just
% distinct dummy functions which both behave like \cs{exp_not:n}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \hook_use:N #1
+\cs_new_protected:Npn \hook_use:N #1
{
\use:x
{
@@ -262,13 +262,13 @@
% reliable since you never know when a dastardly package author overrides
% anything you might do with |\everyxyz|.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \hook_pre_push:nn
+\cs_new_protected:Npn \hook_pre_push:nn
{ \hook_put_aux:NNnn \seq_gput_left:cn \hook_item:n }
-\cs_new_protected_nopar:Npn \hook_post_push:nn
+\cs_new_protected:Npn \hook_post_push:nn
{ \hook_put_aux:NNnn \seq_gput_right:cn \hook_item:n }
-\cs_new_protected_nopar:Npn \hook_pre_once:nn
+\cs_new_protected:Npn \hook_pre_once:nn
{ \hook_put_aux:NNnn \seq_gput_left:cn \hook_item_once:n }
-\cs_new_protected_nopar:Npn \hook_post_once:nn
+\cs_new_protected:Npn \hook_post_once:nn
{ \hook_put_aux:NNnn \seq_gput_right:cn \hook_item_once:n }
\cs_new_protected:Npn \hook_put_aux:NNnn #1#2#3#4
{
@@ -315,7 +315,7 @@
% the interface \cs{every\meta{name>}}|={...}| by defining each of those
% control sequences as toks registers.
% \begin{macrocode}
- \cs_set_protected_nopar:Npn \hook_new:nNN #1#2#3
+ \cs_set_protected:Npn \hook_new:nNN #1#2#3
{
\hook_new:n {#1}
%<*package>
@@ -364,7 +364,7 @@
% \cs{tex_everycr:D}, which has no reason to be unpacked within
% an \texttt{x}-type argument.
% \begin{macrocode}
-\cs_new_nopar:Npn \hook_cr_use:N #1
+\cs_new_protected:Npn \hook_cr_use:N #1
{
\tex_noalign:D \c_group_begin_token
\use:x
diff --git a/l3trial/l3htoks/l3htoks.dtx b/l3trial/l3htoks/l3htoks.dtx
index d609b09..ac7c5fa 100644
--- a/l3trial/l3htoks/l3htoks.dtx
+++ b/l3trial/l3htoks/l3htoks.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3htoks.dtx Copyright (C) 2013-2015 The LaTeX3 Project
+%% File l3htoks.dtx Copyright (C) 2013-2016 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -187,7 +187,7 @@
%
% \begin{variable}{\@@_tmp:w}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_tmp:w { }
+\cs_new_protected:Npn \@@_tmp:w { }
% \end{macrocode}
% \end{variable}
%
@@ -264,12 +264,12 @@
\tl_set:Nn \l_@@_peek_next_tl {#1}
\@@_peek_x_aux:
}
-\cs_new_protected_nopar:Npn \@@_peek_x_aux:
+\cs_new_protected:Npn \@@_peek_x_aux:
{
\tex_futurelet:D \l_@@_peek_token
\@@_peek_x_auxii:
}
-\cs_new_protected_nopar:Npn \@@_peek_x_auxii:
+\cs_new_protected:Npn \@@_peek_x_auxii:
{
\exp_after:wN \if_meaning:w
\exp_not:N \l_@@_peek_token \l_@@_peek_token
@@ -300,9 +300,9 @@
\tl_set:Nn \l_@@_peek_next_tl {#1}
\@@_ignore_spaces_auxi:
}
-\cs_new_protected_nopar:Npn \@@_ignore_spaces_auxi:
+\cs_new_protected:Npn \@@_ignore_spaces_auxi:
{ \tex_futurelet:D \l_@@_peek_token \@@_ignore_spaces_auxii: }
-\cs_new_protected_nopar:Npn \@@_ignore_spaces_auxii:
+\cs_new_protected:Npn \@@_ignore_spaces_auxii:
{
\if_catcode:w \exp_not:N \l_@@_peek_token \c_space_token
\else:
@@ -324,9 +324,9 @@
% \begin{macro}[aux]{\@@_put_group_begin:, \@@_put_group_end:}
% Place the appropriate \cs{if_false:} \ldots{} \cs{fi:} construction.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_put_group_begin:
+\cs_new_protected:Npn \@@_put_group_begin:
{ \tl_gput_right:Nn \g_@@_result_tl { { \if_false: } \fi: } }
-\cs_new_protected_nopar:Npn \@@_put_group_end:
+\cs_new_protected:Npn \@@_put_group_end:
{ \tl_gput_right:Nn \g_@@_result_tl { \if_false: { \fi: } } }
% \end{macrocode}
% \end{macro}
@@ -344,7 +344,7 @@
% what follows starts with a digit); and in all other cases, do
% \cs{use_none:n}.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_strip_escape:w
+\cs_new:Npn \@@_strip_escape:w
{
\tex_romannumeral:D
\if:w \token_to_str:N \ \@@_strip_escape_aux:w \fi:
@@ -377,9 +377,9 @@
% already been expanded: those primitives call \cs{@@_parse_test:}
% directly.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_parse:w
+\cs_new_protected:Npn \@@_parse:w
{ \@@_peek_x:n { \@@_parse_test: } }
-\cs_new_protected_nopar:Npn \@@_parse_test:
+\cs_new_protected:Npn \@@_parse_test:
{
\@@_meaning:
\cs_if_exist_use:cF { @@_primitive_ \l_@@_peek_meaning_tl :w }
@@ -400,7 +400,7 @@
% \begin{macro}{\@@_parse_next:w}
% Ignore the next token then calls \cs{@@_parse:w}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_parse_next:w
+\cs_new_protected:Npn \@@_parse_next:w
{
\tex_afterassignment:D \@@_parse:w
\tex_let:D \l_@@_removed_token = ~
@@ -412,7 +412,7 @@
% If a primitive is not implemented, throw an error, and try to
% retrieve control using \cs{tex_afterassignment:D}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_not_implemented:
+\cs_new_protected:Npn \@@_not_implemented:
{
\msg_error:nnx { htoks } { primitive-not-implemented }
{ \l_@@_peek_meaning_tl }
@@ -469,7 +469,7 @@
% matching |\@@_primitive_| function, trims the meaning down to its
% first four letters, and calls an alternate function to do the work.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_meaning:
+\cs_new_protected:Npn \@@_meaning:
{
\group_align_safe_begin:
\token_if_eq_catcode:NNTF \l_@@_peek_token \tex_relax:D
@@ -505,7 +505,7 @@
% }
% This currently fails for non BMP characters in \XeTeX{}.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_token_to_charcode:N
+\cs_new:Npn \@@_token_to_charcode:N
{
\__int_value:w
\exp_after:wN \@@_token_to_charcode_auxi:w
@@ -513,7 +513,7 @@
}
\group_begin:
\char_set_catcode_other:N \m
- \cs_new_nopar:Npn \@@_token_to_charcode_auxi:w #1 ~ #2 ~
+ \cs_new:Npn \@@_token_to_charcode_auxi:w #1 ~ #2 ~
{
\if_catcode:w ^ \@@_token_to_charcode_auxii:w #1 m ^
\exp_after:wN `
@@ -521,8 +521,8 @@
\exp_after:wN \@@_token_to_charcode_auxiii:w
\fi:
}
- \cs_new_nopar:Npn \@@_token_to_charcode_auxii:w #1 m { }
- \cs_new_nopar:Npn \@@_token_to_charcode_auxiii:w #1 ~ { ` }
+ \cs_new:Npn \@@_token_to_charcode_auxii:w #1 m { }
+ \cs_new:Npn \@@_token_to_charcode_auxiii:w #1 ~ { ` }
\group_end:
% \end{macrocode}
% \end{macro}
@@ -541,13 +541,13 @@
% brace into \cs{g_@@_result_tl}, leave that brace in the input
% stream, and skip it before parsing further.
% \begin{macrocode}
-\cs_new_protected_nopar:cpn { @@_primitive_begin-group_character:w }
+\cs_new_protected:cpn { @@_primitive_begin-group_character:w }
{
\@@_put_group_begin:
\l_@@_peek_token
\@@_parse_next:w
}
-\cs_new_protected_nopar:cpn { @@_primitive_end-group_character:w }
+\cs_new_protected:cpn { @@_primitive_end-group_character:w }
{
\@@_put_group_end:
\l_@@_peek_token
@@ -596,9 +596,9 @@
% }
%
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_primitive_superscript_character:w
+\cs_new_protected:Npn \@@_primitive_superscript_character:w
{ \@@_subsuper_auxi:NN ^ }
-\cs_new_protected_nopar:Npn \@@_primitive_subscript_character:w
+\cs_new_protected:Npn \@@_primitive_subscript_character:w
{ \@@_subsuper_auxi:NN _ }
\cs_new_protected:Npn \@@_subsuper_auxi:NN #1#2
{
@@ -613,7 +613,7 @@
#2 \c_group_begin_token
\@@_ignore_spaces:nw { \@@_subsuper_auxii: }
}
-\cs_new_protected_nopar:Npn \@@_subsuper_auxii:
+\cs_new_protected:Npn \@@_subsuper_auxii:
{
\token_if_eq_catcode:NNTF \l_@@_peek_token \c_group_begin_token
{ \@@_parse_next:w }
@@ -638,7 +638,7 @@
% Put a space in the result, and typeset it, then skip over the space
% token to continue parsing.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_primitive_blank_space:w
+\cs_new_protected:Npn \@@_primitive_blank_space:w
{
\tl_gput_right:Nn \g_@@_result_tl { ~ }
\c_space_token
@@ -722,7 +722,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_primitive_afterassignment:w #1
{ \tex_futurelet:D \l_@@_peek_token \@@_afterassignment_auxi: }
-\cs_new_protected_nopar:Npn \@@_afterassignment_auxi:
+\cs_new_protected:Npn \@@_afterassignment_auxi:
{
\tl_gclear:N \g_@@_afterassignment_tl
\if_catcode:w \exp_not:N \l_@@_peek_token \c_group_begin_token
@@ -757,9 +757,9 @@
% though, we insert the contents of \cs{g_@@_afterassignment_tl} (a
% single token).
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_assignment:w
+\cs_new_protected:Npn \@@_assignment:w
{ \tex_afterassignment:D \@@_assignment_aux: }
-\cs_new_protected_nopar:Npn \@@_assignment_aux:
+\cs_new_protected:Npn \@@_assignment_aux:
{
\exp_last_unbraced:NNNo
\tl_gclear:N \g_@@_afterassignment_tl
@@ -977,7 +977,7 @@
\tex_afterassignment:D \@@_do_general_text_aux:
\tex_toks:D \c_zero
}
-\cs_new_protected_nopar:Npn \@@_do_general_text_aux:
+\cs_new_protected:Npn \@@_do_general_text_aux:
{ \exp_args:No \@@_tmp:w { \tex_the:D \tex_toks:D \c_zero } }
% \end{macrocode}
% \end{macro}
@@ -1048,7 +1048,7 @@
\tex_afterassignment:D \@@_primitive_penalty_aux:
\l_@@_internal_int = ~
}
-\cs_new_protected_nopar:Npn \@@_primitive_penalty_aux:
+\cs_new_protected:Npn \@@_primitive_penalty_aux:
{
\tex_penalty:D \l_@@_internal_int
\tl_gput_right:Nx \g_@@_result_tl
@@ -1116,7 +1116,7 @@
% case where \cs{@@_parse:w} encountered an unknown primitive: the
% parser tries to recover using \cs{tex_afterassignment:D}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_parse_end:
+\cs_new_protected:Npn \@@_parse_end:
{
\cs_set_eq:NN \s_@@ \s_@@
\s_@@ \prg_do_nothing:
@@ -1130,7 +1130,7 @@
% \cs{use_i:nn} to select the \texttt{true} branch. Otherwise,
% \cs{@@_if_parse:NNnn} selects the \texttt{false} branch.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \htoks_if_parse:TF
+\cs_new_protected:Npn \htoks_if_parse:TF
{ \s_@@ \@@_if_parse:NNnn \@@_parse:w \use_i:nn }
\cs_new_protected:Npn \@@_if_parse:NNnn #1#2#3#4 {#4}
% \end{macrocode}
@@ -1141,7 +1141,7 @@
% \begin{macro}{\htoks_set:Nn}
% \begin{macro}[aux]{\@@_set:NNNn}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \htoks_set:Nn
+\cs_new_protected:Npn \htoks_set:Nn
{
\htoks_if_parse:TF
{ \@@_set:NNNn \@@_parse_end: \@@_parse:w }
@@ -1309,7 +1309,7 @@
% It is not clear whether something should be inserted in the token
% list result for the italic correction.
% \begin{macrocode}
-\cs_set_protected_nopar:Npn \fix at penalty
+\cs_set_protected:Npn \fix at penalty
{
\htoks_code:n
{
@@ -1323,7 +1323,7 @@
\fi
}
}
-\cs_set_protected_nopar:Npn \sw at slant
+\cs_set_protected:Npn \sw at slant
{
\htoks_code:n
{
diff --git a/l3trial/l3kernel-extras/l3kernel-extras.dtx b/l3trial/l3kernel-extras/l3kernel-extras.dtx
index bae40e3..779c4f2 100644
--- a/l3trial/l3kernel-extras/l3kernel-extras.dtx
+++ b/l3trial/l3kernel-extras/l3kernel-extras.dtx
@@ -662,7 +662,7 @@
% warning is in fact produced when \cs{exp_not:N} goes beyond the
% end-of-file marker (hence acting on the following quark).
% \begin{macrocode}
-\cs_new_nopar:Npn \__msg_expandable_warning:n
+\cs_new:Npn \__msg_expandable_warning:n
{
\exp_args:Nf \__msg_expandable_warning_aux:nn
{
@@ -847,14 +847,14 @@
|| \token_if_protected_long_macro_p:N #1
}
{
- \cs_gset_protected_nopar:Npx #1
+ \cs_gset_protected:Npx #1
{
\exp_not:N \__cs_protected_deprecated:N \exp_not:N #1
\exp_not:c { __cs_deprecated_ \cs_to_str:N #1 }
}
}
{
- \cs_gset_nopar:Npx #1
+ \cs_gset:Npx #1
{
\exp_not:N \__cs_deprecated:N \exp_not:N #1
\exp_not:c { __cs_deprecated_ \cs_to_str:N #1 }
@@ -956,12 +956,12 @@
% \begin{macrocode}
\cs_new_protected:Npn \peek_after:nw #1
{
- \cs_set_nopar:Npx \__peek_true:w { \exp_not:n {#1} }
+ \cs_set:Npx \__peek_true:w { \exp_not:n {#1} }
\peek_after:Nw \__peek_true:w
}
\cs_new_protected:Npn \peek_gafter:nw #1
{
- \cs_set_nopar:Npx \__peek_true:w { \exp_not:n {#1} }
+ \cs_set:Npx \__peek_true:w { \exp_not:n {#1} }
\peek_gafter:Nw \__peek_true:w
}
% \end{macrocode}
@@ -1392,11 +1392,11 @@
% All three public functions are defined in terms of a common
% auxiliary.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \tl_new_replace:nn
+\cs_new_protected:Npn \tl_new_replace:nn
{ \__tl_replace_set:NNnn \cs_new:cpx \cs_new_eq:cN }
-\cs_new_protected_nopar:Npn \tl_set_replace:nn
+\cs_new_protected:Npn \tl_set_replace:nn
{ \__tl_replace_set:NNnn \cs_set:cpx \cs_set_eq:cN }
-\cs_new_protected_nopar:Npn \tl_gset_replace:nn
+\cs_new_protected:Npn \tl_gset_replace:nn
{ \__tl_replace_set:NNnn \cs_gset:cpx \cs_gset_eq:cN }
% \end{macrocode}
% \end{macro}
@@ -1582,9 +1582,9 @@
% \begin{macro}[aux]{\seq_pop_left_aux:NNN}
% \begin{macro}[aux]{\seq_pop_left_aux:NNNn}
% \begin{macrocode}
-\cs_gset_protected_nopar:Npn \seq_pop_left:NN
+\cs_gset_protected:Npn \seq_pop_left:NN
{ \seq_pop_left_aux:NNN \tex_edef:D }
-\cs_gset_protected_nopar:Npn \seq_gpop_left:NN
+\cs_gset_protected:Npn \seq_gpop_left:NN
{ \seq_pop_left_aux:NNN \tex_xdef:D }
\cs_gset_protected:Npn \seq_pop_left_aux:NNN #1#2#3
{
diff --git a/l3trial/l3ldb/l3ldb.dtx b/l3trial/l3ldb/l3ldb.dtx
index 05c60a4..2244c2e 100644
--- a/l3trial/l3ldb/l3ldb.dtx
+++ b/l3trial/l3ldb/l3ldb.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
%% File l3ldb.dtx (C) Copyright 2011 Frank Mittelbach, the LaTeX3 Project
-%% (C) Copyright 2012 The LaTeX3 Project
+%% (C) Copyright 2012,2016 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -777,7 +777,7 @@
% \begin{macro}{\ldb_update_end_single:N}
% Undoc
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_update_end_single:N
+\cs_new_protected:Npn \ldb_update_end_single:N
{ \ldb_update_single_aux:NN \ldb_update_emls:w }
% \end{macrocode}
% \end{macro}
diff --git a/l3trial/l3ldb/l3ldbparse.dtx b/l3trial/l3ldb/l3ldbparse.dtx
index 2bd2d98..b12f122 100644
--- a/l3trial/l3ldb/l3ldbparse.dtx
+++ b/l3trial/l3ldb/l3ldbparse.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
%% File l3ldbparse.dtx (C) Copyright 2011 Frank Mittelbach, The LaTeX3 Project
-%% (C) Copyright 2012 The LaTeX3 Project
+%% (C) Copyright 2012,2016 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -123,9 +123,9 @@
% Very convenient abbreviations for defining a continuation in
% |\gtmp:w| for immediate use.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \glet_gtmp:N { \cs_gset_eq:NN \gtmp:w }
-\cs_new_protected_nopar:Npn \gdef_gtmp:n { \cs_gset:Npn \gtmp:w }
-\cs_new_protected_nopar:Npn \gdef_gtmp:x { \cs_gset:Npx \gtmp:w }
+\cs_new_protected:Npn \glet_gtmp:N { \cs_gset_eq:NN \gtmp:w }
+\cs_new_protected:Npn \gdef_gtmp:n { \cs_gset:Npn \gtmp:w }
+\cs_new_protected:Npn \gdef_gtmp:x { \cs_gset:Npx \gtmp:w }
% \end{macrocode}
% \end{macro}
%
@@ -256,7 +256,7 @@
% Defines \cs{gtmp:w} as a continuation that invokes the error
% handler.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_gtmp_error: { \glet_gtmp:N \ldb_error:w }
+\cs_new_protected:Npn \ldb_gtmp_error: { \glet_gtmp:N \ldb_error:w }
% \end{macrocode}
% \end{macro}
%
@@ -272,7 +272,7 @@
% Otherwise, we flush the pending triple and remove the \cs{q_error}
% token.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_parse_finish:
+\cs_new_protected:Npn \ldb_parse_finish:
{
\if_case:w \g_ldb_mode
\glet_gtmp:N \ldb_parse_done:w
@@ -290,7 +290,7 @@
% \begin{macro}{\ldb_parse_done:w}
% Removes the \cs{q_error} token when parsing successfully completes.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_parse_done:w \q_error { }
+\cs_new_protected:Npn \ldb_parse_done:w \q_error { }
% \end{macrocode}
% \end{macro}
%
@@ -317,7 +317,7 @@
% occurrence of |AA\q_stop| and leave the second occurrence as
% trailing garbage).
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_expand_it:w { }
+\cs_new_protected:Npn \ldb_expand_it:w { }
% \end{macrocode}
% \end{macro}
%
@@ -441,8 +441,8 @@
% \begin{macro}{\ldb_push_dot:, \ldb_push_star:}
% Record a tight or a loose binding.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_push_dot: { \ldb_push_bdg:N \c_one }
-\cs_new_protected_nopar:Npn \ldb_push_star: { \ldb_push_bdg:N \c_two }
+\cs_new_protected:Npn \ldb_push_dot: { \ldb_push_bdg:N \c_one }
+\cs_new_protected:Npn \ldb_push_star: { \ldb_push_bdg:N \c_two }
% \end{macrocode}
% \end{macro}
%
@@ -456,7 +456,7 @@
% \cs{g_ldb_bdg} to~0 (sequencing: no intervening binding was found),
% and \cs{g_ldb_mode} to~2 (we just found |<|).
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_push_begin:
+\cs_new_protected:Npn \ldb_push_begin:
{
\if_int_compare:w \g_ldb_mode = \c_two
\ldb_gtmp_error:
@@ -507,7 +507,7 @@
% end tag. Finally we flush the pending triple and reset
% \cs{g_ldb_type}, \cs{g_ldb_bdg} and \cs{g_ldb_mode} to~0.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_push_end:
+\cs_new_protected:Npn \ldb_push_end:
{
\if_int_compare:w \g_ldb_mode < \c_three
\ldb_gtmp_error:
@@ -530,7 +530,7 @@
% update the values of \cs{g_ldb_type}, \cs{g_ldb_bdg} and
% \cs{g_ldb_mode}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_flush:NNN
+\cs_new_protected:Npn \ldb_flush:NNN
{
% \end{macrocode}
% First, we select the appropriate handler according to whether we are
@@ -578,7 +578,7 @@
% less efficient since every numerical test would have to expand
% \cs{g_ldb_bdg_tl}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_push:
+\cs_new_protected:Npn \ldb_push:
{
\tl_gput_right:Nx \g_ldb_triples_tl
{
@@ -612,7 +612,7 @@
% \emph{i.e.} segment~4. If we are already in segment~4, that's
% where we stay.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_push_begin_tag:
+\cs_new_protected:Npn \ldb_push_begin_tag:
{
\if_int_compare:w \g_ldb_segment<\c_three
\cs_gset_eq:NN \g_ldb_segment \c_one
@@ -639,7 +639,7 @@
% |<->| is illegal. Otherwise, we simply update \cs{g_ldb_segment}
% to~2 to indicate that we are now right after a completed tag.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_push_compl_tag:
+\cs_new_protected:Npn \ldb_push_compl_tag:
{
\if_int_compare:w \g_ldb_segment > \c_two
\ldb_gtmp_error:
@@ -668,7 +668,7 @@
% allowed, and if we are in the begin sequence, only begin tags are
% allowed.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ldb_push_end_tag:
+\cs_new_protected:Npn \ldb_push_end_tag:
{
\gdef_gtmp:n { \cs_gset_eq:NN \g_ldb_segment \c_three }
\if_case:w\g_ldb_segment
diff --git a/l3trial/l3ldb/l3precom.dtx b/l3trial/l3ldb/l3precom.dtx
index e4b64fd..181e38b 100644
--- a/l3trial/l3ldb/l3precom.dtx
+++ b/l3trial/l3ldb/l3precom.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3precom.dtx Copyright (C) 2012, 2015 The LaTeX3 Project
+%% File: l3precom.dtx Copyright (C) 2012,2015,2016 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -149,7 +149,7 @@
% Before dumping, we write a message to the terminal informing the
% \enquote{user} of this fact.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \cs_dump:
+\cs_new_protected:Npn \cs_dump:
{
\iow_term:x { Precompiling~class~into~(\g_cs_dump_name_tl) }
\iow_open:Nn \c_cs_dump_iow { \g_cs_dump_name_tl }
diff --git a/l3trial/l3rand/l3rand.dtx b/l3trial/l3rand/l3rand.dtx
index 64d0e20..3f14982 100644
--- a/l3trial/l3rand/l3rand.dtx
+++ b/l3trial/l3rand/l3rand.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3rand.dtx Copyright (C) 2011,2012 The LaTeX3 Project
+%% File l3rand.dtx Copyright (C) 2011,2012,2016 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -231,7 +231,7 @@
\int_gset:Nn \g_rand_Y_int { \int_mod:nn {#1} {65536} }
\prg_replicate:nn \c_ten \rand_step:
}
-\cs_new_protected_nopar:Npn \rand_seed_from_time:
+\cs_new_protected:Npn \rand_seed_from_time:
{
\exp_args:Nf
\rand_seed:n
@@ -274,7 +274,7 @@
% does not overflow), |\int_mod:nn| produces a non-negative
% result, at most $p-1$.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \rand_step:
+\cs_new_protected:Npn \rand_step:
{
\int_set_eq:NN \l_rand_tmp_int \g_rand_X_int
\int_gset:Nn \g_rand_X_int
@@ -316,9 +316,9 @@
% In the current application, the flag label, |#1| is always
% a positive integer.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \rand_aux_flag_off:x #1
+\cs_new_protected:Npn \rand_aux_flag_off:x #1
{ \cs_set_eq:cN { l_rand_#1_flag } \tex_undefined:D }
-\cs_new_nopar:Npn \rand_aux_flag_on:x #1
+\cs_new:Npn \rand_aux_flag_on:x #1
{ \exp_args:Nc \use_none:n { l_rand_#1_flag } }
\prg_new_conditional:Npnn \rand_aux_flag_if_on:x #1 { T, TF }
{
@@ -346,7 +346,7 @@
% to get a proper halfword, we throw away any zero, and subtract
% $1$: the resulting range is $[0,2^{16}-1]$, equidistributed.
% \begin{macrocode}
-\cs_new_nopar:Npn \rand_get:
+\cs_new:Npn \rand_get:
{
\int_eval:n
{
@@ -355,7 +355,7 @@
\g_rand_Y_int ;
}
}
-\cs_new_nopar:Npn \rand_get_loop:www #1 ; #2 ; #3 ;
+\cs_new:Npn \rand_get_loop:www #1 ; #2 ; #3 ;
{
\rand_aux_flag_if_on:xTF {#1}
{
@@ -371,7 +371,7 @@
;
#2 ;
}
-\cs_new_nopar:Npn \rand_get_end:www #1 ; #2 ; #3 ;
+\cs_new:Npn \rand_get_end:www #1 ; #2 ; #3 ;
{
\rand_aux_flag_on:x {#1}
\if_int_compare:w #2 = \c_zero
@@ -397,9 +397,9 @@
% flags down and updating the values of $X$ and $Y$
% by calling \cs{rand_step:}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \rand_clean:
+\cs_new_protected:Npn \rand_clean:
{ \rand_clean_loop:w 1 ; }
-\cs_new_protected_nopar:Npn \rand_clean_loop:w #1 ;
+\cs_new_protected:Npn \rand_clean_loop:w #1 ;
{
\rand_aux_flag_if_on:xT {#1}
{
@@ -441,7 +441,7 @@
\__int_value:w \__int_eval:w #2 ;
}
}
-\cs_new_nopar:Npn \rand_range_aux:ww #1 ; #2 ;
+\cs_new:Npn \rand_range_aux:ww #1 ; #2 ;
{
\if_int_compare:w #1 < #2 \exp_stop_f:
\if_int_compare:w
@@ -482,7 +482,7 @@
% a result larger than |#2|; in that case, we start again from
% \cs{rand_range_small:nn} with new random numbers.
% \begin{macrocode}
-\cs_new_nopar:Npn \rand_range_small:nn #1#2
+\cs_new:Npn \rand_range_small:nn #1#2
{
\exp_args:Nf \rand_range_small_aux:nnn
{
@@ -497,7 +497,7 @@
{#1}
{#2}
}
-\cs_new_nopar:Npn \rand_range_small_aux:nnn #1#2#3
+\cs_new:Npn \rand_range_small_aux:nnn #1#2#3
{
\if_int_compare:w #1 > #3 \exp_stop_f:
\rand_range_small:nn {#2} {#3}
@@ -527,13 +527,13 @@
% range. Again, it calls \cs{rand_range_large:nn} in case
% of failure.
% \begin{macrocode}
-\cs_new_nopar:Npn \rand_range_large:nn
+\cs_new:Npn \rand_range_large:nn
{
\exp_after:wN \rand_range_large_aux:wwnn
\__int_value:w \rand_get: \exp_after:wN ;
\__int_value:w \rand_get: ;
}
-\cs_new_nopar:Npn \rand_range_large_aux:wwnn #1 ; #2 ; #3 #4
+\cs_new:Npn \rand_range_large_aux:wwnn #1 ; #2 ; #3 #4
{
\if_int_compare:w #1 = \c_zero
\if_int_compare:w #2 > \c_zero
@@ -546,7 +546,7 @@
\fi:
\rand_range_large:nn {#3} {#4}
}
-\cs_new_nopar:Npn \rand_range_large_aux:nwnn
+\cs_new:Npn \rand_range_large_aux:nwnn
#1 #2 \rand_range_large:nn #3 #4
{
#2
diff --git a/l3trial/l3str-format-new/l3str-format-new.dtx b/l3trial/l3str-format-new/l3str-format-new.dtx
index c279eb1..d64bcc1 100644
--- a/l3trial/l3str-format-new/l3str-format-new.dtx
+++ b/l3trial/l3str-format-new/l3str-format-new.dtx
@@ -523,7 +523,7 @@
% \begin{macro}[aux,EXP]{\@@_parse:n}
% This must be called within a \cs{@@_val_frame:n}
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_parse:n
+\cs_new:Npn \@@_parse:n
{ \@@_keyval_parse:NNn \@@_key:n \@@_key:nn }
% \end{macrocode}
% \end{macro}
@@ -666,7 +666,7 @@
% number of padding characters is odd, we add one more after than
% before.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_align:n
+\cs_new:Npn \@@_align:n
{
\@@_val_do:nn { S }
{
@@ -1149,7 +1149,7 @@
% Call \cs{@@_tl:NNNnnNn} to read the parsed \meta{format
% specification}. Then convert the result to a string.
% \begin{macrocode}
-\cs_new_nopar:Npn \tl_format:Nn { \exp_args:No \tl_format:nn }
+\cs_new:Npn \tl_format:Nn { \exp_args:No \tl_format:nn }
\cs_generate_variant:Nn \tl_format:Nn { c }
\cs_new:Npn \tl_format:nn #1#2
{
diff --git a/l3trial/l3trace/l3trace.dtx b/l3trial/l3trace/l3trace.dtx
index 4ed01c4..d559bb7 100644
--- a/l3trial/l3trace/l3trace.dtx
+++ b/l3trial/l3trace/l3trace.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3trace.dtx (C) Copyright 2012 The LaTeX3 Project
+%% File l3trace.dtx (C) Copyright 2012,2016 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -252,7 +252,7 @@
% In case we want to show the content of some sequence we locally redefine
% their data structures (may have to be done for other types as well).
% \begin{macrocode}
-\cs_new_nopar:Npn \trace_display:x #1
+\cs_new:Npn \trace_display:x #1
{
\__seq_push_item_def:n { ##1 \space }
\typeout
@@ -272,7 +272,7 @@
% \begin{macro}{\traceonly}
% Tracing only some (at the moment exactly one) function and its subcomponents.
% \begin{macrocode}
- % \cs_new_nopar:Npn \traceonly #1
+ % \cs_new:Npn \traceonly #1
% {
% \notrace
% \tl_set:Nn \l_trace_only_tl {#1}
@@ -284,7 +284,7 @@
% rubbish ... the idea should be to allow for recursive entering the same
% function ... fix some other time :-) }
% \begin{macrocode}
- % \cs_gset_nopar:Npn \trace_push:n ##1
+ % \cs_gset:Npn \trace_push:n ##1
% {
% \tl_set:Nn \l_trace_this_only_tl {##1}
% \token_if_eq_meaning:NNT
@@ -299,7 +299,7 @@
% \end{macrocode}
%
% \begin{macrocode}
- % \cs_set_nopar:Npn \trace_pop:n ##1
+ % \cs_set:Npn \trace_pop:n ##1
% {
% \trace:n {leaving~##1}
% \tl_gset:Nx \g_trace_prefix_tl { \tl_tail:N \g_trace_prefix_tl }
@@ -407,7 +407,7 @@
% \begin{macro}{\trace_show_marks:}
% Show the current meaning of the different marks on the page.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \trace_show_marks:
+\cs_new_protected:Npn \trace_show_marks:
{
\__msg_show_pre:nnnnnn { trace } { show-marks } { } { } { } { }
\__msg_show_wrap:n
diff --git a/l3trial/l3tree/l3tree.dtx b/l3trial/l3tree/l3tree.dtx
index 2614505..37626e0 100644
--- a/l3trial/l3tree/l3tree.dtx
+++ b/l3trial/l3tree/l3tree.dtx
@@ -284,9 +284,9 @@
% result sequence into the user's variable, and clear the
% internal sequence (a small cost operation to avoid memory leaks).
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \seq_set_from_tree:NN
+\cs_new_protected:Npn \seq_set_from_tree:NN
{ \tree_extract_aux:NNN \seq_set_eq:NN }
-\cs_new_protected_nopar:Npn \seq_gset_from_tree:NN
+\cs_new_protected:Npn \seq_gset_from_tree:NN
{ \tree_extract_aux:NNN \seq_gset_eq:NN }
\cs_new_protected:Npn \tree_extract_aux:NNN #1#2#3
{
diff --git a/l3trial/xbox/xbox.dtx b/l3trial/xbox/xbox.dtx
index a1f5720..dd156c0 100644
--- a/l3trial/xbox/xbox.dtx
+++ b/l3trial/xbox/xbox.dtx
@@ -462,7 +462,7 @@
% expanded for example at the start of \tn{halign} cells. \eTeX{}'s protected
% functionality allows that: not the case for the \LaTeXe{} kernel.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xbox_leave_vmode:
+\cs_new_protected:Npn \xbox_leave_vmode:
{
\if_mode_vertical:
\exp_after:wN \tex_indent:D
@@ -511,7 +511,7 @@
% merged at a register level, but that needs both modules to be loaded
% so perhaps has to wait.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_document_names:
+\cs_new_protected:Npn \@@_document_names:
{
\dim_set:Nn \l_@@_height_dim { \box_ht:N \l_@@_tmp_box }
\dim_set:Nn \l_@@_depth_dim { \box_dp:N \l_@@_tmp_box }
@@ -1019,7 +1019,7 @@
{
\group_end:
\hcoffin_set:Nw #1
- \cs_set_nopar:cpn { environment~lrbox~end }
+ \cs_set:cpn { environment~lrbox~end }
{
\tex_unskip:D
\hcoffin_set_end:
diff --git a/l3trial/xfont/l3font.dtx b/l3trial/xfont/l3font.dtx
index 22d7c26..4cd14dc 100644
--- a/l3trial/xfont/l3font.dtx
+++ b/l3trial/xfont/l3font.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File: l3font.dtx Copyright (C) 2011,2012,2015 LaTeX3 project
+%% File: l3font.dtx Copyright (C) 2011,2012,2015,2016 LaTeX3 project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -323,7 +323,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \fontface_set:Nn #1#2
{ \tex_font:D #1 = #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \fontface_gset:Nn
+\cs_new_protected:Npn \fontface_gset:Nn
{ \tex_global:D \fontface_set:Nn }
\cs_generate_variant:Nn \fontface_set:Nn {c}
\cs_generate_variant:Nn \fontface_gset:Nn {c}
@@ -341,7 +341,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \fontface_set_at:Nnn #1#2#3
{ \tex_font:D #1 = #2 ~at~ #3 \scan_stop: }
-\cs_new_protected_nopar:Npn \fontface_gset_at:Nnn
+\cs_new_protected:Npn \fontface_gset_at:Nnn
{ \tex_global:D \fontface_set_at:Nnn }
\cs_generate_variant:Nn \fontface_set_at:Nnn {c}
\cs_generate_variant:Nn \fontface_gset_at:Nnn {c}
@@ -352,7 +352,7 @@
% \begin{macro}{\fontface_set_eq:NN,\fontface_gset_eq:NN}
% \begin{macrocode}
\cs_set_eq:NN \fontface_set_eq:NN \cs_set_eq:NN
-\cs_set_protected_nopar:Npn \fontface_gset_eq:NN
+\cs_set_protected:Npn \fontface_gset_eq:NN
{ \tex_global:D \fontface_set_eq:NN }
% \end{macrocode}
% \end{macro}
@@ -365,7 +365,7 @@
\exp_after:wN #1
\tex_the:D \tex_font:D
}
-\cs_set_protected_nopar:Npn \fontface_gset_to_current:N
+\cs_set_protected:Npn \fontface_gset_to_current:N
{ \tex_global:D \fontface_set_eq:NN }
% \end{macrocode}
% \end{macro}
@@ -375,8 +375,8 @@
% but they help to make some code clearer.
% Maybe the \cs{scan_stop:} is not useful.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \fontface_use:N #1 { #1 \scan_stop: }
-\cs_new_protected_nopar:Npn \fontface_use:c #1 { \use:c {#1} \scan_stop: }
+\cs_new_protected:Npn \fontface_use:N #1 { #1 \scan_stop: }
+\cs_new_protected:Npn \fontface_use:c #1 { \use:c {#1} \scan_stop: }
% \end{macrocode}
% \end{macro}
%
@@ -385,7 +385,7 @@
% \begin{macro}{\fontface_info:N,\fontface_current_info:}
% \begin{macrocode}
\cs_set_eq:NN \fontface_info:N \tex_fontname:D
-\cs_set_nopar:Npn \fontface_current_info: { \fontface_info:N \tex_font:D }
+\cs_set:Npn \fontface_current_info: { \fontface_info:N \tex_font:D }
% \end{macrocode}
% \end{macro}
%
@@ -411,19 +411,19 @@
% \fontface_current_xspace: }
% Accessing these registers is much more convenient by name than by number.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \fontface_current_slant:
+\cs_new_protected:Npn \fontface_current_slant:
{ \tex_fontdimen:D 1 \tex_font:D }
-\cs_new_protected_nopar:Npn \fontface_current_spaceskip:
+\cs_new_protected:Npn \fontface_current_spaceskip:
{ \tex_fontdimen:D 2 \tex_font:D }
-\cs_new_protected_nopar:Npn \fontface_current_space_stretch:
+\cs_new_protected:Npn \fontface_current_space_stretch:
{ \tex_fontdimen:D 3 \tex_font:D }
-\cs_new_protected_nopar:Npn \fontface_current_space_shrink:
+\cs_new_protected:Npn \fontface_current_space_shrink:
{ \tex_fontdimen:D 4 \tex_font:D }
-\cs_new_protected_nopar:Npn \fontface_current_xheight:
+\cs_new_protected:Npn \fontface_current_xheight:
{ \tex_fontdimen:D 5 \tex_font:D }
-\cs_new_protected_nopar:Npn \fontface_current_quad:
+\cs_new_protected:Npn \fontface_current_quad:
{ \tex_fontdimen:D 6 \tex_font:D }
-\cs_new_protected_nopar:Npn \fontface_current_xspace:
+\cs_new_protected:Npn \fontface_current_xspace:
{ \tex_fontdimen:D 7 \tex_font:D }
% \end{macrocode}
% \end{macro}
@@ -519,7 +519,7 @@
}
\cs_new_protected:Npn \math_gset_accent:NNnn #1#2#3#4
{
- \cs_gset_protected_nopar:Npx #1
+ \cs_gset_protected:Npx #1
{
\tex_mathaccent:D "
\math_class_to_int:N #2
@@ -570,7 +570,7 @@
}
\cs_new_protected:Npn \math_gset_delimiter:NNnnnn #1#2#3#4#5#6
{
- \cs_gset_protected_nopar:Npx #1
+ \cs_gset_protected:Npx #1
{
\tex_delimiter:D "
\math_class_to_int:N #2
@@ -610,7 +610,7 @@
}
\cs_new_protected:Npn \math_gset_radical:Nnnnn #1#2#3#4#5
{
- \cs_gset_protected_nopar:Npx #1
+ \cs_gset_protected:Npx #1
{
\tex_radical:D "
\int_to_Hex:n
diff --git a/l3trial/xfont/xfss.dtx b/l3trial/xfont/xfss.dtx
index fac856f..2a207cd 100644
--- a/l3trial/xfont/xfss.dtx
+++ b/l3trial/xfont/xfss.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File xfss.dtx Copyright (C) 2011,2012,2015 The LaTeX3 Project
+%% File xfss.dtx Copyright (C) 2011,2012,2015,2016 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -488,12 +488,12 @@
% Not sure what the correct behaviour with respect to groups
% should be.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_spacefactor_save:
+\cs_new_protected:Npn \xfss_spacefactor_save:
{
- \cs_gset_protected_nopar:Npx \xfss_spacefactor_restore:
+ \cs_gset_protected:Npx \xfss_spacefactor_restore:
{ \tex_spacefactor:D = \tex_the:D \tex_spacefactor:D \tex_relax:D }
}
-\cs_new_protected_nopar:Npn \xfss_spacefactor_restore: { \ERROR }
+\cs_new_protected:Npn \xfss_spacefactor_restore: { \ERROR }
% \end{macrocode}
% \end{macro}
%
@@ -506,14 +506,14 @@
% (whose default unit will be \texttt{pt}). Returns a dimension
% without its \texttt{pt} unit.
% \begin{macrocode}
-\cs_new_nopar:Npn \xfss_dim_strip_pt:n #1
+\cs_new:Npn \xfss_dim_strip_pt:n #1
{
\exp_after:wN \xfss_dim_strip_pt:w
\dim_use:N \__dim_eval:w #1 pt \__dim_eval_end: \q_stop
}
\use:x
{
- \cs_new_nopar:Npn \exp_not:N \xfss_dim_strip_pt:w
+ \cs_new:Npn \exp_not:N \xfss_dim_strip_pt:w
##1.##2 \tl_to_str:n {pt} ##3 \exp_not:N \q_stop
{
##1
@@ -527,7 +527,7 @@
% \begin{macro}{\xfss_default_units:w}
% Straight from \LaTeXe{}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_default_units:w
+\cs_new_protected:Npn \xfss_default_units:w
{ \tex_afterassignment:D \use_none_delimit_by_q_nil:w }
% \end{macrocode}
% \end{macro}
@@ -551,7 +551,7 @@
% \end{syntax}
% Counts the number of key--value pairs in the property list.
% \begin{macrocode}
-\cs_set_nopar:Npn \prop_count:N #1
+\cs_set:Npn \prop_count:N #1
{
\int_eval:n
{
@@ -559,7 +559,7 @@
\prop_map_function:NN #1 \prop_count_aux:nn
}
}
-\cs_new_nopar:Npn \prop_count_aux:nn #1 #2 { + 1 }
+\cs_new:Npn \prop_count_aux:nn #1 #2 { + 1 }
% \end{macrocode}
% \end{function}
%
@@ -569,7 +569,7 @@
% \begin{macro}{\xfss_text_in_math:n}
% \LaTeXe's \cs{leavevmode} and \cs{mbox}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \mode_leave_vertical:
+\cs_new_protected:Npn \mode_leave_vertical:
{ \hbox_unpack_clear:N \c_empty_box }
\cs_if_free:NT \xfss_text_in_math:n
{
@@ -983,7 +983,7 @@
% \begin{macro}{\xfss_switch_catcodes:}
% Turn on the catcode regime.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_switch_catcodes:
+\cs_new_protected:Npn \xfss_switch_catcodes:
{
\bool_if:NF \l_xfss_catcodes_status_bool
{
@@ -1124,7 +1124,7 @@
%
% \begin{macro}{\xfss_encoding_update:}
% \begin{macrocode}
-\cs_new_protected_nopar:Nn \xfss_encoding_update:
+\cs_new_protected:Nn \xfss_encoding_update:
{
\cs_set_eq:cN { xfss_ \l_xfss_encoding_tl _cmd:NN } \xfss_current_cmd:NN
\cs_set_eq:cN { xfss_ \l_xfss_encoding_current_tl _cmd:NN }
@@ -1147,7 +1147,7 @@
\prop_get:NoN \g_xfss_cdp_prop {#1} \l_xfss_tmpa_tl
\exp_after:wN \xfss_encoding_setup_defaults_aux:w \l_xfss_tmpa_tl \q_stop
}
-\cs_new_protected_nopar:Npn
+\cs_new_protected:Npn
\xfss_encoding_setup_defaults_aux:w #1 / #2 / #3 \q_stop
{
\tl_set:Nn \l_xfss_default_family_tl {#1}
@@ -1240,7 +1240,7 @@
% file, with the relevant catcode setup. See the section on
% parsing font definition files for details.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_font_try_load_family:
+\cs_new_protected:Npn \xfss_font_try_load_family:
{
\cs_if_exist:cF {\l_xfss_encoding_tl+\l_xfss_family_tl}
{
@@ -1460,7 +1460,7 @@
% \begin{macrocode}
\tl_new:N \l_xfss_wrong_font_tl
\tl_new:N \g_xfss_last_font_tl
-\cs_new_protected_nopar:Npn \xfss_wrong_font:
+\cs_new_protected:Npn \xfss_wrong_font:
{
% install defaults if in math:
\xfss_encoding_setup_defaults:o { \l_xfss_encoding_tl }
@@ -1522,7 +1522,7 @@
% one is specific to the font (encoding, family, series
% and shape).
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_fontface_find:
+\cs_new_protected:Npn \xfss_fontface_find:
{
\xfss_fontface_find_external:
\fontface_gset:cn \g_xfss_fontface_csname_tl {\l_xfss_external_font_tl}
@@ -1550,7 +1550,7 @@
% the first attempt failed. As always, the fall-back
% is to select the error font.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_fontface_find_external:
+\cs_new_protected:Npn \xfss_fontface_find_external:
{
\tl_clear:N \l_xfss_external_font_tl
\tl_set:Nx \l_xfss_font_info_tl
@@ -1611,7 +1611,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_try_simple_size:
+\cs_new_protected:Npn \xfss_try_simple_size:
{
\cs_set:Npn \xfss_tmp: {\cs_set:Npn \xfss_extract_font_info:w ####1 }
\exp_after:wN \xfss_tmp: \exp_after:wN <\l_xfss_size_tl> ##2 < ##3 \q_stop
@@ -1888,7 +1888,7 @@
% \begin{macro}{\xfss_activate_subst_correction:}
% Should it be here?
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_activate_subst_correction:
+\cs_new_protected:Npn \xfss_activate_subst_correction:
{
\cs_gset:Npx \xfss_subst_correction:
{
@@ -1911,7 +1911,7 @@
% Then set the default font attributes as they are
% currently pointing to error font shape.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_process_table:
+\cs_new_protected:Npn \xfss_process_table:
{
\xfss_process_table_check_defaults:
\xfss_process_table_check_error_font:
@@ -1921,7 +1921,7 @@
\xfss_set_shape:x {\shapedefault}
\bool_gset_true:N \g_xfss_document_bool
}
-\cs_new_protected_nopar:Npn \xfss_process_table_check_defaults:
+\cs_new_protected:Npn \xfss_process_table_check_defaults:
{
\prop_map_inline:Nn \g_xfss_cdp_prop
{
@@ -1939,7 +1939,7 @@
{ \msg_error:nnxx {xfss} {defaults-broken} {##1} {##2} }
}
}
-\cs_new_protected_nopar:Npn \xfss_process_table_check_error_font:
+\cs_new_protected:Npn \xfss_process_table_check_error_font:
{
\group_begin:
\int_set:Nn \tex_escapechar:D {\c_minus_one}
@@ -1966,9 +1966,9 @@
\FIXME % implement
}
\cs_set_eq:NN \mathalpha \scan_stop: % so that \mathalpha is non-expandable.
-\cs_new_eq:NN \xfss_install_math_alphabet:Nn \cs_gset_protected_nopar:Npn
+\cs_new_eq:NN \xfss_install_math_alphabet:Nn \cs_gset_protected:Npn
\tl_new:N \l_xfss_math_fonts_assign_tl
-\cs_new_protected_nopar:Npn \xfss_calculate_math_sizes:
+\cs_new_protected:Npn \xfss_calculate_math_sizes:
{
\msg_info:nnx {xfss} {calc-math-sizes} {\l_xfss_size_tl}
\dim_set:Nn \l_xfss_tmpa_dim { \l_xfss_size_tl pt }
@@ -1998,7 +1998,7 @@
% This command is used to switch to the font for typesetting operators
% such as \cs{lim}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \math_operator_font:
+\cs_new_protected:Npn \math_operator_font:
{ \mathgroup_use:N \symoperators }
% \end{macrocode}
% \end{macro}
@@ -2054,7 +2054,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_check_math_fonts:
+\cs_new_protected:Npn \xfss_check_math_fonts:
{
\tl_if_eq:NNF \g_xfss_setup_currsize_tl \l_xfss_size_tl
{
@@ -2070,7 +2070,7 @@
%
% \begin{macrocode}
\cs_clear:N \xfss_init_restore_glb_settings:
-\cs_new_protected_nopar:Npn \xfss_restore_glb_settings:
+\cs_new_protected:Npn \xfss_restore_glb_settings:
{
\group_begin:
\tl_set_eq:NN \l_xfss_size_tl \g_xfss_curr_math_size_tl
@@ -2509,10 +2509,10 @@
% \begin{macro}{\xfss_init_restore_version:,
% \xfss_restore_version:,\xfss_restore_mathversion:}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_init_restore_version:
+\cs_new_protected:Npn \xfss_init_restore_version:
{
\bool_gset_false:N \g_xfss_restore_version_bool
- \cs_gset_protected_nopar:Npx \xfss_restore_mathversion:
+ \cs_gset_protected:Npx \xfss_restore_mathversion:
{
\xfss_math_version_use:x { \l_xfss_math_version_tl }
\exp_not:N \int_gset:cn
@@ -2521,7 +2521,7 @@
}
\group_insert_after:N \xfss_restore_version:
}
-\cs_new_protected_nopar:Npn \xfss_restore_version:
+\cs_new_protected:Npn \xfss_restore_version:
{
\mode_if_math:TF
{ \group_insert_after:N \xfss_restore_version: }
@@ -2745,7 +2745,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \xfss_new_math_alphabet:Nnnnn #1#2#3#4#5
{
- \cs_set_protected_nopar:Npx #1
+ \cs_set_protected:Npx #1
{
\tl_if_empty:nTF {#5}
{
@@ -3006,7 +3006,7 @@
{ \cs_to_str:N #3 } \l_xfss_tmpb_tl
\cs_set:Npn \xfss_tmp:w \xfss_select_math_group:Nnnn #3 ##1 ##2 \q_nil
{
- \cs_gset_protected_nopar:Npn #3
+ \cs_gset_protected:Npn #3
{
\mode_if_math:F
{ \msg_error:nnx {xfss} {only-math-cmd} { \token_to_str:N #3 } }
@@ -3264,9 +3264,9 @@
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_maybe_ic:
+\cs_new_protected:Npn \xfss_maybe_ic:
{ \peek_after:Nw \xfss_maybe_ic_aux: }
-\cs_new_protected_nopar:Npn \xfss_maybe_ic_aux:
+\cs_new_protected:Npn \xfss_maybe_ic_aux:
{
\dim_compare:nNnF \fontface_current_slant: > \c_zero_dim
{
@@ -3286,7 +3286,7 @@
\tl_map_break:
}
}
-\cs_new_protected_nopar:Npn \xfss_sw_slant:
+\cs_new_protected:Npn \xfss_sw_slant:
{
\dim_compare:nNnTF \l_last_skip = \c_zero_dim
{ \xfss_fix_penalty: }
@@ -3297,7 +3297,7 @@
\hskip \l_xfss_tmp_skip
}
}
-\cs_new_protected_nopar:Npn \xfss_fix_penalty:
+\cs_new_protected:Npn \xfss_fix_penalty:
{
\int_compare:nNnTF \tex_lastpenalty:D = 0
{ \tex_italiccorrection:D }
@@ -3420,7 +3420,7 @@
% and so on.
% \begin{macrocode}
%<*!initex>
-\cs_new_nopar:Npn \xfss_extract_normalsize:
+\cs_new:Npn \xfss_extract_normalsize:
{
\exp_after:wN \xfss_extract_size_aux:Nnnw
\normalsize \q_nil
@@ -3459,7 +3459,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\cs_set_protected_nopar:Npn \operator at font {\math_operator_font:}
+\cs_set_protected:Npn \operator at font {\math_operator_font:}
% \end{macrocode}
%
% \begin{macrocode}
@@ -3477,7 +3477,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xfss_size_diff_warning:
+\cs_new_protected:Npn \xfss_size_diff_warning:
{
\dim_compare:nNnT \g_xfss_font_submax_tl > \fontsubfuzz
{ \msg_warning:nnx {xfss} {size-subst} {\g_xfss_font_submax_tl} }
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list