[latex3-commits] [l3svn] 01/02: Drop most of nopar in l3kernel (bar basics/expan/tl)
noreply at latex-project.org
noreply at latex-project.org
Mon Jun 13 23:41:45 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 5f669b51942747ed85730a253c5b36ab2b7ebbf8
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Jun 13 21:27:04 2016 +0100
Drop most of nopar in l3kernel (bar basics/expan/tl)
Other than the three 'tricky' modules this is largely a
mechanical excercise. The three outstanding modules need
more thought as the nature of the commands produces is
tricker: to be done one at a time.
There are a few edge case questions still open re.
what is an 'document' command and how they should be
set up.
---
l3kernel/expl3.dtx | 3 +-
l3kernel/l3basics.dtx | 2 +-
l3kernel/l3bootstrap.dtx | 4 +-
l3kernel/l3box.dtx | 4 +-
l3kernel/l3candidates.dtx | 92 ++++++++++++------------
l3kernel/l3clist.dtx | 22 +++---
l3kernel/l3coffins.dtx | 6 +-
l3kernel/l3color.dtx | 12 ++--
l3kernel/l3doc.dtx | 78 ++++++++++----------
l3kernel/l3drivers.dtx | 172 ++++++++++++++++++++++----------------------
l3kernel/l3file.dtx | 52 +++++++-------
l3kernel/l3final.dtx | 8 +--
l3kernel/l3fp-assign.dtx | 12 ++--
l3kernel/l3fp-basics.dtx | 6 +-
l3kernel/l3fp-convert.dtx | 8 +--
l3kernel/l3fp-extended.dtx | 4 +-
l3kernel/l3fp-logic.dtx | 4 +-
l3kernel/l3fp-parse.dtx | 40 +++++------
l3kernel/l3fp-traps.dtx | 28 ++++----
l3kernel/l3fp-trig.dtx | 8 +--
l3kernel/l3int.dtx | 50 ++++++-------
l3kernel/l3keys.dtx | 56 +++++++--------
l3kernel/l3msg.dtx | 16 ++---
l3kernel/l3prg.dtx | 26 +++----
l3kernel/l3prop.dtx | 12 ++--
l3kernel/l3seq.dtx | 26 +++----
l3kernel/l3skip.dtx | 6 +-
l3kernel/l3str.dtx | 12 ++--
l3kernel/l3token.dtx | 34 ++++-----
29 files changed, 401 insertions(+), 402 deletions(-)
diff --git a/l3kernel/expl3.dtx b/l3kernel/expl3.dtx
index 5a97f76..aa237c0 100644
--- a/l3kernel/expl3.dtx
+++ b/l3kernel/expl3.dtx
@@ -896,8 +896,7 @@
% repository.
% \item At an internal level, most functions should be generated
% \tn{long} (using \cs{cs_new:Npn}) rather than \enquote{short} (using
-% \cs{cs_new_nopar:Npn}). However, functions which take no arguments
-% should be set \enquote{short}.
+% \cs{cs_new_nopar:Npn}).
% \item Where possible, declare all variables and functions (using
% \cs{cs_new:Npn}, \cs{tl_new:N}, etc.) before use.
% \item Prefer \enquote{higher-level} functions over \enquote{lower-level},
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index 86ee484..8a4117e 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -558,7 +558,7 @@
% \cs_gset_nopar:Nx, \cs_gset_nopar:cx
% }
% \begin{syntax}
-% \cs{cs_gset_nopar:Nn} \meta{function} \Arg{code}
+% \cs{cs_git cogset_nopar:Nn} \meta{function} \Arg{code}
% \end{syntax}
% Sets \meta{function} to expand to \meta{code} as replacement text.
% Within the \meta{code}, the number of \meta{parameters} is detected
diff --git a/l3kernel/l3bootstrap.dtx b/l3kernel/l3bootstrap.dtx
index b8ac287..ca5a5ef 100644
--- a/l3kernel/l3bootstrap.dtx
+++ b/l3kernel/l3bootstrap.dtx
@@ -666,7 +666,7 @@
{
\bool_if:NF \l__kernel_expl_bool
{
- \cs_set_protected_nopar:Npx \ExplSyntaxOff
+ \cs_set_protected:Npx \ExplSyntaxOff
{
\char_set_catcode:nn { 9 } { \char_value_catcode:n { 9 } }
\char_set_catcode:nn { 32 } { \char_value_catcode:n { 32 } }
@@ -680,7 +680,7 @@
\tex_endlinechar:D =
\tex_the:D \tex_endlinechar:D \scan_stop:
\bool_set_false:N \l__kernel_expl_bool
- \cs_set_protected_nopar:Npn \ExplSyntaxOff { }
+ \cs_set_protected:Npn \ExplSyntaxOff { }
}
}
\char_set_catcode_ignore:n { 9 } % tab
diff --git a/l3kernel/l3box.dtx b/l3kernel/l3box.dtx
index b1543b1..e42471d 100644
--- a/l3kernel/l3box.dtx
+++ b/l3kernel/l3box.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3box.dtx Copyright (C) 2005-2015 The LaTeX3 Project
+%% File: l3box.dtx Copyright (C) 2005-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
@@ -932,7 +932,7 @@
\cs_new_protected:Npn \box_show:N #1
{ \box_show:Nnn #1 \c_max_int \c_max_int }
\cs_generate_variant:Nn \box_show:N { c }
-\cs_new_protected_nopar:Npn \box_show:Nnn
+\cs_new_protected:Npn \box_show:Nnn
{ \@@_show:NNnn \c_one }
\cs_generate_variant:Nn \box_show:Nnn { c }
% \end{macrocode}
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 2306fd9..b7a7946 100755
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -1111,9 +1111,9 @@
% the csname should be turned to a control sequence within a group
% (see \cs{cs_show:c}).
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \cs_log:N
+\cs_new_protected:Npn \cs_log:N
{ \__msg_log_next: \cs_show:N }
-\cs_new_protected_nopar:Npn \cs_log:c
+\cs_new_protected:Npn \cs_log:c
{ \__msg_log_next: \cs_show:c }
% \end{macrocode}
% \end{macro}
@@ -1121,7 +1121,7 @@
% \begin{macro}[int]{\__kernel_register_log:N, \__kernel_register_log:c}
% Redirect the output of \cs{__kernel_register_show:N} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \__kernel_register_log:N
+\cs_new_protected:Npn \__kernel_register_log:N
{ \__msg_log_next: \__kernel_register_show:N }
\cs_generate_variant:Nn \__kernel_register_log:N { c }
% \end{macrocode}
@@ -1782,9 +1782,9 @@
% \begin{macro}{\clist_log:N, \clist_log:c, \clist_log:n}
% Redirect output of \cs{clist_show:N} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \clist_log:N
+\cs_new_protected:Npn \clist_log:N
{ \__msg_log_next: \clist_show:N }
-\cs_new_protected_nopar:Npn \clist_log:n
+\cs_new_protected:Npn \clist_log:n
{ \__msg_log_next: \clist_show:n }
\cs_generate_variant:Nn \clist_log:N { c }
% \end{macrocode}
@@ -2050,7 +2050,7 @@
% that for the corners. However, there is only one value needed here and
% a fixed input property list, so things are a bit clearer.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_find_bounding_shift:
+\cs_new_protected:Npn \@@_find_bounding_shift:
{
\dim_set:Nn \l_@@_bounding_shift_dim { \c_max_dim }
\prop_map_inline:Nn \l_@@_bounding_prop
@@ -2255,7 +2255,7 @@
% \begin{macro}{\coffin_log_structure:N, \coffin_log_structure:c}
% Redirect output of \cs{coffin_show_structure:N} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \coffin_log_structure:N
+\cs_new_protected:Npn \coffin_log_structure:N
{ \__msg_log_next: \coffin_show_structure:N }
\cs_generate_variant:Nn \coffin_log_structure:N { c }
% \end{macrocode}
@@ -2308,9 +2308,9 @@
% Usual map breaking functions. Those are not yet in \pkg{l3kernel}
% proper since the mapping below is the first of its kind.
% \begin{macrocode}
-\cs_new_nopar:Npn \ior_map_break:
+\cs_new:Npn \ior_map_break:
{ \__prg_map_break:Nn \ior_map_break: { } }
-\cs_new_nopar:Npn \ior_map_break:n
+\cs_new:Npn \ior_map_break:n
{ \__prg_map_break:Nn \ior_map_break: }
% \end{macrocode}
% \end{macro}
@@ -2326,11 +2326,11 @@
% This mapping cannot be nested as the stream has only one \enquote{current
% line}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ior_map_inline:Nn
+\cs_new_protected:Npn \ior_map_inline:Nn
{ \@@_map_inline:NNn \ior_get:NN }
-\cs_new_protected_nopar:Npn \ior_str_map_inline:Nn
+\cs_new_protected:Npn \ior_str_map_inline:Nn
{ \@@_map_inline:NNn \ior_get_str:NN }
-\cs_new_protected_nopar:Npn \@@_map_inline:NNn
+\cs_new_protected:Npn \@@_map_inline:NNn
{
\int_gincr:N \g__prg_map_int
\exp_args:Nc \@@_map_inline:NNNn
@@ -2363,7 +2363,7 @@
% \begin{macro}{\ior_log_streams:}
% Redirect output of \cs{ior_list_streams:} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ior_log_streams:
+\cs_new_protected:Npn \ior_log_streams:
{ \__msg_log_next: \ior_list_streams: }
% \end{macrocode}
% \end{macro}
@@ -2375,7 +2375,7 @@
% \begin{macro}{\iow_log_streams:}
% Redirect output of \cs{iow_list_streams:} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \iow_log_streams:
+\cs_new_protected:Npn \iow_log_streams:
{ \__msg_log_next: \iow_list_streams: }
% \end{macrocode}
% \end{macro}
@@ -2389,9 +2389,9 @@
% \begin{macro}{\fp_log:N, \fp_log:c, \fp_log:n}
% Redirect output of \cs{fp_show:N} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \fp_log:N
+\cs_new_protected:Npn \fp_log:N
{ \__msg_log_next: \fp_show:N }
-\cs_new_protected_nopar:Npn \fp_log:n
+\cs_new_protected:Npn \fp_log:n
{ \__msg_log_next: \fp_show:n }
\cs_generate_variant:Nn \fp_log:N { c }
% \end{macrocode}
@@ -2405,7 +2405,7 @@
% involving \tn{currentgrouplevel} and \tn{currentgrouptype}. See
% \cs{int_show:N} for details.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \int_log:N
+\cs_new_protected:Npn \int_log:N
{ \__msg_log_next: \int_show:N }
\cs_generate_variant:Nn \int_log:N { c }
% \end{macrocode}
@@ -2414,7 +2414,7 @@
% \begin{macro}{\int_log:n}
% Redirect output of \cs{int_show:n} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \int_log:n
+\cs_new_protected:Npn \int_log:n
{ \__msg_log_next: \int_show:n }
% \end{macrocode}
% \end{macro}
@@ -2428,7 +2428,7 @@
% \begin{macro}{\keys_log:nn}
% Redirect output of \cs{keys_show:nn} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \keys_log:nn
+\cs_new_protected:Npn \keys_log:nn
{ \__msg_log_next: \keys_show:nn }
% \end{macrocode}
% \end{macro}
@@ -2556,9 +2556,9 @@
% \begin{macro}{\bool_log:N, \bool_log:c, \bool_log:n}
% Redirect output of \cs{bool_show:N} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \bool_log:N
+\cs_new_protected:Npn \bool_log:N
{ \__msg_log_next: \bool_show:N }
-\cs_new_protected_nopar:Npn \bool_log:n
+\cs_new_protected:Npn \bool_log:n
{ \__msg_log_next: \bool_show:n }
\cs_generate_variant:Nn \bool_log:N { c }
% \end{macrocode}
@@ -2602,7 +2602,7 @@
% \begin{macro}{\prop_log:N, \prop_log:c}
% Redirect output of \cs{prop_show:N} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \prop_log:N
+\cs_new_protected:Npn \prop_log:N
{ \__msg_log_next: \prop_show:N }
\cs_generate_variant:Nn \prop_log:N { c }
% \end{macrocode}
@@ -2672,9 +2672,9 @@
% \cs{@@_item:n} without expansion in the input stream,
% hence in the \texttt{x}-expanding assignment.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \seq_set_filter:NNn
+\cs_new_protected:Npn \seq_set_filter:NNn
{ \@@_set_filter:NNNn \tl_set:Nx }
-\cs_new_protected_nopar:Npn \seq_gset_filter:NNn
+\cs_new_protected:Npn \seq_gset_filter:NNn
{ \@@_set_filter:NNNn \tl_gset:Nx }
\cs_new_protected:Npn \@@_set_filter:NNNn #1#2#3#4
{
@@ -2692,9 +2692,9 @@
% merge the two within a single function, but it would have weird
% semantics.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \seq_set_map:NNn
+\cs_new_protected:Npn \seq_set_map:NNn
{ \@@_set_map:NNNn \tl_set:Nx }
-\cs_new_protected_nopar:Npn \seq_gset_map:NNn
+\cs_new_protected:Npn \seq_gset_map:NNn
{ \@@_set_map:NNNn \tl_gset:Nx }
\cs_new_protected:Npn \@@_set_map:NNNn #1#2#3#4
{
@@ -2709,7 +2709,7 @@
% \begin{macro}{\seq_log:N, \seq_log:c}
% Redirect output of \cs{seq_show:N} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \seq_log:N
+\cs_new_protected:Npn \seq_log:N
{ \__msg_log_next: \seq_show:N }
\cs_generate_variant:Nn \seq_log:N { c }
% \end{macrocode}
@@ -2750,7 +2750,7 @@
% \begin{macrocode}
\cs_new_eq:NN \dim_log:N \__kernel_register_log:N
\cs_new_eq:NN \dim_log:c \__kernel_register_log:c
-\cs_new_protected_nopar:Npn \dim_log:n
+\cs_new_protected:Npn \dim_log:n
{ \__msg_log_next: \dim_show:n }
% \end{macrocode}
% \end{macro}
@@ -2760,7 +2760,7 @@
% \begin{macrocode}
\cs_new_eq:NN \skip_log:N \__kernel_register_log:N
\cs_new_eq:NN \skip_log:c \__kernel_register_log:c
-\cs_new_protected_nopar:Npn \skip_log:n
+\cs_new_protected:Npn \skip_log:n
{ \__msg_log_next: \skip_show:n }
% \end{macrocode}
% \end{macro}
@@ -2770,7 +2770,7 @@
% \begin{macrocode}
\cs_new_eq:NN \muskip_log:N \__kernel_register_log:N
\cs_new_eq:NN \muskip_log:c \__kernel_register_log:c
-\cs_new_protected_nopar:Npn \muskip_log:n
+\cs_new_protected:Npn \muskip_log:n
{ \__msg_log_next: \muskip_show:n }
% \end{macrocode}
% \end{macro}
@@ -2885,9 +2885,9 @@
% This plus \cs{exp_not:N} allows the primitive to be used to carry out
% a set operation.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \tl_set_from_file:Nnn
+\cs_new_protected:Npn \tl_set_from_file:Nnn
{ \@@_set_from_file:NNnn \tl_set:Nn }
-\cs_new_protected_nopar:Npn \tl_gset_from_file:Nnn
+\cs_new_protected:Npn \tl_gset_from_file:Nnn
{ \@@_set_from_file:NNnn \tl_gset:Nn }
\cs_generate_variant:Nn \tl_set_from_file:Nnn { c }
\cs_generate_variant:Nn \tl_gset_from_file:Nnn { c }
@@ -2927,9 +2927,9 @@
% Once the business is done using some scratch space, the tokens can be
% transferred to the real target.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \tl_set_from_file_x:Nnn
+\cs_new_protected:Npn \tl_set_from_file_x:Nnn
{ \@@_set_from_file_x:NNnn \tl_set:Nn }
-\cs_new_protected_nopar:Npn \tl_gset_from_file_x:Nnn
+\cs_new_protected:Npn \tl_gset_from_file_x:Nnn
{ \@@_set_from_file_x:NNnn \tl_gset:Nn }
\cs_generate_variant:Nn \tl_set_from_file_x:Nnn { c }
\cs_generate_variant:Nn \tl_gset_from_file_x:Nnn { c }
@@ -2971,12 +2971,12 @@
% done without an internal, but this way the logic is slightly clearer as
% everything essentially follows the same path.
% \begin{macrocode}
-\cs_new_nopar:Npn \tl_lower_case:n { \@@_change_case:nnn { lower } { } }
-\cs_new_nopar:Npn \tl_upper_case:n { \@@_change_case:nnn { upper } { } }
-\cs_new_nopar:Npn \tl_mixed_case:n { \@@_mixed_case:nn { } }
-\cs_new_nopar:Npn \tl_lower_case:nn { \@@_change_case:nnn { lower } }
-\cs_new_nopar:Npn \tl_upper_case:nn { \@@_change_case:nnn { upper } }
-\cs_new_nopar:Npn \tl_mixed_case:nn { \@@_mixed_case:nn }
+\cs_new:Npn \tl_lower_case:n { \@@_change_case:nnn { lower } { } }
+\cs_new:Npn \tl_upper_case:n { \@@_change_case:nnn { upper } { } }
+\cs_new:Npn \tl_mixed_case:n { \@@_mixed_case:nn { } }
+\cs_new:Npn \tl_lower_case:nn { \@@_change_case:nnn { lower } }
+\cs_new:Npn \tl_upper_case:nn { \@@_change_case:nnn { upper } }
+\cs_new:Npn \tl_mixed_case:nn { \@@_mixed_case:nn }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4386,7 +4386,7 @@
% \begin{macro}{\tl_log:N, \tl_log:c}
% Redirect output of \cs{tl_show:N} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \tl_log:N
+\cs_new_protected:Npn \tl_log:N
{ \__msg_log_next: \tl_show:N }
\cs_generate_variant:Nn \tl_log:N { c }
% \end{macrocode}
@@ -4395,7 +4395,7 @@
% \begin{macro}{\tl_log:n}
% Redirect output of \cs{tl_show:n} to the log.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \tl_log:n
+\cs_new_protected:Npn \tl_log:n
{ \__msg_log_next: \tl_show:n }
% \end{macrocode}
% \end{macro}
@@ -4435,7 +4435,7 @@
\group_begin:
\cs_set_protected:Npn \@@_tmp:w #1 \q_stop
{
- \cs_new_protected_nopar:Npn \@@_execute_branches_N_type:
+ \cs_new_protected:Npn \@@_execute_branches_N_type:
{
\if_int_odd:w
\if_catcode:w \exp_not:N \l_peek_token { \c_two \fi:
@@ -4464,11 +4464,11 @@
{ \@@_true:w }
{ \tl_if_empty:nTF {#2} { \@@_true:w } { \@@_false:w } }
}
-\cs_new_protected_nopar:Npn \peek_N_type:TF
+\cs_new_protected:Npn \peek_N_type:TF
{ \@@_token_generic:NNTF \@@_execute_branches_N_type: \scan_stop: }
-\cs_new_protected_nopar:Npn \peek_N_type:T
+\cs_new_protected:Npn \peek_N_type:T
{ \@@_token_generic:NNT \@@_execute_branches_N_type: \scan_stop: }
-\cs_new_protected_nopar:Npn \peek_N_type:F
+\cs_new_protected:Npn \peek_N_type:F
{ \@@_token_generic:NNF \@@_execute_branches_N_type: \scan_stop: }
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3clist.dtx b/l3kernel/l3clist.dtx
index 6aa0a90..fe1318a 100644
--- a/l3kernel/l3clist.dtx
+++ b/l3kernel/l3clist.dtx
@@ -2,7 +2,7 @@
%
%% File: l3clist.dtx Copyright (C) 2004-2011 Frank Mittelbach,
%% The LaTeX3 project
-%% (C) 2012-2015 The LaTeX3 Project
+%% (C) 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
@@ -877,9 +877,9 @@
% there needs to be the correct addition of a comma to the output. So
% a little work to do.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \clist_concat:NNN
+\cs_new_protected:Npn \clist_concat:NNN
{ \@@_concat:NNNN \tl_set:Nx }
-\cs_new_protected_nopar:Npn \clist_gconcat:NNN
+\cs_new_protected:Npn \clist_gconcat:NNN
{ \@@_concat:NNNN \tl_gset:Nx }
\cs_new_protected:Npn \@@_concat:NNNN #1#2#3#4
{
@@ -1014,9 +1014,9 @@
% Comma lists cannot hold empty values: there are therefore a couple
% of sanity checks to avoid accumulating commas.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \clist_put_left:Nn
+\cs_new_protected:Npn \clist_put_left:Nn
{ \@@_put_left:NNNn \clist_concat:NNN \clist_set:Nn }
-\cs_new_protected_nopar:Npn \clist_gput_left:Nn
+\cs_new_protected:Npn \clist_gput_left:Nn
{ \@@_put_left:NNNn \clist_gconcat:NNN \clist_set:Nn }
\cs_new_protected:Npn \@@_put_left:NNNn #1#2#3#4
{
@@ -1050,9 +1050,9 @@
% \UnitTested
% \begin{macro}[aux]{\@@_put_right:NNNn}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \clist_put_right:Nn
+\cs_new_protected:Npn \clist_put_right:Nn
{ \@@_put_right:NNNn \clist_concat:NNN \clist_set:Nn }
-\cs_new_protected_nopar:Npn \clist_gput_right:Nn
+\cs_new_protected:Npn \clist_gput_right:Nn
{ \@@_put_right:NNNn \clist_gconcat:NNN \clist_set:Nn }
\cs_new_protected:Npn \@@_put_right:NNNn #1#2#3#4
{
@@ -1105,9 +1105,9 @@
% either \cs{exp_not:n} or \cs{use_none:n} as |#2|, ensuring that the
% result can safely be an empty comma list.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \clist_pop:NN
+\cs_new_protected:Npn \clist_pop:NN
{ \@@_pop:NNN \tl_set:Nx }
-\cs_new_protected_nopar:Npn \clist_gpop:NN
+\cs_new_protected:Npn \clist_gpop:NN
{ \@@_pop:NNN \tl_gset:Nx }
\cs_new_protected:Npn \@@_pop:NNN #1#2#3
{
@@ -1601,9 +1601,9 @@
% \begin{macro}{\clist_map_break:, \clist_map_break:n}
% The break statements use the general \cs{__prg_map_break:Nn} mechanism.
% \begin{macrocode}
-\cs_new_nopar:Npn \clist_map_break:
+\cs_new:Npn \clist_map_break:
{ \__prg_map_break:Nn \clist_map_break: { } }
-\cs_new_nopar:Npn \clist_map_break:n
+\cs_new:Npn \clist_map_break:n
{ \__prg_map_break:Nn \clist_map_break: }
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3coffins.dtx b/l3kernel/l3coffins.dtx
index 6ea8277..8b26f13 100644
--- a/l3kernel/l3coffins.dtx
+++ b/l3kernel/l3coffins.dtx
@@ -616,7 +616,7 @@
\@@_if_exist:NT #1
{
\hbox_set:Nw #1 \color_group_begin: \color_ensure_current:
- \cs_set_protected_nopar:Npn \hcoffin_set_end:
+ \cs_set_protected:Npn \hcoffin_set_end:
{
\color_group_end:
\hbox_set_end:
@@ -626,7 +626,7 @@
}
}
}
-\cs_new_protected_nopar:Npn \hcoffin_set_end: { }
+\cs_new_protected:Npn \hcoffin_set_end: { }
\cs_generate_variant:Nn \hcoffin_set:Nw { c }
% \end{macrocode}
%
@@ -669,7 +669,7 @@
}
}
}
-\cs_new_protected_nopar:Npn \vcoffin_set_end: { }
+\cs_new_protected:Npn \vcoffin_set_end: { }
\cs_generate_variant:Nn \vcoffin_set:Nnw { c }
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index c1405ae..e5ca56a 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3color.dtx Copyright(C) 2011,2012,2014 The LaTeX3 Project
+%% File: l3color.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
@@ -114,7 +114,7 @@
% needs a \tn{par}, which in horizontal mode does nothing.
% \begin{macrocode}
\cs_new_eq:NN \color_group_begin: \group_begin:
-\cs_new_protected_nopar:Npn \color_group_end:
+\cs_new_protected:Npn \color_group_end:
{
\tex_par:D
\group_end:
@@ -127,7 +127,7 @@
% current color \enquote{now}.
% \begin{macrocode}
%<*initex>
-\cs_new_protected_nopar:Npn \color_ensure_current:
+\cs_new_protected:Npn \color_ensure_current:
{ \__driver_color_ensure_current: }
%</initex>
% \end{macrocode}
@@ -136,18 +136,18 @@
% then color is not in use and this function can be a no-op.
% \begin{macrocode}
%<*package>
-\cs_new_protected_nopar:Npn \color_ensure_current: { }
+\cs_new_protected:Npn \color_ensure_current: { }
\AtBeginDocument
{
\cs_if_exist:NTF \__driver_color_ensure_current:
{
- \cs_set_protected_nopar:Npn \color_ensure_current:
+ \cs_set_protected:Npn \color_ensure_current:
{ \__driver_color_ensure_current: }
}
{
\cs_if_exist:NT \set at color
{
- \cs_set_protected_nopar:Npn \color_ensure_current:
+ \cs_set_protected:Npn \color_ensure_current:
{ \set at color }
}
}
diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index dfe3a5f..27ba996 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -1141,7 +1141,7 @@ Do not distribute a modified version of this file.
% A few more letters are \enquote{private} in a \LaTeX3 programming
% environment.
% \begin{macrocode}
-\cs_gset_nopar:Npn \MakePrivateLetters
+\cs_gset:Npn \MakePrivateLetters
{
\char_set_catcode_letter:N \@
\char_set_catcode_letter:N \_
@@ -1193,7 +1193,7 @@ Do not distribute a modified version of this file.
% Customise lists.
% \begin{macrocode}
\cs_new_eq:NN \@@_oldlist:nn \list
-\cs_gset_nopar:Npn \list #1 #2
+\cs_gset:Npn \list #1 #2
{ \@@_oldlist:nn {#1} { #2 \dim_zero:N \listparindent } }
\setlength \parindent { 2em }
\setlength \itemindent { 0pt }
@@ -1214,7 +1214,7 @@ Do not distribute a modified version of this file.
% Different design and/or structure is called for).
% \begin{macrocode}
\@addtoreset{section}{part}
-\cs_gset_nopar:Npn \l at section #1#2
+\cs_gset:Npn \l at section #1#2
{
\ifnum \c at tocdepth >\z@
\addpenalty\@secpenalty
@@ -1230,7 +1230,7 @@ Do not distribute a modified version of this file.
\endgroup
\fi
}
-\cs_gset_nopar:Npn \l at subsection
+\cs_gset:Npn \l at subsection
{ \@dottedtocline{2}{2.5em}{2.3em} } % #2 = 1.5em
% \end{macrocode}
% \end{macro}
@@ -1641,7 +1641,7 @@ Do not distribute a modified version of this file.
\@@_function_typeset:
\@@_function_descr_start:w
}
-\cs_new_protected_nopar:Npn \@@_function_end:
+\cs_new_protected:Npn \@@_function_end:
{
\@@_function_descr_stop:
\@@_function_assemble:
@@ -1658,12 +1658,12 @@ Do not distribute a modified version of this file.
% scene. Further code typesets a coffin, so we end the paragraph and
% allow a page break.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_function_typeset_start:
+\cs_new_protected:Npn \@@_function_typeset_start:
{
\par \bigskip \noindent
\phantomsection
}
-\cs_new_protected_nopar:Npn \@@_function_typeset_stop:
+\cs_new_protected:Npn \@@_function_typeset_stop:
{
\par
\allowbreak
@@ -1689,7 +1689,7 @@ Do not distribute a modified version of this file.
\bool_set_false:N \l_@@_macro_rEXP_bool
\bool_set_false:N \l_@@_no_label_bool
\char_set_catcode_active:N \<
- \cs_set_protected_nopar:Npn < ##1 > { \meta {##1} }
+ \cs_set_protected:Npn < ##1 > { \meta {##1} }
}
\group_end:
% \end{macrocode}
@@ -1725,7 +1725,7 @@ Do not distribute a modified version of this file.
% Otherwise, we have a regular control sequence, which we decompose
% using \cs{@@_function_parse_cs_aux:nnN}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_function_parse:
+\cs_new_protected:Npn \@@_function_parse:
{
\seq_map_function:NN
\l_@@_function_input_seq
@@ -1772,7 +1772,7 @@ Do not distribute a modified version of this file.
% larger than the available width in the margin. The function
% \cs{@@_typeset_names:} is quite involved hence given later.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_function_typeset:
+\cs_new_protected:Npn \@@_function_typeset:
{
\dim_zero:N \l_@@_trial_width_dim
\hcoffin_set:Nn \l_@@_names_coffin { \@@_typeset_names: }
@@ -1792,12 +1792,12 @@ Do not distribute a modified version of this file.
% \env{function} environment. This is closed by \cs{@@_function_end:}
% (the end of a \env{function} environment).
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_function_descr_start:w
+\cs_new_protected:Npn \@@_function_descr_start:w
{
\vcoffin_set:Nnw \l_@@_descr_coffin { \textwidth }
\noindent \ignorespaces
}
-\cs_new_protected_nopar:Npn \@@_function_descr_stop:
+\cs_new_protected:Npn \@@_function_descr_stop:
{ \vcoffin_set_end: }
% \end{macrocode}
% \end{macro}
@@ -1809,7 +1809,7 @@ Do not distribute a modified version of this file.
% coffin. The relative positions depend on whether the names coffin
% fits in the margin. Then typeset the combination.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_function_assemble:
+\cs_new_protected:Npn \@@_function_assemble:
{
\hcoffin_set:Nn \l_@@_syntax_coffin
{ \box_use:N \g_@@_syntax_box }
@@ -1860,7 +1860,7 @@ Do not distribute a modified version of this file.
% last |\\| and the rule to be expandable, making our lives a bit
% complicated.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_typeset_names:
+\cs_new_protected:Npn \@@_typeset_names:
{
\small\ttfamily
\begin{tabular} { @{} l @{} r @{} }
@@ -1899,7 +1899,7 @@ Do not distribute a modified version of this file.
%
% Braces around |##1| are crucial since this item can be empty.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_typeset_functions:
+\cs_new_protected:Npn \@@_typeset_functions:
{
\prop_map_function:NN \l_@@_functions_block_prop
\@@_typeset_functions_auxi:nn
@@ -1989,7 +1989,7 @@ Do not distribute a modified version of this file.
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_typeset_expandability:
+\cs_new_protected:Npn \@@_typeset_expandability:
{
&
\bool_if:NT \l_@@_macro_EXP_bool
@@ -2050,7 +2050,7 @@ Do not distribute a modified version of this file.
% This function must be expandable since it produces rules for use in
% alignments.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_typeset_dates:
+\cs_new:Npn \@@_typeset_dates:
{
\bool_if:nF
{
@@ -2174,7 +2174,7 @@ Do not distribute a modified version of this file.
% \cs{l_@@_nested_macro_int} counts the number of \env{macro}
% environments around the current point (is $0$ outside).
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_macro_init:
+\cs_new_protected:Npn \@@_macro_init:
{
\int_incr:N \l_@@_nested_macro_int
\bool_set_false:N \l_@@_macro_aux_bool
@@ -2223,7 +2223,7 @@ Do not distribute a modified version of this file.
% \begin{macro}[aux]{\@@_macro_typeset:}
% This calls |\makelabel{}|
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_macro_typeset:
+\cs_new_protected:Npn \@@_macro_typeset:
{
\topsep\MacroTopsep
\trivlist
@@ -2327,7 +2327,7 @@ Do not distribute a modified version of this file.
\bool_if:NTF \l_@@_macro_aux_bool
{ \@@_typeset_aux:n {#1} } {#1}
}
-\cs_new_protected_nopar:Npn \@@_macroname_suffix:
+\cs_new_protected:Npn \@@_macroname_suffix:
{ \bool_if:NTF \l_@@_macro_TF_bool { \@@_typeset_TF: } { } }
% \end{macrocode}
% \end{macro}
@@ -2450,7 +2450,7 @@ Do not distribute a modified version of this file.
% auxiliary nor a variable (and it does not have a test), then add it
% to the sequence of non-tested macros.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_macro_end_check_tested:
+\cs_new_protected:Npn \@@_macro_end_check_tested:
{
\bool_if:nT
{
@@ -2510,7 +2510,7 @@ Do not distribute a modified version of this file.
}
}
}
-\cs_new_protected_nopar:Npn \@@_print_end_definition:
+\cs_new_protected:Npn \@@_print_end_definition:
{
\group_begin:
\@@_macro_end_wrap_items:N \l_@@_macro_input_seq
@@ -2524,7 +2524,7 @@ Do not distribute a modified version of this file.
{ \seq_item:Nn \l_@@_macro_input_seq {1}\,~and~others. }
\group_end:
}
-\cs_new_protected_nopar:Npn \@@_print_documented:
+\cs_new_protected:Npn \@@_print_documented:
{
\bool_if:nT
{
@@ -2553,7 +2553,7 @@ Do not distribute a modified version of this file.
% Used by \cs{@@_macro_single:n} and in the \env{function} environment
% to typeset conditionals and auxiliary functions.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_typeset_TF:
+\cs_new_protected:Npn \@@_typeset_TF:
{
\hyperlink{explTF}
{
@@ -2665,7 +2665,7 @@ Do not distribute a modified version of this file.
% The actual character from the font |manfnt|:
% \begin{macrocode}
\font \manual = manfnt \scan_stop:
-\cs_gset_nopar:Npn \dbend { {\manual\char127} }
+\cs_gset:Npn \dbend { {\manual\char127} }
% \end{macrocode}
%
% Defines the single danger bend. Use it whenever there is a feature in
@@ -2676,7 +2676,7 @@ Do not distribute a modified version of this file.
{
\begin{trivlist}\item[]\noindent
\begingroup\hangindent=2pc\hangafter=-2
- \cs_set_nopar:Npn \par{\endgraf\endgroup}
+ \cs_set:Npn \par{\endgraf\endgroup}
\hbox to0pt{\hskip-\hangindent\dbend\hfill}\ignorespaces
}
{
@@ -2694,7 +2694,7 @@ Do not distribute a modified version of this file.
{
\begin{trivlist}\item[]\noindent
\begingroup\hangindent=3.5pc\hangafter=-2
- \cs_set_nopar:Npn \par{\endgraf\endgroup}
+ \cs_set:Npn \par{\endgraf\endgroup}
\hbox to0pt{\hskip-\hangindent\dbend\kern2pt\dbend\hfill}\ignorespaces
}{
\par\end{trivlist}
@@ -2851,8 +2851,8 @@ Do not distribute a modified version of this file.
\relax\clearpage
\docincludeaux
\IfFileExists{#1.fdd}
- { \cs_set_nopar:Npn \currentfile{#1.fdd} }
- { \cs_set_nopar:Npn \currentfile{#1.dtx} }
+ { \cs_set:Npn \currentfile{#1.fdd} }
+ { \cs_set:Npn \currentfile{#1.dtx} }
\int_compare:nNnTF \@auxout = \@partaux
{ \@latexerr{\string\include\space cannot~be~nested}\@eha }
{ \@docinclude #1 }
@@ -2867,7 +2867,7 @@ Do not distribute a modified version of this file.
\@tempswatrue
\if at partsw
\@tempswafalse
- \cs_set_nopar:Npx \@tempb{#1}
+ \cs_set:Npx \@tempb{#1}
\@for\@tempa:=\@partlist\do
{
\ifx\@tempa\@tempb\@tempswatrue\fi
@@ -2886,7 +2886,7 @@ Do not distribute a modified version of this file.
\part{\currentfile}
{
\cs_set_eq:NN \ttfamily\relax
- \cs_gset_nopar:Npx \filekey
+ \cs_gset:Npx \filekey
{ \filekey, \thepart = { \ttfamily \currentfile } }
}
\DocInput{\currentfile}
@@ -2919,14 +2919,14 @@ Do not distribute a modified version of this file.
%
% \begin{macro}{\docincludeaux}
% \begin{macrocode}
-\cs_gset_nopar:Npn \docincludeaux
+\cs_gset:Npn \docincludeaux
{
\tl_set:Nn \thepart { \alphalph { part } }
\tl_set:Nn \filesep { \thepart - }
\cs_set_eq:NN \filekey \use_none:n
\tl_gput_right:Nn \index at prologue
{
- \cs_gset_nopar:Npn \@oddfoot
+ \cs_gset:Npn \@oddfoot
{
\parbox { \textwidth }
{
@@ -2937,7 +2937,7 @@ Do not distribute a modified version of this file.
\cs_set_eq:NN \@evenfoot \@oddfoot
}
\cs_gset_eq:NN \docincludeaux \relax
- \cs_gset_nopar:Npn \@oddfoot
+ \cs_gset:Npn \@oddfoot
{
\cs_if_exist:cTF { ver @ \currentfile }
{ File~\thepart :~{\ttfamily\currentfile}~ }
@@ -3035,7 +3035,7 @@ Do not distribute a modified version of this file.
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_show_functions_defined:
+\cs_new_protected:Npn \@@_show_functions_defined:
{
\bool_if:nT
{ \g_@@_typeset_implementation_bool && \g_@@_checkfunc_bool }
@@ -3108,7 +3108,7 @@ Do not distribute a modified version of this file.
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_show_not_tested:
+\cs_new_protected:Npn \@@_show_not_tested:
{
\bool_if:NT \g_@@_checktest_bool
{
@@ -3382,12 +3382,12 @@ Do not distribute a modified version of this file.
}
}
}
-\cs_new_protected_nopar:Npn \@@_key_pop:
+\cs_new_protected:Npn \@@_key_pop:
{
\tl_set:Nx \l_@@_index_key_tl
{ \tl_tail:N \l_@@_index_key_tl }
}
-\cs_new_protected_nopar:Npn \@@_key_expl:
+\cs_new_protected:Npn \@@_key_expl:
{
\tl_if_head_eq_charcode:oNTF { \l_@@_index_key_tl } .
{ \@@_key_pop: }
@@ -3418,7 +3418,7 @@ Do not distribute a modified version of this file.
% removing anything after |:| or |_|, taking care of not expanding the
% rest for cases such as |\cs{\meta{name}:\meta{signature}}|.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_key_get_module:
+\cs_new_protected:Npn \@@_key_get_module:
{
\tl_set_eq:NN \l_@@_index_module_tl \l_@@_index_key_tl
\exp_args:No \@@_key_get_module_aux:n { \token_to_str:N : }
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 661e9f3..ba537fd 100755
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -539,13 +539,13 @@
% \begin{macro}[int]{\@@_scope_begin:, \@@_scope_end:}
% Higher-level interfaces for saving and restoring the graphic state.
% \begin{macrocode}
-\cs_new_protected_nopar:Npx \@@_scope_begin:
+\cs_new_protected:Npx \@@_scope_begin:
{
\cs_if_exist:NTF \luatex_pdfextension:D
{ \luatex_pdfextension:D save \scan_stop: }
{ \pdftex_pdfsave:D }
}
-\cs_new_protected_nopar:Npx \@@_scope_end:
+\cs_new_protected:Npx \@@_scope_end:
{
\cs_if_exist:NTF \luatex_pdfextension:D
{ \luatex_pdfextension:D restore \scan_stop: }
@@ -601,7 +601,7 @@
% There is a dedicated primitive/primitive interface for setting colors.
% As with scoping, this approach is not suitable for cached operations.
% \begin{macrocode}
-\cs_new_protected_nopar:Npx \@@_color_ensure_current:
+\cs_new_protected:Npx \@@_color_ensure_current:
{
\cs_if_exist:NTF \luatex_pdfextension:D
{ \luatex_pdfextension:D colorstack }
@@ -610,7 +610,7 @@
{ \exp_not:N \l_@@_current_color_tl }
\group_insert_after:N \exp_not:N \@@_color_reset:
}
-\cs_new_protected_nopar:Npx \@@_color_reset:
+\cs_new_protected:Npx \@@_color_reset:
{
\cs_if_exist:NTF \luatex_pdfextension:D
{ \luatex_pdfextension:D colorstack }
@@ -651,9 +651,9 @@
% \begin{macro}[int]{\@@_scope_begin:, \@@_scope_end:}
% Scoping is done using direct PDF operations here.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_scope_begin:
+\cs_new_protected:Npn \@@_scope_begin:
{ \@@_literal:n { q } }
-\cs_new_protected_nopar:Npn \@@_scope_end:
+\cs_new_protected:Npn \@@_scope_end:
{ \@@_literal:n { Q } }
% \end{macrocode}
% \end{macro}
@@ -690,12 +690,12 @@
% \begin{macro}[aux]{\@@_color_reset:}
% Directly set the color using the specials with optimisation support.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_color_ensure_current:
+\cs_new_protected:Npn \@@_color_ensure_current:
{
\tex_special:D { pdf:bcolor~\l_@@_current_color_tl }
\group_insert_after:N \@@_color_reset:
}
-\cs_new_protected_nopar:Npn \@@_color_reset:
+\cs_new_protected:Npn \@@_color_reset:
{ \tex_special:D { pdf:ecolor } }
% \end{macrocode}
% \end{macro}
@@ -723,12 +723,12 @@
{
\@ifpackageloaded { color }
{
- \cs_set_protected_nopar:Npn \@@_color_ensure_current:
+ \cs_set_protected:Npn \@@_color_ensure_current:
{
\tex_special:D { color~push~\l_@@_current_color_tl }
\group_insert_after:N \@@_color_reset:
}
- \cs_set_protected_nopar:Npn \@@_color_reset:
+ \cs_set_protected:Npn \@@_color_reset:
{ \tex_special:D { color~pop } }
}
{ }
@@ -852,9 +852,9 @@
% \begin{macro}[int]{\@@_draw_begin:, \@@_draw_end:}
% No special requirements here, so simply set up a drawing scope.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_begin:
+\cs_new_protected:Npn \@@_draw_begin:
{ \@@_draw_scope_begin: }
-\cs_new_protected_nopar:Npn \@@_draw_end:
+\cs_new_protected:Npn \@@_draw_end:
{ \@@_draw_scope_end: }
% \end{macrocode}
% \end{macro}
@@ -863,9 +863,9 @@
% In contrast to a general scope, a drawing scope is always done using
% the PDF operators so is the same for all relevant drivers.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_scope_begin:
+\cs_new_protected:Npn \@@_draw_scope_begin:
{ \@@_draw_literal:n { q } }
-\cs_new_protected_nopar:Npn \@@_draw_scope_end:
+\cs_new_protected:Npn \@@_draw_scope_end:
{ \@@_draw_literal:n { Q } }
% \end{macrocode}
% \end{macro}
@@ -916,9 +916,9 @@
% \begin{variable}[aux]{\g_@@_draw_eor_bool}
% The even-odd rule here can be implemented as a simply switch.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_evenodd_rule:
+\cs_new_protected:Npn \@@_draw_evenodd_rule:
{ \bool_gset_true:N \g_@@_draw_eor_bool }
-\cs_new_protected_nopar:Npn \@@_draw_nonzero_rule:
+\cs_new_protected:Npn \@@_draw_nonzero_rule:
{ \bool_gset_false:N \g_@@_draw_eor_bool }
\bool_new:N \g_@@_draw_eor_bool
% \end{macrocode}
@@ -938,28 +938,28 @@
% Converting paths to output is again a case of mapping directly to
% PDF operations.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_closepath:
+\cs_new_protected:Npn \@@_draw_closepath:
{ \@@_draw_literal:n { h } }
-\cs_new_protected_nopar:Npn \@@_draw_stroke:
+\cs_new_protected:Npn \@@_draw_stroke:
{ \@@_draw_literal:n { S } }
-\cs_new_protected_nopar:Npn \@@_draw_closestroke:
+\cs_new_protected:Npn \@@_draw_closestroke:
{ \@@_draw_literal:n { s } }
-\cs_new_protected_nopar:Npn \@@_draw_fill:
+\cs_new_protected:Npn \@@_draw_fill:
{
\@@_draw_literal:x
{ f \bool_if:NT \g_@@_draw_eor_bool * }
}
-\cs_new_protected_nopar:Npn \@@_draw_fillstroke:
+\cs_new_protected:Npn \@@_draw_fillstroke:
{
\@@_draw_literal:x
{ B \bool_if:NT \g_@@_draw_eor_bool * }
}
-\cs_new_protected_nopar:Npn \@@_draw_clip:
+\cs_new_protected:Npn \@@_draw_clip:
{
\@@_draw_literal:x
{ W \bool_if:NT \g_@@_draw_eor_bool * }
}
-\cs_new_protected_nopar:Npn \@@_draw_discardpath:
+\cs_new_protected:Npn \@@_draw_discardpath:
{ \@@_draw_literal:n { n } }
% \end{macrocode}
% \end{macro}
@@ -995,17 +995,17 @@
}
\cs_new_protected:Npn \@@_draw_miterlimit:n #1
{ \@@_draw_literal:x { \fp_eval:n {#1} ~ M } }
-\cs_new_protected_nopar:Npn \@@_draw_cap_butt:
+\cs_new_protected:Npn \@@_draw_cap_butt:
{ \@@_draw_literal:n { 0 ~ J } }
-\cs_new_protected_nopar:Npn \@@_draw_cap_round:
+\cs_new_protected:Npn \@@_draw_cap_round:
{ \@@_draw_literal:n { 1 ~ J } }
-\cs_new_protected_nopar:Npn \@@_draw_cap_rectangle:
+\cs_new_protected:Npn \@@_draw_cap_rectangle:
{ \@@_draw_literal:n { 2 ~ J } }
-\cs_new_protected_nopar:Npn \@@_draw_join_miter:
+\cs_new_protected:Npn \@@_draw_join_miter:
{ \@@_draw_literal:n { 0 ~ j } }
-\cs_new_protected_nopar:Npn \@@_draw_join_round:
+\cs_new_protected:Npn \@@_draw_join_round:
{ \@@_draw_literal:n { 1 ~ j } }
-\cs_new_protected_nopar:Npn \@@_draw_join_bevel:
+\cs_new_protected:Npn \@@_draw_join_bevel:
{ \@@_draw_literal:n { 2 ~ j } }
% \end{macrocode}
% \end{macro}
@@ -1204,9 +1204,9 @@
% transformation matrix. General scoping is only for the graphics stack so
% the lower-cost |gsave|/|grestore| pair are used.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_scope_begin:
+\cs_new_protected:Npn \@@_scope_begin:
{ \tex_special:D { ps:gsave } }
-\cs_new_protected_nopar:Npn \@@_scope_end:
+\cs_new_protected:Npn \@@_scope_end:
{ \tex_special:D { ps:grestore } }
% \end{macrocode}
% \end{macro}
@@ -1320,12 +1320,12 @@
% \begin{macro}[aux]{\@@_color_reset:}
% Directly set the color using the specials: no optimisation here.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_color_ensure_current:
+\cs_new_protected:Npn \@@_color_ensure_current:
{
\tex_special:D { color~push~\l_@@_current_color_tl }
\group_insert_after:N \@@_color_reset:
}
-\cs_new_protected_nopar:Npn \@@_color_reset:
+\cs_new_protected:Npn \@@_color_reset:
{ \tex_special:D { color~pop } }
% \end{macrocode}
% \end{macro}
@@ -1352,14 +1352,14 @@
% scale and $y$-axis direction. The reference point at the start of the box
% is saved (as |l3x|/|l3y|) as it is needed when inserting various items.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_begin:
+\cs_new_protected:Npn \@@_draw_begin:
{
\tex_special:D { ps::[begin] }
\tex_special:D { ps::~save }
\tex_special:D { ps::~/l3x~currentpoint~/l3y~exch~def~def }
\tex_special:D { ps::~@beginspecial }
}
-\cs_new_protected_nopar:Npn \@@_draw_end:
+\cs_new_protected:Npn \@@_draw_end:
{
\tex_special:D { ps::~@endspecial }
\tex_special:D { ps::~restore }
@@ -1372,9 +1372,9 @@
% Scope here may need to contain saved definitions, so the entire memory
% rather than just the graphic state has to be sent to the stack.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_scope_begin:
+\cs_new_protected:Npn \@@_draw_scope_begin:
{ \@@_draw_literal:n { save } }
-\cs_new_protected_nopar:Npn \@@_draw_scope_end:
+\cs_new_protected:Npn \@@_draw_scope_end:
{ \@@_draw_literal:n { restore } }
% \end{macrocode}
% \end{macro}
@@ -1427,9 +1427,9 @@
% \begin{variable}[aux]{\g_@@_draw_eor_bool}
% The even-odd rule here can be implemented as a simply switch.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_evenodd_rule:
+\cs_new_protected:Npn \@@_draw_evenodd_rule:
{ \bool_gset_true:N \g_@@_draw_eor_bool }
-\cs_new_protected_nopar:Npn \@@_draw_nonzero_rule:
+\cs_new_protected:Npn \@@_draw_nonzero_rule:
{ \bool_gset_false:N \g_@@_draw_eor_bool }
\bool_new:N \g_@@_draw_eor_bool
% \end{macrocode}
@@ -1457,9 +1457,9 @@
% using a \TeX{} switch. All of the operations end with a new path instruction
% as they do not terminate (again in contrast to PDF).
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_closepath:
+\cs_new_protected:Npn \@@_draw_closepath:
{ \@@_draw_literal:n { closepath } }
-\cs_new_protected_nopar:Npn \@@_draw_stroke:
+\cs_new_protected:Npn \@@_draw_stroke:
{
\@@_draw_literal:n { currentdict~/l3sc~known~{gsave~l3sc}~if }
\@@_draw_literal:n { stroke }
@@ -1475,12 +1475,12 @@
\@@_draw_literal:n { newpath }
\bool_gset_false:N \g_@@_draw_clip_bool
}
-\cs_new_protected_nopar:Npn \@@_draw_closestroke:
+\cs_new_protected:Npn \@@_draw_closestroke:
{
\@@_draw_closepath:
\@@_draw_stroke:
}
-\cs_new_protected_nopar:Npn \@@_draw_fill:
+\cs_new_protected:Npn \@@_draw_fill:
{
\@@_draw_literal:n { currentdict~/l3fc~known~{gsave~l3fc}~if }
\@@_draw_literal:x
@@ -1500,7 +1500,7 @@
\@@_draw_literal:n { newpath }
\bool_gset_false:N \g_@@_draw_clip_bool
}
-\cs_new_protected_nopar:Npn \@@_draw_fillstroke:
+\cs_new_protected:Npn \@@_draw_fillstroke:
{
\@@_draw_literal:n { currentdict~/l3fc~known~{gsave~l3fc}~if }
\@@_draw_literal:x
@@ -1523,10 +1523,10 @@
\@@_draw_literal:n { newpath }
\bool_gset_false:N \g_@@_draw_clip_bool
}
-\cs_new_protected_nopar:Npn \@@_draw_clip:
+\cs_new_protected:Npn \@@_draw_clip:
{ \bool_gset_true:N \g_@@_draw_clip_bool }
\bool_new:N \g_@@_draw_clip_bool
-\cs_new_protected_nopar:Npn \@@_draw_discardpath:
+\cs_new_protected:Npn \@@_draw_discardpath:
{
\bool_if:NT \g_@@_draw_clip_bool
{
@@ -1574,17 +1574,17 @@
}
\cs_new_protected:Npn \@@_draw_miterlimit:n #1
{ \@@_draw_literal:x { \fp_eval:n {#1} ~ setmiterlimit } }
-\cs_new_protected_nopar:Npn \@@_draw_cap_butt:
+\cs_new_protected:Npn \@@_draw_cap_butt:
{ \@@_draw_literal:n { 0 ~ setlinecap } }
-\cs_new_protected_nopar:Npn \@@_draw_cap_round:
+\cs_new_protected:Npn \@@_draw_cap_round:
{ \@@_draw_literal:n { 1 ~ setlinecap } }
-\cs_new_protected_nopar:Npn \@@_draw_cap_rectangle:
+\cs_new_protected:Npn \@@_draw_cap_rectangle:
{ \@@_draw_literal:n { 2 ~ setlinecap } }
-\cs_new_protected_nopar:Npn \@@_draw_join_miter:
+\cs_new_protected:Npn \@@_draw_join_miter:
{ \@@_draw_literal:n { 0 ~ setlinejoin } }
-\cs_new_protected_nopar:Npn \@@_draw_join_round:
+\cs_new_protected:Npn \@@_draw_join_round:
{ \@@_draw_literal:n { 1 ~ setlinejoin } }
-\cs_new_protected_nopar:Npn \@@_draw_join_bevel:
+\cs_new_protected:Npn \@@_draw_join_bevel:
{ \@@_draw_literal:n { 2 ~ setlinejoin } }
% \end{macrocode}
% \end{macro}
@@ -1617,7 +1617,7 @@
% We cannot undefine (local) fill/stroke colors once set up but we can
% set them blank to improve performance slightly.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_color_reset:
+\cs_new_protected:Npn \@@_draw_color_reset:
{
\@@_draw_literal:n { currentdic~/l3fc~known~{ /l3fc~ { } ~def }~if }
\@@_draw_literal:n { currentdic~/l3sc~known~{ /l3sc~ { } ~def }~if }
@@ -1784,9 +1784,9 @@
% A scope in SVG terms is slightly different to the other drivers as
% operations have to be \enquote{tied} to these not simply inside them.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_scope_begin:
+\cs_new_protected:Npn \@@_scope_begin:
{ \@@_literal:n { <g> } }
-\cs_new_protected_nopar:Npn \@@_scope_end:
+\cs_new_protected:Npn \@@_scope_end:
{ \@@_literal:n { </g> } }
% \end{macrocode}
% \end{macro}
@@ -1952,12 +1952,12 @@
% \begin{macro}[aux]{\@@_color_reset:}
% Directly set the color: same as \texttt{dvips}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_color_ensure_current:
+\cs_new_protected:Npn \@@_color_ensure_current:
{
\tex_special:D { color~push~\l_@@_current_color_tl }
\group_insert_after:N \@@_color_reset:
}
-\cs_new_protected_nopar:Npn \@@_color_reset:
+\cs_new_protected:Npn \@@_color_reset:
{ \tex_special:D { color~pop } }
% \end{macrocode}
% \end{macro}
@@ -1977,12 +1977,12 @@
% A drawing needs to be set up such that the co-ordinate system is
% translated. That is done inside a scope, which as described below
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_begin:
+\cs_new_protected:Npn \@@_draw_begin:
{
\@@_draw_scope_begin:
\@@_draw_scope:n { transform="translate({?x},{?y})~scale(1,-1)" }
}
-\cs_new_protected_nopar:Npn \@@_draw_end:
+\cs_new_protected:Npn \@@_draw_end:
{ \@@_draw_scope_end: }
% \end{macrocode}
% \end{macro}
@@ -1998,7 +1998,7 @@
% used to save the value between scopes. The result is that no direct action
% is needed when creating a scope.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_scope_begin:
+\cs_new_protected:Npn \@@_draw_scope_begin:
{
\int_set_eq:NN
\l_@@_draw_scope_int
@@ -2006,7 +2006,7 @@
\group_begin:
\int_gset:Nn \g_@@_draw_scope_int { 0 }
}
-\cs_new_protected_nopar:Npn \@@_draw_scope_end:
+\cs_new_protected:Npn \@@_draw_scope_end:
{
\prg_replicate:nn
{ \g_@@_draw_scope_int }
@@ -2092,9 +2092,9 @@
% \begin{macro}[int]{\@@_draw_evenodd_rule:, \@@_draw_nonzero_rule:}
% The fill rules here have to be handled as scopes.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_evenodd_rule:
+\cs_new_protected:Npn \@@_draw_evenodd_rule:
{ \@@_draw_scope:n { fill-rule="evenodd" } }
-\cs_new_protected_nopar:Npn \@@_draw_nonzero_rule:
+\cs_new_protected:Npn \@@_draw_nonzero_rule:
{ \@@_draw_scope:n { fill-rule="nonzero" } }
% \end{macrocode}
% \end{macro}
@@ -2118,9 +2118,9 @@
% for path drawing: not essential but avoids constructing them twice.
% Discarding a path needs a separate function as it's not quite the same.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_draw_closepath:
+\cs_new_protected:Npn \@@_draw_closepath:
{ \@@_draw_add_to_path:n { Z } }
-\cs_new_protected_nopar:Npn \@@_draw_path:n #1
+\cs_new_protected:Npn \@@_draw_path:n #1
{
\bool_if:NTF \g_@@_draw_clip_bool
{
@@ -2151,21 +2151,21 @@
\bool_gset_false:N \g_@@_draw_clip_bool
}
\int_new:N \g_@@_path_int
-\cs_new_protected_nopar:Npn \@@_draw_stroke:
+\cs_new_protected:Npn \@@_draw_stroke:
{ \@@_draw_path:n { style="fill:none" } }
-\cs_new_protected_nopar:Npn \@@_draw_closestroke:
+\cs_new_protected:Npn \@@_draw_closestroke:
{
\@@_draw_closepath:
\@@_draw_stroke:
}
-\cs_new_protected_nopar:Npn \@@_draw_fill:
+\cs_new_protected:Npn \@@_draw_fill:
{ \@@_draw_path:n { style="stroke:none" } }
-\cs_new_protected_nopar:Npn \@@_draw_fillstroke:
+\cs_new_protected:Npn \@@_draw_fillstroke:
{ \@@_draw_path:n { } }
-\cs_new_protected_nopar:Npn \@@_draw_clip:
+\cs_new_protected:Npn \@@_draw_clip:
{ \bool_gset_true:N \g_@@_draw_clip_bool }
\bool_new:N \g_@@_draw_clip_bool
-\cs_new_protected_nopar:Npn \@@_draw_discardpath:
+\cs_new_protected:Npn \@@_draw_discardpath:
{
\bool_if:NT \g_@@_draw_clip_bool
{
@@ -2234,17 +2234,17 @@
{ \@@_draw_scope:x { stroke-width=" \dim_to_decimal:n {#1} " } }
\cs_new_protected:Npn \@@_draw_miterlimit:n #1
{ \@@_draw_scope:x { stroke-miterlimit=" \fp_eval:n {#1} " } }
-\cs_new_protected_nopar:Npn \@@_draw_cap_butt:
+\cs_new_protected:Npn \@@_draw_cap_butt:
{ \@@_draw_scope:n { stroke-linecap="butt" } }
-\cs_new_protected_nopar:Npn \@@_draw_cap_round:
+\cs_new_protected:Npn \@@_draw_cap_round:
{ \@@_draw_scope:n { stroke-linecap="round" } }
-\cs_new_protected_nopar:Npn \@@_draw_cap_rectangle:
+\cs_new_protected:Npn \@@_draw_cap_rectangle:
{ \@@_draw_scope:n { stroke-linecap="square" } }
-\cs_new_protected_nopar:Npn \@@_draw_join_miter:
+\cs_new_protected:Npn \@@_draw_join_miter:
{ \@@_draw_scope:n { stroke-linejoin="miter" } }
-\cs_new_protected_nopar:Npn \@@_draw_join_round:
+\cs_new_protected:Npn \@@_draw_join_round:
{ \@@_draw_scope:n { stroke-linejoin="round" } }
-\cs_new_protected_nopar:Npn \@@_draw_join_bevel:
+\cs_new_protected:Npn \@@_draw_join_bevel:
{ \@@_draw_scope:n { stroke-linejoin="bevel" } }
% \end{macrocode}
% \end{macro}
@@ -2287,11 +2287,11 @@
}
#1 #2
}
-\cs_new_protected_nopar:Npn \@@_draw_color_cmyk:nnnn
+\cs_new_protected:Npn \@@_draw_color_cmyk:nnnn
{ \@@_draw_color_cmyk_aux:NNnnnnn \c_true_bool \c_true_bool }
-\cs_new_protected_nopar:Npn \@@_draw_color_cmyk_fill:nnnn
+\cs_new_protected:Npn \@@_draw_color_cmyk_fill:nnnn
{ \@@_draw_color_cmyk_aux:NNnnnnn \c_false_bool \c_true_bool }
-\cs_new_protected_nopar:Npn \@@_draw_color_cmyk_stroke:nnnn
+\cs_new_protected:Npn \@@_draw_color_cmyk_stroke:nnnn
{ \@@_draw_color_cmyk_aux:NNnnnnn \c_true_bool \c_false_bool }
\cs_new_protected:Npn \@@_draw_color_gray_aux:NNn #1#2#3
{
@@ -2305,11 +2305,11 @@
\cs_new_protected:Npn \@@_draw_color_gray_aux:nNN #1
{ \@@_draw_color_rgb_auxii:nnnNN {#1} {#1} {#1} }
\cs_generate_variant:Nn \@@_draw_color_gray_aux:nNN { x }
-\cs_new_protected_nopar:Npn \@@_draw_color_gray:n
+\cs_new_protected:Npn \@@_draw_color_gray:n
{ \@@_draw_color_gray_aux:NNn \c_true_bool \c_true_bool }
-\cs_new_protected_nopar:Npn \@@_draw_color_gray_fill:n
+\cs_new_protected:Npn \@@_draw_color_gray_fill:n
{ \@@_draw_color_gray_aux:NNn \c_false_bool \c_true_bool }
-\cs_new_protected_nopar:Npn \@@_draw_color_gray_stroke:n
+\cs_new_protected:Npn \@@_draw_color_gray_stroke:n
{ \@@_draw_color_gray_aux:NNn \c_true_bool \c_false_bool }
\cs_new_protected:Npn \@@_draw_color_rgb_auxi:NNnnn #1#2#3#4#5
{
@@ -2353,11 +2353,11 @@
}
}
}
-\cs_new_protected_nopar:Npn \@@_draw_color_rgb:nnn
+\cs_new_protected:Npn \@@_draw_color_rgb:nnn
{ \@@_draw_color_rgb_auxi:NNnnn \c_true_bool \c_true_bool }
-\cs_new_protected_nopar:Npn \@@_draw_color_rgb_fill:nnn
+\cs_new_protected:Npn \@@_draw_color_rgb_fill:nnn
{ \@@_draw_color_rgb_auxi:NNnnn \c_false_bool \c_true_bool }
-\cs_new_protected_nopar:Npn \@@_draw_color_rgb_stroke:nnn
+\cs_new_protected:Npn \@@_draw_color_rgb_stroke:nnn
{ \@@_draw_color_rgb_auxi:NNnnn \c_true_bool \c_false_bool }
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index c02a5ba..c14952d 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -887,7 +887,7 @@
% (we capture it \cs{AtBeginDocument} into
% \cs{g_@@_record_seq}), turning each file name into a string.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \file_list:
+\cs_new_protected:Npn \file_list:
{
\seq_set_eq:NN \l_@@_internal_seq \g_@@_record_seq
%<*package>
@@ -1058,7 +1058,7 @@
% being \tn{outer}.
% \begin{macrocode}
%<*package>
-\exp_args:NNf \cs_new_protected_nopar:Npn \@@_new:N
+\exp_args:NNf \cs_new_protected:Npn \@@_new:N
{ \exp_args:NNc \exp_after:wN \exp_stop_f: { newread } }
%</package>
% \end{macrocode}
@@ -1133,7 +1133,7 @@
% translating |ior|/|iow| to English. The list of streams is
% formatted using \cs{__msg_show_item_unbraced:nn}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \ior_list_streams:
+\cs_new_protected:Npn \ior_list_streams:
{ \@@_list_streams:Nn \g_@@_streams_prop { ior } }
\cs_new_protected:Npn \@@_list_streams:Nn #1#2
{
@@ -1298,7 +1298,7 @@
% that it is not \tn{outer}.
% \begin{macrocode}
%<*package>
-\exp_args:NNf \cs_new_protected_nopar:Npn \@@_new:N
+\exp_args:NNf \cs_new_protected:Npn \@@_new:N
{ \exp_args:NNc \exp_after:wN \exp_stop_f: { newwrite } }
%</package>
% \end{macrocode}
@@ -1366,7 +1366,7 @@
% \begin{macro}{\@@_list_streams:Nn}
% Done as for input, but with a copy of the auxiliary so the name is correct.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \iow_list_streams:
+\cs_new_protected:Npn \iow_list_streams:
{ \@@_list_streams:Nn \g_@@_streams_prop { iow } }
\cs_new_eq:NN \@@_list_streams:Nn \__ior_list_streams:Nn
% \end{macrocode}
@@ -1443,10 +1443,10 @@
% \begin{macro}{\iow_term:n, \iow_term:x}
% Writing to the log and the terminal directly are relatively easy.
% \begin{macrocode}
-\cs_set_protected_nopar:Npn \iow_log:x { \iow_now:Nx \c_log_iow }
-\cs_new_protected_nopar:Npn \iow_log:n { \iow_now:Nn \c_log_iow }
-\cs_set_protected_nopar:Npn \iow_term:x { \iow_now:Nx \c_term_iow }
-\cs_new_protected_nopar:Npn \iow_term:n { \iow_now:Nn \c_term_iow }
+\cs_set_protected:Npn \iow_log:x { \iow_now:Nx \c_log_iow }
+\cs_new_protected:Npn \iow_log:n { \iow_now:Nn \c_log_iow }
+\cs_set_protected:Npn \iow_term:x { \iow_now:Nx \c_term_iow }
+\cs_new_protected:Npn \iow_term:n { \iow_now:Nn \c_term_iow }
% \end{macrocode}
%\end{macro}
%\end{macro}
@@ -1457,7 +1457,7 @@
% Global variable holding the character that forces a new line when
% something is written to an output stream.
% \begin{macrocode}
-\cs_new_nopar:Npn \iow_newline: { ^^J }
+\cs_new:Npn \iow_newline: { ^^J }
% \end{macrocode}
% \end{macro}
%
@@ -1612,7 +1612,7 @@
\__msg_kernel_expandable_error:nn { kernel } { indent-outside-wrapping-code }
#1
}
-\cs_new_protected_nopar:Npn \iow_indent:n { \@@_indent_error:n }
+\cs_new_protected:Npn \iow_indent:n { \@@_indent_error:n }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1639,11 +1639,11 @@
{
\group_begin:
\int_set_eq:NN \tex_escapechar:D \c_minus_one
- \cs_set_nopar:Npx \{ { \token_to_str:N \{ }
- \cs_set_nopar:Npx \# { \token_to_str:N \# }
- \cs_set_nopar:Npx \} { \token_to_str:N \} }
- \cs_set_nopar:Npx \% { \token_to_str:N \% }
- \cs_set_nopar:Npx \~ { \token_to_str:N \~ }
+ \cs_set:Npx \{ { \token_to_str:N \{ }
+ \cs_set:Npx \# { \token_to_str:N \# }
+ \cs_set:Npx \} { \token_to_str:N \} }
+ \cs_set:Npx \% { \token_to_str:N \% }
+ \cs_set:Npx \~ { \token_to_str:N \~ }
\int_set:Nn \tex_escapechar:D { 92 }
\cs_set_eq:NN \\ \c_@@_wrap_newline_marker_tl
\cs_set_eq:NN \ \c_catcode_other_space_tl
@@ -1719,11 +1719,11 @@
% be replaced once the string module is finalised with something a little
% cleaner.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_wrap_set_target:
+\cs_new_protected:Npn \@@_wrap_set_target:
{
- \cs_set_protected_nopar:Npn \@@_wrap_set_target:
+ \cs_set_protected:Npn \@@_wrap_set_target:
{
- \cs_set_protected_nopar:Npn \@@_wrap_set_target: { }
+ \cs_set_protected:Npn \@@_wrap_set_target: { }
\tl_replace_all:Nnn \l_@@_newline_tl { ~ } { \c_space_tl }
\int_set:Nn \l_@@_target_count_int
{ \l_iow_line_count_int - \tl_count:N \l_@@_newline_tl + \c_one }
@@ -1756,7 +1756,7 @@
% Otherwise, the current line is added to the result, with the run-on text.
% The current word (and its character count) are then put in the new line.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_wrap_word:
+\cs_new_protected:Npn \@@_wrap_word:
{
\int_set:Nn \l_@@_current_word_int
{ \exp_args:No \str_count_ignore_spaces:n \l_@@_current_word_tl }
@@ -1766,7 +1766,7 @@
{ \@@_wrap_word_newline: }
\@@_wrap_loop:w
}
-\cs_new_protected_nopar:Npn \@@_wrap_word_fits:
+\cs_new_protected:Npn \@@_wrap_word_fits:
{
\bool_if:NTF \l_@@_line_start_bool
{
@@ -1782,7 +1782,7 @@
\int_incr:N \l_@@_current_line_int
}
}
-\cs_new_protected_nopar:Npn \@@_wrap_word_newline:
+\cs_new_protected:Npn \@@_wrap_word_newline:
{
\@@_wrap_set_target:
\tl_put_right:Nx \l_@@_wrap_tl
@@ -1826,7 +1826,7 @@
{ \@@_wrap_special:w }
{ \@@_wrap_loop:w #2 ~ #3 ~ }
}
-\cs_new_protected_nopar:Npn \@@_wrap_newline:
+\cs_new_protected:Npn \@@_wrap_newline:
{
\@@_wrap_set_target:
\tl_put_right:Nx \l_@@_wrap_tl
@@ -1835,19 +1835,19 @@
\tl_clear:N \l_@@_current_line_tl
\bool_set_true:N \l_@@_line_start_bool
}
-\cs_new_protected_nopar:Npx \@@_wrap_indent:
+\cs_new_protected:Npx \@@_wrap_indent:
{
\int_add:Nn \l_@@_current_indentation_int \c_four
\tl_put_right:Nx \exp_not:N \l_@@_current_indentation_tl
{ \c_space_tl \c_space_tl \c_space_tl \c_space_tl }
}
-\cs_new_protected_nopar:Npn \@@_wrap_unindent:
+\cs_new_protected:Npn \@@_wrap_unindent:
{
\int_sub:Nn \l_@@_current_indentation_int \c_four
\tl_set:Nx \l_@@_current_indentation_tl
{ \prg_replicate:nn \l_@@_current_indentation_int { ~ } }
}
-\cs_new_protected_nopar:Npn \@@_wrap_end:
+\cs_new_protected:Npn \@@_wrap_end:
{
\tl_put_right:Nx \l_@@_wrap_tl
{ \l_@@_current_line_tl }
diff --git a/l3kernel/l3final.dtx b/l3kernel/l3final.dtx
index 66150b5..0bb1f71 100644
--- a/l3kernel/l3final.dtx
+++ b/l3kernel/l3final.dtx
@@ -141,7 +141,7 @@
% \end{macrocode}
% The actual mappings: these are kept low-level for performance reasons.
% \begin{macrocode}
- \cs_new_nopar:cpn { __char_active_C3:N } #1
+ \cs_new:cpn { __char_active_C3:N } #1
{
\if_meaning:w #1 ^^9f ^^ff \else: % ß - U+00DF - germandbls
\if_meaning:w #1 ^^a0 ^^e0 \else: % à - U+00E0 - agrave
@@ -179,7 +179,7 @@
\fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi:
\fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi:
}
- \cs_new_nopar:cpn { __char_active_C4:N } #1
+ \cs_new:cpn { __char_active_C4:N } #1
{
\if_meaning:w #1 ^^83 ^^a0 \else: % ă - U+0103 - abreve
\if_meaning:w #1 ^^85 ^^a1 \else: % ą - U+0105 - aogonek
@@ -197,7 +197,7 @@
\__msg_kernel_expandable_error:nn { kernel } { encoding-failure }
\fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi:
}
- \cs_new_nopar:cpn { __char_active_C5:N } #1
+ \cs_new:cpn { __char_active_C5:N } #1
{
\if_meaning:w #1 ^^82 ^^aa \else: % ł - U+0142 - lslash
\if_meaning:w #1 ^^84 ^^ab \else: % ń - U+0144 - nacute
@@ -220,7 +220,7 @@
\fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi:
\fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi:
}
- \cs_new_nopar:cpn { __char_active_C8:N } #1
+ \cs_new:cpn { __char_active_C8:N } #1
{
\if_meaning:w #1 ^^99 ^^b3 \else: % ș - U+0219 - scommaaccent
\if_meaning:w #1 ^^9b ^^b5 \else: % ț - U+021B - tcommaaccent
diff --git a/l3kernel/l3fp-assign.dtx b/l3kernel/l3fp-assign.dtx
index 42beddc..1b5f54e 100644
--- a/l3kernel/l3fp-assign.dtx
+++ b/l3kernel/l3fp-assign.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%%
-%% File: l3fp-assign.dtx Copyright (C) 2011-2015 The LaTeX3 project
+%% File: l3fp-assign.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
@@ -164,10 +164,10 @@
% \cs{fp_eval:n}, which would convert the result away from the
% internal representation and back.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \fp_add:Nn { \@@_add:NNNn \fp_set:Nn + }
-\cs_new_protected_nopar:Npn \fp_gadd:Nn { \@@_add:NNNn \fp_gset:Nn + }
-\cs_new_protected_nopar:Npn \fp_sub:Nn { \@@_add:NNNn \fp_set:Nn - }
-\cs_new_protected_nopar:Npn \fp_gsub:Nn { \@@_add:NNNn \fp_gset:Nn - }
+\cs_new_protected:Npn \fp_add:Nn { \@@_add:NNNn \fp_set:Nn + }
+\cs_new_protected:Npn \fp_gadd:Nn { \@@_add:NNNn \fp_gset:Nn + }
+\cs_new_protected:Npn \fp_sub:Nn { \@@_add:NNNn \fp_set:Nn - }
+\cs_new_protected:Npn \fp_gsub:Nn { \@@_add:NNNn \fp_gset:Nn - }
\cs_new_protected:Npn \@@_add:NNNn #1#2#3#4
{ #1 #3 { #3 #2 \@@_parse:n {#4} } }
\cs_generate_variant:Nn \fp_add:Nn { c }
@@ -189,7 +189,7 @@
\__msg_show_variable:NNNnn #1 \fp_if_exist:NTF ? { }
{ > ~ \token_to_str:N #1 = \fp_to_tl:N #1 }
}
-\cs_new_protected_nopar:Npn \fp_show:n
+\cs_new_protected:Npn \fp_show:n
{ \__msg_show_wrap:Nn \fp_to_tl:n }
\cs_generate_variant:Nn \fp_show:N { c }
% \end{macrocode}
diff --git a/l3kernel/l3fp-basics.dtx b/l3kernel/l3fp-basics.dtx
index a553acb..e19b4ab 100644
--- a/l3kernel/l3fp-basics.dtx
+++ b/l3kernel/l3fp-basics.dtx
@@ -181,7 +181,7 @@
% \cs{@@_+_o:ww} can still check that it was followed by \cs{s_@@} and
% not arbitrary junk.
% \begin{macrocode}
-\cs_new_nopar:cpx { @@_-_o:ww } \s_@@
+\cs_new:cpx { @@_-_o:ww } \s_@@
{
\exp_not:c { @@_+_o:ww }
\exp_not:n { \s_@@ \@@_neg_sign:N }
@@ -777,7 +777,7 @@
% is the operation for normal floating points. The fourth is there
% for extra cases needed in \cs{@@_/_o:ww}.
% \begin{macrocode}
-\cs_new_nopar:cpn { @@_*_o:ww }
+\cs_new:cpn { @@_*_o:ww }
{
\@@_mul_cases_o:NnNnww
*
@@ -1020,7 +1020,7 @@
% \cs{if_case:w} construction in \cs{@@_mul_cases_o:NnNnww} are
% provided as the fourth argument here.
% \begin{macrocode}
-\cs_new_nopar:cpn { @@_/_o:ww }
+\cs_new:cpn { @@_/_o:ww }
{
\@@_mul_cases_o:NnNnww
/
diff --git a/l3kernel/l3fp-convert.dtx b/l3kernel/l3fp-convert.dtx
index 969a73e..1ba0682 100644
--- a/l3kernel/l3fp-convert.dtx
+++ b/l3kernel/l3fp-convert.dtx
@@ -113,7 +113,7 @@
\cs_new:Npn \fp_to_scientific:N #1
{ \exp_after:wN \@@_to_scientific_dispatch:w #1 }
\cs_generate_variant:Nn \fp_to_scientific:N { c }
-\cs_new_nopar:Npn \fp_to_scientific:n
+\cs_new:Npn \fp_to_scientific:n
{
\exp_after:wN \@@_to_scientific_dispatch:w
\exp:w \exp_end_continue_f:w \@@_parse:n
@@ -195,7 +195,7 @@
\cs_new:Npn \fp_to_decimal:N #1
{ \exp_after:wN \@@_to_decimal_dispatch:w #1 }
\cs_generate_variant:Nn \fp_to_decimal:N { c }
-\cs_new_nopar:Npn \fp_to_decimal:n
+\cs_new:Npn \fp_to_decimal:n
{
\exp_after:wN \@@_to_decimal_dispatch:w
\exp:w \exp_end_continue_f:w \@@_parse:n
@@ -296,7 +296,7 @@
% \begin{macrocode}
\cs_new:Npn \fp_to_tl:N #1 { \exp_after:wN \@@_to_tl_dispatch:w #1 }
\cs_generate_variant:Nn \fp_to_tl:N { c }
-\cs_new_nopar:Npn \fp_to_tl:n
+\cs_new:Npn \fp_to_tl:n
{
\exp_after:wN \@@_to_tl_dispatch:w
\exp:w \exp_end_continue_f:w \@@_parse:n
@@ -366,7 +366,7 @@
% \begin{macrocode}
\cs_new:Npn \fp_to_int:N #1 { \exp_after:wN \@@_to_int_dispatch:w #1 }
\cs_generate_variant:Nn \fp_to_int:N { c }
-\cs_new_nopar:Npn \fp_to_int:n
+\cs_new:Npn \fp_to_int:n
{
\exp_after:wN \@@_to_int_dispatch:w
\exp:w \exp_end_continue_f:w \@@_parse:n
diff --git a/l3kernel/l3fp-extended.dtx b/l3kernel/l3fp-extended.dtx
index 5e78311..ba25edd 100644
--- a/l3kernel/l3fp-extended.dtx
+++ b/l3kernel/l3fp-extended.dtx
@@ -349,8 +349,8 @@
% \meta{continuation} (|#8|, then |#7|) from the end of the argument
% list to its start.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_fixed_add:wwn { \@@_fixed_add:Nnnnnwnn + }
-\cs_new_nopar:Npn \@@_fixed_sub:wwn { \@@_fixed_add:Nnnnnwnn - }
+\cs_new:Npn \@@_fixed_add:wwn { \@@_fixed_add:Nnnnnwnn + }
+\cs_new:Npn \@@_fixed_sub:wwn { \@@_fixed_add:Nnnnnwnn - }
\cs_new:Npn \@@_fixed_add:Nnnnnwnn #1 #2#3#4#5 #6; #7#8
{
\exp_after:wN \@@_fixed_add_after:NNNNNwn
diff --git a/l3kernel/l3fp-logic.dtx b/l3kernel/l3fp-logic.dtx
index cc80ffb..5be3ac0 100644
--- a/l3kernel/l3fp-logic.dtx
+++ b/l3kernel/l3fp-logic.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3fp-logic.dtx Copyright (C) 2011-2014 The LaTeX3 Project
+%% File: l3fp-logic.dtx Copyright (C) 2011-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
@@ -439,7 +439,7 @@
\fi:
\@@_exp_after_o:w
}
- \cs_new_nopar:Npn \@@_|_o:ww { \@@_&_o:ww \else: }
+ \cs_new:Npn \@@_|_o:ww { \@@_&_o:ww \else: }
\group_end:
\cs_new:Npn \@@_and_return:wNw #1; \fi: #2#3; { \fi: #2 #1; }
% \end{macrocode}
diff --git a/l3kernel/l3fp-parse.dtx b/l3kernel/l3fp-parse.dtx
index 0ebefa7..0942505 100644
--- a/l3kernel/l3fp-parse.dtx
+++ b/l3kernel/l3fp-parse.dtx
@@ -688,7 +688,7 @@
\@@_tmp:w {iii} \@@_parse_digits_ii:N { 000 ; 3 }
\@@_tmp:w {ii} \@@_parse_digits_i:N { 00 ; 2 }
\@@_tmp:w {i} \@@_parse_digits_:N { 0 ; 1 }
-\cs_new_nopar:Npn \@@_parse_digits_:N { ; ; 0 }
+\cs_new:Npn \@@_parse_digits_:N { ; ; 0 }
% \end{macrocode}
% \end{macro}
%
@@ -1839,7 +1839,7 @@
% \begin{macrocode}
\cs_set_protected:Npn \@@_tmp:w #1 #2
{
- \cs_new_nopar:cpn { @@_parse_word_#1:N }
+ \cs_new:cpn { @@_parse_word_#1:N }
{ \exp_after:wN #2 \exp:w \exp_end_continue_f:w \@@_parse_infix:NN }
}
\@@_tmp:w { inf } \c_inf_fp
@@ -1864,7 +1864,7 @@
% \begin{macrocode}
\cs_set_protected:Npn \@@_tmp:w #1 #2
{
- \cs_new_nopar:cpn { @@_parse_word_#1:N }
+ \cs_new:cpn { @@_parse_word_#1:N }
{
\@@_exp_after_f:nw { \@@_parse_infix:NN }
\s_@@ \@@_chk:w 10 #2 ;
@@ -1890,7 +1890,7 @@
% \begin{macrocode}
\tl_map_inline:nn { {em} {ex} }
{
- \cs_new_nopar:cpn { @@_parse_word_#1:N }
+ \cs_new:cpn { @@_parse_word_#1:N }
{
\exp_after:wN \@@_from_dim_test:ww
\exp_after:wN 0 \exp_after:wN ,
@@ -1943,17 +1943,17 @@
% Those functions are also unary (not binary), but may receive a
% variable number of arguments.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_parse_word_acot:N
+\cs_new:Npn \@@_parse_word_acot:N
{ \@@_parse_function:NNN \@@_acot_o:Nw \use_i:nn }
-\cs_new_nopar:Npn \@@_parse_word_acotd:N
+\cs_new:Npn \@@_parse_word_acotd:N
{ \@@_parse_function:NNN \@@_acot_o:Nw \use_ii:nn }
-\cs_new_nopar:Npn \@@_parse_word_atan:N
+\cs_new:Npn \@@_parse_word_atan:N
{ \@@_parse_function:NNN \@@_atan_o:Nw \use_i:nn }
-\cs_new_nopar:Npn \@@_parse_word_atand:N
+\cs_new:Npn \@@_parse_word_atand:N
{ \@@_parse_function:NNN \@@_atan_o:Nw \use_ii:nn }
-\cs_new_nopar:Npn \@@_parse_word_max:N
+\cs_new:Npn \@@_parse_word_max:N
{ \@@_parse_function:NNN \@@_minmax_o:Nw 2 }
-\cs_new_nopar:Npn \@@_parse_word_min:N
+\cs_new:Npn \@@_parse_word_min:N
{ \@@_parse_function:NNN \@@_minmax_o:Nw 0 }
% \end{macrocode}
% \end{macro}
@@ -1969,11 +1969,11 @@
% \begin{macrocode}
\cs_new:Npn \@@_parse_word_abs:N
{ \@@_parse_unary_function:nNN { set_sign } 0 }
-\cs_new_nopar:Npn \@@_parse_word_exp:N
+\cs_new:Npn \@@_parse_word_exp:N
{ \@@_parse_unary_function:nNN {exp} ? }
-\cs_new_nopar:Npn \@@_parse_word_ln:N
+\cs_new:Npn \@@_parse_word_ln:N
{ \@@_parse_unary_function:nNN {ln} ? }
-\cs_new_nopar:Npn \@@_parse_word_sqrt:N
+\cs_new:Npn \@@_parse_word_sqrt:N
{ \@@_parse_unary_function:nNN {sqrt} ? }
% \end{macrocode}
% \end{macro}
@@ -2009,9 +2009,9 @@
{cos} {cot} {csc} {sec} {sin} {tan}
}
{
- \cs_new_nopar:cpn { @@_parse_word_#1:N }
+ \cs_new:cpn { @@_parse_word_#1:N }
{ \@@_parse_unary_function:nNN {#1} \use_i:nn }
- \cs_new_nopar:cpn { @@_parse_word_#1d:N }
+ \cs_new:cpn { @@_parse_word_#1d:N }
{ \@@_parse_unary_function:nNN {#1} \use_ii:nn }
}
% \end{macrocode}
@@ -2024,11 +2024,11 @@
% \@@_parse_word_ceil:N
% }
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_parse_word_trunc:N
+\cs_new:Npn \@@_parse_word_trunc:N
{ \@@_parse_function:NNN \@@_round_o:Nw \@@_round_to_zero:NNN }
-\cs_new_nopar:Npn \@@_parse_word_floor:N
+\cs_new:Npn \@@_parse_word_floor:N
{ \@@_parse_function:NNN \@@_round_o:Nw \@@_round_to_ninf:NNN }
-\cs_new_nopar:Npn \@@_parse_word_ceil:N
+\cs_new:Npn \@@_parse_word_ceil:N
{ \@@_parse_function:NNN \@@_round_o:Nw \@@_round_to_pinf:NNN }
% \end{macrocode}
% \end{macro}
@@ -2286,7 +2286,7 @@
% \begin{macrocode}
\group_begin:
%<*package>
- \cs_set_nopar:Npn \+ { }
+ \cs_set:Npn \+ { }
%</package>
\char_set_catcode_other:N \&
\char_set_catcode_letter:N \^
@@ -2648,7 +2648,7 @@
}
\cs_new_protected:Npn \@@_new_function:NNnnn #1#2#3#4#5
{
- \cs_new_nopar:Npn #1
+ \cs_new:Npn #1
{
\exp_after:wN \@@_function_apply:nw \exp_after:wN
{
diff --git a/l3kernel/l3fp-traps.dtx b/l3kernel/l3fp-traps.dtx
index fa48260..12c5606 100644
--- a/l3kernel/l3fp-traps.dtx
+++ b/l3kernel/l3fp-traps.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%%
-%% File: l3fp-traps.dtx Copyright (C) 2011-2014 The LaTeX3 Project
+%% File: l3fp-traps.dtx Copyright (C) 2011-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,11 +200,11 @@
% produces as a result its first argument, possibly with
% post-expansion.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_trap_invalid_operation_set_error:
+\cs_new_protected:Npn \@@_trap_invalid_operation_set_error:
{ \@@_trap_invalid_operation_set:N \prg_do_nothing: }
-\cs_new_protected_nopar:Npn \@@_trap_invalid_operation_set_flag:
+\cs_new_protected:Npn \@@_trap_invalid_operation_set_flag:
{ \@@_trap_invalid_operation_set:N \use_none:nnnnn }
-\cs_new_protected_nopar:Npn \@@_trap_invalid_operation_set_none:
+\cs_new_protected:Npn \@@_trap_invalid_operation_set_none:
{ \@@_trap_invalid_operation_set:N \use_none:nnnnnnn }
\cs_new_protected:Npn \@@_trap_invalid_operation_set:N #1
{
@@ -250,11 +250,11 @@
% cases, the function must produce a result, namely its first
% argument, $\pm\infty$ or \nan{}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_trap_division_by_zero_set_error:
+\cs_new_protected:Npn \@@_trap_division_by_zero_set_error:
{ \@@_trap_division_by_zero_set:N \prg_do_nothing: }
-\cs_new_protected_nopar:Npn \@@_trap_division_by_zero_set_flag:
+\cs_new_protected:Npn \@@_trap_division_by_zero_set_flag:
{ \@@_trap_division_by_zero_set:N \use_none:nnnnn }
-\cs_new_protected_nopar:Npn \@@_trap_division_by_zero_set_none:
+\cs_new_protected:Npn \@@_trap_division_by_zero_set_none:
{ \@@_trap_division_by_zero_set:N \use_none:nnnnnnn }
\cs_new_protected:Npn \@@_trap_division_by_zero_set:N #1
{
@@ -308,19 +308,19 @@
% receive $\pm 0$); then we cannot do better than simply say an
% overflow or underflow occurred.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_trap_overflow_set_error:
+\cs_new_protected:Npn \@@_trap_overflow_set_error:
{ \@@_trap_overflow_set:N \prg_do_nothing: }
-\cs_new_protected_nopar:Npn \@@_trap_overflow_set_flag:
+\cs_new_protected:Npn \@@_trap_overflow_set_flag:
{ \@@_trap_overflow_set:N \use_none:nnnnn }
-\cs_new_protected_nopar:Npn \@@_trap_overflow_set_none:
+\cs_new_protected:Npn \@@_trap_overflow_set_none:
{ \@@_trap_overflow_set:N \use_none:nnnnnnn }
\cs_new_protected:Npn \@@_trap_overflow_set:N #1
{ \@@_trap_overflow_set:NnNn #1 { overflow } \@@_inf_fp:N { inf } }
-\cs_new_protected_nopar:Npn \@@_trap_underflow_set_error:
+\cs_new_protected:Npn \@@_trap_underflow_set_error:
{ \@@_trap_underflow_set:N \prg_do_nothing: }
-\cs_new_protected_nopar:Npn \@@_trap_underflow_set_flag:
+\cs_new_protected:Npn \@@_trap_underflow_set_flag:
{ \@@_trap_underflow_set:N \use_none:nnnnn }
-\cs_new_protected_nopar:Npn \@@_trap_underflow_set_none:
+\cs_new_protected:Npn \@@_trap_underflow_set_none:
{ \@@_trap_underflow_set:N \use_none:nnnnnnn }
\cs_new_protected:Npn \@@_trap_underflow_set:N #1
{ \@@_trap_overflow_set:NnNn #1 { underflow } \@@_zero_fp:N { 0 } }
@@ -375,7 +375,7 @@
% Convenient short-hands for returning \cs{c_nan_fp} for a unary or
% binary operation, and expanding after.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_invalid_operation_o:nw
+\cs_new:Npn \@@_invalid_operation_o:nw
{ \@@_invalid_operation:nnw { \exp_after:wN \c_nan_fp } }
\cs_generate_variant:Nn \@@_invalid_operation_o:nw { f }
% \end{macrocode}
diff --git a/l3kernel/l3fp-trig.dtx b/l3kernel/l3fp-trig.dtx
index c517712..b9b8bb1 100644
--- a/l3kernel/l3fp-trig.dtx
+++ b/l3kernel/l3fp-trig.dtx
@@ -476,7 +476,7 @@
% control sequence name, and convert it to a token list when required:
% strings take up less memory than their token list representation.
% \begin{macrocode}
-\cs_new_nopar:Npx \@@_trig_inverse_two_pi:
+\cs_new:Npx \@@_trig_inverse_two_pi:
{
\exp_not:n { \exp_after:wN \use_none:n \token_to_str:N }
\cs:w , , !
@@ -778,7 +778,7 @@
\exp_after:wN +
\fi:
}
-\cs_new_nopar:Npn \@@_trig_large_auxix:Nw
+\cs_new:Npn \@@_trig_large_auxix:Nw
{
\exp_after:wN \@@_use_i_until_s:nw
\exp_after:wN \@@_trig_large_auxxi:w
@@ -1053,12 +1053,12 @@
% ones: $\operatorname{atan}(y) = \operatorname{atan}(y, 1) = \operatorname{acot}(1, y)$ and
% $\operatorname{acot}(x) = \operatorname{atan}(1, x) = \operatorname{acot}(x, 1)$.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_atan_o:Nw
+\cs_new:Npn \@@_atan_o:Nw
{
\@@_atan_dispatch_o:NNnNw
\@@_acotii_o:Nww \@@_atanii_o:Nww { atan }
}
-\cs_new_nopar:Npn \@@_acot_o:Nw
+\cs_new:Npn \@@_acot_o:Nw
{
\@@_atan_dispatch_o:NNnNw
\@@_atanii_o:Nww \@@_acotii_o:Nww { acot }
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index a671664..c3b83b7 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -1280,9 +1280,9 @@
{ \tex_advance:D #1 by \@@_eval:w #2 \@@_eval_end: }
\cs_new_protected:Npn \int_sub:Nn #1#2
{ \tex_advance:D #1 by - \@@_eval:w #2 \@@_eval_end: }
-\cs_new_protected_nopar:Npn \int_gadd:Nn
+\cs_new_protected:Npn \int_gadd:Nn
{ \tex_global:D \int_add:Nn }
-\cs_new_protected_nopar:Npn \int_gsub:Nn
+\cs_new_protected:Npn \int_gsub:Nn
{ \tex_global:D \int_sub:Nn }
\cs_generate_variant:Nn \int_add:Nn { c }
\cs_generate_variant:Nn \int_gadd:Nn { c }
@@ -1309,9 +1309,9 @@
{ \tex_advance:D #1 \c_one }
\cs_new_protected:Npn \int_decr:N #1
{ \tex_advance:D #1 \c_minus_one }
-\cs_new_protected_nopar:Npn \int_gincr:N
+\cs_new_protected:Npn \int_gincr:N
{ \tex_global:D \int_incr:N }
-\cs_new_protected_nopar:Npn \int_gdecr:N
+\cs_new_protected:Npn \int_gdecr:N
{ \tex_global:D \int_decr:N }
\cs_generate_variant:Nn \int_incr:N { c }
\cs_generate_variant:Nn \int_decr:N { c }
@@ -1333,7 +1333,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \int_set:Nn #1#2
{ #1 ~ \@@_eval:w #2\@@_eval_end: }
-\cs_new_protected_nopar:Npn \int_gset:Nn { \tex_global:D \int_set:Nn }
+\cs_new_protected:Npn \int_gset:Nn { \tex_global:D \int_set:Nn }
\cs_generate_variant:Nn \int_set:Nn { c }
\cs_generate_variant:Nn \int_gset:Nn { c }
% \end{macrocode}
@@ -1371,7 +1371,7 @@
% cleaning up the end of the test and telling the user what the
% problem was.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \__prg_compare_error:
+\cs_new_protected:Npn \__prg_compare_error:
{
\if_int_compare:w \c_zero \c_zero \fi:
=
@@ -1765,18 +1765,18 @@
% \cs{scan_stop:}, so no breaking function will recognize this break
% point as its own.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \int_step_inline:nnnn
+\cs_new_protected:Npn \int_step_inline:nnnn
{
\int_gincr:N \g__prg_map_int
\exp_args:NNc \@@_step:NNnnnn
- \cs_gset_nopar:Npn
+ \cs_gset:Npn
{ __prg_map_ \int_use:N \g__prg_map_int :w }
}
\cs_new_protected:Npn \int_step_variable:nnnNn #1#2#3#4#5
{
\int_gincr:N \g__prg_map_int
\exp_args:NNc \@@_step:NNnnnn
- \cs_gset_nopar:Npx
+ \cs_gset:Npx
{ __prg_map_ \int_use:N \g__prg_map_int :w }
{#1}{#2}{#3}
{
@@ -2128,21 +2128,21 @@
\use:c { @@_to_Roman_ #1 :w }
\@@_to_Roman_aux:N
}
-\cs_new_nopar:Npn \@@_to_roman_i:w { i }
-\cs_new_nopar:Npn \@@_to_roman_v:w { v }
-\cs_new_nopar:Npn \@@_to_roman_x:w { x }
-\cs_new_nopar:Npn \@@_to_roman_l:w { l }
-\cs_new_nopar:Npn \@@_to_roman_c:w { c }
-\cs_new_nopar:Npn \@@_to_roman_d:w { d }
-\cs_new_nopar:Npn \@@_to_roman_m:w { m }
-\cs_new_nopar:Npn \@@_to_roman_Q:w #1 { }
-\cs_new_nopar:Npn \@@_to_Roman_i:w { I }
-\cs_new_nopar:Npn \@@_to_Roman_v:w { V }
-\cs_new_nopar:Npn \@@_to_Roman_x:w { X }
-\cs_new_nopar:Npn \@@_to_Roman_l:w { L }
-\cs_new_nopar:Npn \@@_to_Roman_c:w { C }
-\cs_new_nopar:Npn \@@_to_Roman_d:w { D }
-\cs_new_nopar:Npn \@@_to_Roman_m:w { M }
+\cs_new:Npn \@@_to_roman_i:w { i }
+\cs_new:Npn \@@_to_roman_v:w { v }
+\cs_new:Npn \@@_to_roman_x:w { x }
+\cs_new:Npn \@@_to_roman_l:w { l }
+\cs_new:Npn \@@_to_roman_c:w { c }
+\cs_new:Npn \@@_to_roman_d:w { d }
+\cs_new:Npn \@@_to_roman_m:w { m }
+\cs_new:Npn \@@_to_roman_Q:w #1 { }
+\cs_new:Npn \@@_to_Roman_i:w { I }
+\cs_new:Npn \@@_to_Roman_v:w { V }
+\cs_new:Npn \@@_to_Roman_x:w { X }
+\cs_new:Npn \@@_to_Roman_l:w { L }
+\cs_new:Npn \@@_to_Roman_c:w { C }
+\cs_new:Npn \@@_to_Roman_d:w { D }
+\cs_new:Npn \@@_to_Roman_m:w { M }
\cs_new:Npn \@@_to_Roman_Q:w #1 { }
% \end{macrocode}
% \end{macro}
@@ -2362,7 +2362,7 @@
% We don't use the \TeX{} primitive \tn{showthe} to show integer
% expressions: this gives a more unified output.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \int_show:n
+\cs_new_protected:Npn \int_show:n
{ \__msg_show_wrap:Nn \int_eval:n }
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 4e4d05d..820489d 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -943,7 +943,7 @@
\group_begin:
\char_set_catcode_active:n { `\= }
\char_set_catcode_active:n { `\, }
- \cs_new_protected_nopar:Npn \@@_sanitise_equals:
+ \cs_new_protected:Npn \@@_sanitise_equals:
{
\exp_after:wN \@@_sanitise_equals_auxi:w \l_@@_sanitise_tl
\q_mark = \q_nil =
@@ -967,7 +967,7 @@
\exp_after:wN \@@_sanitise_equals_auxii:w
\fi:
}
- \cs_new_protected_nopar:Npn \@@_sanitise_comma:
+ \cs_new_protected:Npn \@@_sanitise_comma:
{
\exp_after:wN \@@_sanitise_comma_auxi:w \l_@@_sanitise_tl
\q_mark , \q_nil ,
@@ -1042,20 +1042,20 @@
\cs_new_protected:Npn \@@_split_value:NNw #1#2#3 = #4 \q_stop
{
\if:w \scan_stop: \tl_to_str:n {#4} \scan_stop:
- \cs_set_nopar:Npx \@@_action:
+ \cs_set:Npx \@@_action:
{ \exp_not:N #1 { \exp_not:o \l_@@_key_tl } }
\else:
\if:w \scan_stop: \etex_detokenize:D \exp_after:wN { \use_none:n #4 }
\scan_stop:
\@@_def:Nn \l_@@_value_tl {#3}
- \cs_set_nopar:Npx \@@_action:
+ \cs_set:Npx \@@_action:
{
\exp_not:N #2
{ \exp_not:o \l_@@_key_tl }
{ \exp_not:o \l_@@_value_tl }
}
\else:
- \cs_set_nopar:Npn \@@_action:
+ \cs_set:Npn \@@_action:
{ \__msg_kernel_error:nn { kernel } { misplaced-equals-sign } }
\fi:
\fi:
@@ -1069,8 +1069,8 @@
\exp_after:wN \@@_empty_key:
\fi:
}
-\cs_new_nopar:Npn \@@_action: { }
-\cs_new_protected_nopar:Npn \@@_empty_key:
+\cs_new:Npn \@@_action: { }
+\cs_new_protected:Npn \@@_empty_key:
{ \__msg_kernel_error:nn { kernel } { misplaced-equals-sign } }
% \end{macrocode}
% \end{macro}
@@ -1434,11 +1434,11 @@
% nested! As multichoices and choices are essentially the same bar one
% function, the code is given together.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_choice_make:
+\cs_new_protected:Npn \@@_choice_make:
{ \@@_choice_make:N \@@_choice_find:n }
-\cs_new_protected_nopar:Npn \@@_multichoice_make:
+\cs_new_protected:Npn \@@_multichoice_make:
{ \@@_choice_make:N \@@_multichoice_find:n }
-\cs_new_protected_nopar:Npn \@@_choice_make:N #1
+\cs_new_protected:Npn \@@_choice_make:N #1
{
\prop_if_exist:cTF
{ \c_@@_info_root_tl \@@_parent:o \l_keys_path_tl }
@@ -1454,7 +1454,7 @@
}
{ \@@_choice_make_aux:N #1 }
}
-\cs_new_protected_nopar:Npn \@@_choice_make_aux:N #1
+\cs_new_protected:Npn \@@_choice_make_aux:N #1
{
\@@_cmd_set:nn { \l_keys_path_tl } { #1 {##1} }
\prop_put:cnn { \c_@@_info_root_tl \l_keys_path_tl } { choice }
@@ -1488,9 +1488,9 @@
% Auto-generating choices means setting up the root key as a choice, then
% defining each choice in turn.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_choices_make:nn
+\cs_new_protected:Npn \@@_choices_make:nn
{ \@@_choices_make:Nnn \@@_choice_make: }
-\cs_new_protected_nopar:Npn \@@_multichoices_make:nn
+\cs_new_protected:Npn \@@_multichoices_make:nn
{ \@@_choices_make:Nnn \@@_multichoice_make: }
\cs_new_protected:Npn \@@_choices_make:Nnn #1#2#3
{
@@ -1606,7 +1606,7 @@
% Undefining a key has to be done without \cs{cs_undefine:c} as that
% function acts globally.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_undefine:
+\cs_new_protected:Npn \@@_undefine:
{
\cs_set_eq:cN { \c_@@_code_root_tl \l_keys_path_tl } \tex_undefined:D
\cs_set_eq:cN { \c_@@_info_root_tl \l_keys_path_tl } \tex_undefined:D
@@ -1706,7 +1706,7 @@
% Making a choice is handled internally, as it is also needed by
% \texttt{.generate_choices:n}.
% \begin{macrocode}
-\cs_new_protected_nopar:cpn { \c_@@_props_root_tl .choice: }
+\cs_new_protected:cpn { \c_@@_props_root_tl .choice: }
{ \@@_choice_make: }
% \end{macrocode}
% \end{macro}
@@ -1862,7 +1862,7 @@
% The same idea as \texttt{.choice:} and \texttt{.choices:nn}, but
% where more than one choice is allowed.
% \begin{macrocode}
-\cs_new_protected_nopar:cpn { \c_@@_props_root_tl .multichoice: }
+\cs_new_protected:cpn { \c_@@_props_root_tl .multichoice: }
{ \@@_multichoice_make: }
\cs_new_protected:cpn { \c_@@_props_root_tl .multichoices:nn } #1
{ \@@_multichoices_make:nn #1 }
@@ -1924,7 +1924,7 @@
% \begin{macro}{.undefine:}
% Another simple wrapper.
% \begin{macrocode}
-\cs_new_protected_nopar:cpn { \c_@@_props_root_tl .undefine: }
+\cs_new_protected:cpn { \c_@@_props_root_tl .undefine: }
{ \@@_undefine: }
% \end{macrocode}
% \end{macro}
@@ -1947,7 +1947,7 @@
% \begin{macro}[aux]{\@@_set:nnn, \@@_set:onn}
% A simple wrapper again.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \keys_set:nn
+\cs_new_protected:Npn \keys_set:nn
{ \@@_set:onn { \l_@@_module_tl } }
\cs_new_protected:Npn \@@_set:nnn #1#2#3
{
@@ -1978,7 +1978,7 @@
% afterwards.Note that for speed/simplicity reasons we use a \texttt{tl}
% operation to set the \texttt{clist} here!
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \keys_set_known:nnN
+\cs_new_protected:Npn \keys_set_known:nnN
{ \@@_set_known:onnN \l_@@_unused_clist }
\cs_generate_variant:Nn \keys_set_known:nnN { nV , nv , no }
\cs_new_protected:Npn \@@_set_known:nnnN #1#2#3#4
@@ -2021,7 +2021,7 @@
% wrapped around the basic code. The comments on \cs{keys_set_known:nnN}
% also apply here.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \keys_set_filter:nnnN
+\cs_new_protected:Npn \keys_set_filter:nnnN
{ \@@_set_filter:onnnN \l_@@_unused_clist }
\cs_generate_variant:Nn \keys_set_filter:nnnN { nnV , nnv , nno }
\cs_new_protected:Npn \@@_set_filter:nnnnN #1#2#3#4#5
@@ -2108,7 +2108,7 @@
\@@_find_key_module:w #2 \q_stop
}
}
-\cs_new_protected_nopar:Npn \@@_set_elt_aux:
+\cs_new_protected:Npn \@@_set_elt_aux:
{
\bool_if:nTF
{
@@ -2138,7 +2138,7 @@
% have any groups assigned. There is then the question of whether the
% selection is opt-in or opt-out.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_set_elt_selective:
+\cs_new_protected:Npn \@@_set_elt_selective:
{
\prop_if_exist:cTF { \c_@@_info_root_tl \l_keys_path_tl }
{
@@ -2163,7 +2163,7 @@
% set active. That requires two mappings, and again a different outcome
% depending on whether opt-in or opt-out is set.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_check_groups:
+\cs_new_protected:Npn \@@_check_groups:
{
\bool_set_false:N \l_@@_tmp_bool
\seq_map_inline:Nn \l_@@_selective_seq
@@ -2239,9 +2239,9 @@
% is unknown depends on whether unknown keys are being skipped or if
% an error should be raised.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_execute:
+\cs_new_protected:Npn \@@_execute:
{ \@@_execute:nn { \l_keys_path_tl } { \@@_execute_unknown: } }
-\cs_new_protected_nopar:Npn \@@_execute_unknown:
+\cs_new_protected:Npn \@@_execute_unknown:
{
\bool_if:NTF \l_@@_only_known_bool
{ \@@_store_unused: }
@@ -2262,7 +2262,7 @@
}
{#2}
}
-\cs_new_protected_nopar:Npn \@@_store_unused:
+\cs_new_protected:Npn \@@_store_unused:
{
\clist_put_right:Nx \l_@@_unused_clist
{
@@ -2472,9 +2472,9 @@
% \begin{macro}{.value_required:}
% Deprecated 2015-07-14.
% \begin{macrocode}
-\cs_new_protected_nopar:cpn { \c_@@_props_root_tl .value_forbidden: }
+\cs_new_protected:cpn { \c_@@_props_root_tl .value_forbidden: }
{ \@@_value_requirement:nn { forbidden } { true } }
-\cs_new_protected_nopar:cpn { \c_@@_props_root_tl .value_required: }
+\cs_new_protected:cpn { \c_@@_props_root_tl .value_required: }
{ \@@_value_requirement:nn { required } { true } }
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index 7f1fc29..ba06052 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -966,8 +966,8 @@
% For writing the line number nicely. \cs{msg_line_context:} was set up
% earlier, so this is not \texttt{new}.
% \begin{macrocode}
-\cs_new_nopar:Npn \msg_line_number: { \int_use:N \tex_inputlineno:D }
-\cs_gset_nopar:Npn \msg_line_context:
+\cs_new:Npn \msg_line_number: { \int_use:N \tex_inputlineno:D }
+\cs_gset:Npn \msg_line_context:
{
\c_@@_on_line_text_tl
\c_space_tl
@@ -1077,7 +1077,7 @@
\__iow_with:Nnn \tex_errorcontextlines:D \c_minus_one
{
\group_begin:
- \cs_set_protected_nopar:Npn &
+ \cs_set_protected:Npn &
{
\tex_errmessage:D
{
@@ -1463,7 +1463,7 @@
\@@_class_chk_exist:nT {#1}
{
\tl_set:Nn \l_@@_current_class_tl {#1}
- \cs_set_protected_nopar:Npx \@@_use_code:
+ \cs_set_protected:Npx \@@_use_code:
{
\exp_not:n
{
@@ -1476,7 +1476,7 @@
}
{ \@@_kernel_error:nnxx { kernel } { message-unknown } {#2} {#3} }
}
-\cs_new_protected_nopar:Npn \@@_use_code: { }
+\cs_new_protected:Npn \@@_use_code: { }
% \end{macrocode}
% The first check is for a individual message redirection. If this
% applies then no further redirection is attempted. Otherwise, split
@@ -1573,7 +1573,7 @@
% for a loop: as an initialization, we start by storing the initial
% class in \cs{l_@@_current_class_tl}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \msg_redirect_class:nn
+\cs_new_protected:Npn \msg_redirect_class:nn
{ \@@_redirect:nnn { } }
\cs_new_protected:Npn \msg_redirect_module:nnn #1
{ \@@_redirect:nnn { / #1 } }
@@ -2093,7 +2093,7 @@
% \begin{macro}[int]{\@@_log_next:}
% \begin{macrocode}
\bool_new:N \g_@@_log_next_bool
-\cs_new_protected_nopar:Npn \@@_log_next:
+\cs_new_protected:Npn \@@_log_next:
{ \bool_gset_true:N \g_@@_log_next_bool }
% \end{macrocode}
% \end{macro}
@@ -2123,7 +2123,7 @@
{ \exp_not:n { \@@_show_pre:nnnnnn {#1} {#2} } {#3} {#4} {#5} {#6} }
}
\cs_generate_variant:Nn \@@_show_pre:nnnnnn { nnnnnV }
-\cs_new_protected_nopar:Npn \@@_show_pre_aux:n
+\cs_new_protected:Npn \@@_show_pre_aux:n
{ \bool_if:NTF \g_@@_log_next_bool { \iow_log:n } { \iow_term:n } }
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3prg.dtx b/l3kernel/l3prg.dtx
index 4a1764c..a725a42 100644
--- a/l3kernel/l3prg.dtx
+++ b/l3kernel/l3prg.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3prg.dtx Copyright (C) 2005-2015 The LaTeX3 Project
+%% File: l3prg.dtx Copyright (C) 2005-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
@@ -853,7 +853,7 @@
\__msg_show_variable:NNNnn #1 \bool_if_exist:NTF ? { }
{ > ~ \token_to_str:N #1 = \@@_to_str:n {#1} }
}
-\cs_new_protected_nopar:Npn \bool_show:n
+\cs_new_protected:Npn \bool_show:n
{ \__msg_show_wrap:Nn \@@_to_str:n }
\cs_new:Npn \@@_to_str:n #1
{ \bool_if:nTF {#1} { true } { false } }
@@ -1103,10 +1103,10 @@
% operation is similar except it closes the special alignment group
% before returning the boolean.
% \begin{macrocode}
-\cs_new_nopar:cpn { @@_)_0:w } { \c_false_bool }
-\cs_new_nopar:cpn { @@_)_1:w } { \c_true_bool }
-\cs_new_nopar:cpn { @@_S_0:w } { \group_align_safe_end: \c_false_bool }
-\cs_new_nopar:cpn { @@_S_1:w } { \group_align_safe_end: \c_true_bool }
+\cs_new:cpn { @@_)_0:w } { \c_false_bool }
+\cs_new:cpn { @@_)_1:w } { \c_true_bool }
+\cs_new:cpn { @@_S_0:w } { \group_align_safe_end: \c_false_bool }
+\cs_new:cpn { @@_S_1:w } { \group_align_safe_end: \c_true_bool }
% \end{macrocode}
% \end{macro}
%
@@ -1115,8 +1115,8 @@
% Two cases where we simply continue scanning. We must remove the
% second |&| or \verb"|".
% \begin{macrocode}
-\cs_new_nopar:cpn { @@_&_1:w } & { \@@_get_next:NN \use_i:nn }
-\cs_new_nopar:cpn { @@_|_0:w } | { \@@_get_next:NN \use_i:nn }
+\cs_new:cpn { @@_&_1:w } & { \@@_get_next:NN \use_i:nn }
+\cs_new:cpn { @@_|_0:w } | { \@@_get_next:NN \use_i:nn }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1134,9 +1134,9 @@
% evaluation. This is slightly tricky as there are no braces so we
% have to play match the |()| manually.
% \begin{macrocode}
-\cs_new_nopar:cpn { @@_&_0:w } &
+\cs_new:cpn { @@_&_0:w } &
{ \@@_eval_skip_to_end_auxi:Nw \c_false_bool }
-\cs_new_nopar:cpn { @@_|_1:w } |
+\cs_new:cpn { @@_|_1:w } |
{ \@@_eval_skip_to_end_auxi:Nw \c_true_bool }
% \end{macrocode}
% There is always at least one |)| waiting, namely the outer
@@ -1521,9 +1521,9 @@
% that the successive expansions of \cs{group_align_safe_begin/end:}
% are always brace balanced.
% \begin{macrocode}
-\cs_new_nopar:Npn \group_align_safe_begin:
+\cs_new:Npn \group_align_safe_begin:
{ \if_int_compare:w \if_false: { \fi: `} = \c_zero \fi: }
-\cs_new_nopar:Npn \group_align_safe_end:
+\cs_new:Npn \group_align_safe_end:
{ \if_int_compare:w `{ = \c_zero } \fi: }
% \end{macrocode}
% \end{macro}
@@ -1558,7 +1558,7 @@
% \begin{macro}[int]{\scan_align_safe_stop:}
% Deprecated 2015-08-01 for removal after 2016-12-31.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \scan_align_safe_stop: { }
+\cs_new_protected:Npn \scan_align_safe_stop: { }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 5de2af4..32c331a 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -853,8 +853,8 @@
% updated entry is placed at the same spot as the original \meta{key}
% in the property list, preserving the order of entries.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \prop_put:Nnn { \@@_put:NNnn \tl_set:Nx }
-\cs_new_protected_nopar:Npn \prop_gput:Nnn { \@@_put:NNnn \tl_gset:Nx }
+\cs_new_protected:Npn \prop_put:Nnn { \@@_put:NNnn \tl_set:Nx }
+\cs_new_protected:Npn \prop_gput:Nnn { \@@_put:NNnn \tl_gset:Nx }
\cs_new_protected:Npn \@@_put:NNnn #1#2#3#4
{
\tl_set:Nn \l_@@_internal_tl
@@ -889,9 +889,9 @@
% If the key is new, then the value is added, being careful to
% convert the key to a string using \cs{tl_to_str:n}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \prop_put_if_new:Nnn
+\cs_new_protected:Npn \prop_put_if_new:Nnn
{ \@@_put_if_new:NNnn \tl_set:Nx }
-\cs_new_protected_nopar:Npn \prop_gput_if_new:Nnn
+\cs_new_protected:Npn \prop_gput_if_new:Nnn
{ \@@_put_if_new:NNnn \tl_gset:Nx }
\cs_new_protected:Npn \@@_put_if_new:NNnn #1#2#3#4
{
@@ -1101,9 +1101,9 @@
% \begin{macro}[tested = m3prop003]{\prop_map_break:n}
% The break statements are based on the general \cs{__prg_map_break:Nn}.
% \begin{macrocode}
-\cs_new_nopar:Npn \prop_map_break:
+\cs_new:Npn \prop_map_break:
{ \__prg_map_break:Nn \prop_map_break: { } }
-\cs_new_nopar:Npn \prop_map_break:n
+\cs_new:Npn \prop_map_break:n
{ \__prg_map_break:Nn \prop_map_break: }
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3seq.dtx b/l3kernel/l3seq.dtx
index 0b5d67b..429ef1c 100644
--- a/l3kernel/l3seq.dtx
+++ b/l3kernel/l3seq.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3seq.dtx Copyright (C) 1990-2015 The LaTeX3 Project
+%% File: l3seq.dtx Copyright (C) 1990-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
@@ -1102,9 +1102,9 @@
% lost braces. The second step is solely there to strip
% braces which are outermost after space trimming.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \seq_set_split:Nnn
+\cs_new_protected:Npn \seq_set_split:Nnn
{ \@@_set_split:NNnn \tl_set:Nx }
-\cs_new_protected_nopar:Npn \seq_gset_split:Nnn
+\cs_new_protected:Npn \seq_gset_split:Nnn
{ \@@_set_split:NNnn \tl_gset:Nx }
\cs_new_protected:Npn \@@_set_split:NNnn #1#2#3#4
{
@@ -1380,9 +1380,9 @@
% of \cs{exp_not:n}. The previous calls are cleanly removed
% from the stack, and the memory consumption becomes linear.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \seq_reverse:N
+\cs_new_protected:Npn \seq_reverse:N
{ \@@_reverse:NN \tl_set:Nx }
-\cs_new_protected_nopar:Npn \seq_greverse:N
+\cs_new_protected:Npn \seq_greverse:N
{ \@@_reverse:NN \tl_gset:Nx }
\cs_new_protected:Npn \@@_reverse:NN #1 #2
{
@@ -1457,7 +1457,7 @@
\prg_return_false:
\__prg_break_point:
}
-\cs_new_nopar:Npn \@@_if_in:
+\cs_new:Npn \@@_if_in:
{ \__prg_break:n { \group_end: \prg_return_true: } }
\cs_generate_variant:Nn \seq_if_in:NnT { NV , Nv , No , Nx }
\cs_generate_variant:Nn \seq_if_in:NnT { c , cV , cv , co , cx }
@@ -1529,9 +1529,9 @@
% to be redefined. This makes it more sensible to use an auxiliary
% function for the local and global cases.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \seq_pop_left:NN
+\cs_new_protected:Npn \seq_pop_left:NN
{ \@@_pop:NNNN \@@_pop_left:NNN \tl_set:Nn }
-\cs_new_protected_nopar:Npn \seq_gpop_left:NN
+\cs_new_protected:Npn \seq_gpop_left:NN
{ \@@_pop:NNNN \@@_pop_left:NNN \tl_gset:Nn }
\cs_new_protected:Npn \@@_pop_left:NNN #1#2#3
{ \exp_after:wN \@@_pop_left:wnwNNN #2 \q_stop #1#2#3 }
@@ -1599,9 +1599,9 @@
% is performed, with an empty argument and \cs{use_none:nn}, which
% finally stops the loop.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \seq_pop_right:NN
+\cs_new_protected:Npn \seq_pop_right:NN
{ \@@_pop:NNNN \@@_pop_right:NNN \tl_set:Nx }
-\cs_new_protected_nopar:Npn \seq_gpop_right:NN
+\cs_new_protected:Npn \seq_gpop_right:NN
{ \@@_pop:NNNN \@@_pop_right:NNN \tl_gset:Nx }
\cs_new_protected:Npn \@@_pop_right:NNN #1#2#3
{
@@ -1728,9 +1728,9 @@
% used to find the end of the code. Any ending code is then inserted
% before the return value of \cs{seq_map_break:n} is inserted.
% \begin{macrocode}
-\cs_new_nopar:Npn \seq_map_break:
+\cs_new:Npn \seq_map_break:
{ \__prg_map_break:Nn \seq_map_break: { } }
-\cs_new_nopar:Npn \seq_map_break:n
+\cs_new:Npn \seq_map_break:n
{ \__prg_map_break:Nn \seq_map_break: }
% \end{macrocode}
% \end{macro}
@@ -1789,7 +1789,7 @@
\cs_gset_eq:cN { __prg_map_ \int_use:N \g__prg_map_int :w }
\@@_item:n
}
-\cs_new_protected_nopar:Npn \@@_pop_item_def:
+\cs_new_protected:Npn \@@_pop_item_def:
{
\cs_gset_eq:Nc \@@_item:n
{ __prg_map_ \int_use:N \g__prg_map_int :w }
diff --git a/l3kernel/l3skip.dtx b/l3kernel/l3skip.dtx
index 97973dd..e4a2c14 100644
--- a/l3kernel/l3skip.dtx
+++ b/l3kernel/l3skip.dtx
@@ -1499,7 +1499,7 @@
% Diagnostics. We don't use the \TeX{} primitive \tn{showthe} to show
% dimension expressions: this gives a more unified output.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \dim_show:n
+\cs_new_protected:Npn \dim_show:n
{ \__msg_show_wrap:Nn \dim_eval:n }
% \end{macrocode}
% \end{macro}
@@ -1741,7 +1741,7 @@
% Diagnostics. We don't use the \TeX{} primitive \tn{showthe} to show
% skip expressions: this gives a more unified output.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \skip_show:n
+\cs_new_protected:Npn \skip_show:n
{ \__msg_show_wrap:Nn \skip_eval:n }
% \end{macrocode}
% \end{macro}
@@ -1931,7 +1931,7 @@
% Diagnostics. We don't use the \TeX{} primitive \tn{showthe} to show
% muskip expressions: this gives a more unified output.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \muskip_show:n
+\cs_new_protected:Npn \muskip_show:n
{ \__msg_show_wrap:Nn \muskip_eval:n }
% \end{macrocode}
% \end{macro}
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index f7db6d2..865a6de 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1009,7 +1009,7 @@
% brace group before the string in that case: that brace group also
% covers the case where the \meta{index} is zero.
% \begin{macrocode}
-\cs_new_nopar:Npn \str_item:Nn { \exp_args:No \str_item:nn }
+\cs_new:Npn \str_item:Nn { \exp_args:No \str_item:nn }
\cs_generate_variant:Nn \str_item:Nn { c }
\cs_new:Npn \str_item:nn #1#2
{
@@ -1105,7 +1105,7 @@
% Afterwards, skip characters, then keep some more, and finally drop
% the end of the string.
% \begin{macrocode}
-\cs_new_nopar:Npn \str_range:Nnn { \exp_args:No \str_range:nnn }
+\cs_new:Npn \str_range:Nnn { \exp_args:No \str_range:nnn }
\cs_generate_variant:Nn \str_range:Nnn { c }
\cs_new:Npn \str_range:nnn #1#2#3
{
@@ -1226,7 +1226,7 @@
% \meta{number} is added to the sum of $9$ that precedes, to adjust
% the result.
% \begin{macrocode}
-\cs_new_nopar:Npn \str_count_spaces:N
+\cs_new:Npn \str_count_spaces:N
{ \exp_args:No \str_count_spaces:n }
\cs_generate_variant:Nn \str_count_spaces:N { c }
\cs_new:Npn \str_count_spaces:n #1
@@ -1268,7 +1268,7 @@
% \cs{str_count_ignore_spaces:n} but expects its argument to already
% be a string or a string with spaces escaped.
% \begin{macrocode}
-\cs_new_nopar:Npn \str_count:N { \exp_args:No \str_count:n }
+\cs_new:Npn \str_count:N { \exp_args:No \str_count:n }
\cs_generate_variant:Nn \str_count:N { c }
\cs_new:Npn \str_count:n #1
{
@@ -1331,7 +1331,7 @@
% gives an empty result after passing through
% \cs{use_i_delimit_by_q_stop:nw}.
% \begin{macrocode}
-\cs_new_nopar:Npn \str_head:N { \exp_args:No \str_head:n }
+\cs_new:Npn \str_head:N { \exp_args:No \str_head:n }
\cs_generate_variant:Nn \str_head:N { c }
\cs_set:Npn \str_head:n #1
{
@@ -1368,7 +1368,7 @@
% One can check that an empty (or blank) string yields an empty
% tail.
% \begin{macrocode}
-\cs_new_nopar:Npn \str_tail:N { \exp_args:No \str_tail:n }
+\cs_new:Npn \str_tail:N { \exp_args:No \str_tail:n }
\cs_generate_variant:Nn \str_tail:N { c }
\cs_set:Npn \str_tail:n #1
{
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index b7094e2..b5c43cf 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -1362,7 +1362,7 @@
\group_begin:
%<*package>
\char_set_catcode_active:N \^^L
- \cs_set_nopar:Npn ^^L { }
+ \cs_set:Npn ^^L { }
%</package>
\char_set_catcode_other:n { 0 }
\if_int_odd:w 0
@@ -2132,9 +2132,9 @@
% {\@@_true:w, \@@_true_aux:w, \@@_false:w, \@@_tmp:w}
% Functions used by the branching and space-stripping code.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_true:w { }
-\cs_new_nopar:Npn \@@_true_aux:w { }
-\cs_new_nopar:Npn \@@_false:w { }
+\cs_new:Npn \@@_true:w { }
+\cs_new:Npn \@@_true_aux:w { }
+\cs_new:Npn \@@_false:w { }
\cs_new:Npn \@@_tmp:w { }
% \end{macrocode}
% \end{macro}
@@ -2144,9 +2144,9 @@
% Simple wrappers for \tn{futurelet}: no arguments absorbed
% here.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \peek_after:Nw
+\cs_new_protected:Npn \peek_after:Nw
{ \tex_futurelet:D \l_peek_token }
-\cs_new_protected_nopar:Npn \peek_gafter:Nw
+\cs_new_protected:Npn \peek_gafter:Nw
{ \tex_global:D \tex_futurelet:D \g_peek_token }
% \end{macrocode}
% \end{macro}
@@ -2174,12 +2174,12 @@
{
\cs_set_eq:NN \l_@@_search_token #2
\tl_set:Nn \l_@@_search_tl {#2}
- \cs_set_nopar:Npx \@@_true:w
+ \cs_set:Npx \@@_true:w
{
\exp_not:N \group_align_safe_end:
\exp_not:n {#3}
}
- \cs_set_nopar:Npx \@@_false:w
+ \cs_set:Npx \@@_false:w
{
\exp_not:N \group_align_safe_end:
\exp_not:n {#4}
@@ -2203,8 +2203,8 @@
\cs_set_eq:NN \l_@@_search_token #2
\tl_set:Nn \l_@@_search_tl {#2}
\cs_set_eq:NN \@@_true:w \@@_true_remove:w
- \cs_set_nopar:Npx \@@_true_aux:w { \exp_not:n {#3} }
- \cs_set_nopar:Npx \@@_false:w
+ \cs_set:Npx \@@_true_aux:w { \exp_not:n {#3} }
+ \cs_set:Npx \@@_false:w
{
\exp_not:N \group_align_safe_end:
\exp_not:n {#4}
@@ -2222,7 +2222,7 @@
% \begin{macro}{\@@_execute_branches_meaning:}
% The meaning test is straight forward.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_execute_branches_meaning:
+\cs_new:Npn \@@_execute_branches_meaning:
{
\if_meaning:w \l_peek_token \l_@@_search_token
\exp_after:wN \@@_true:w
@@ -2266,11 +2266,11 @@
% search token may be of any of the three types above, hence the need
% to use the explicit token that was given to the peek function.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_execute_branches_catcode:
+\cs_new:Npn \@@_execute_branches_catcode:
{ \if_catcode:w \@@_execute_branches_catcode_aux: }
-\cs_new_nopar:Npn \@@_execute_branches_charcode:
+\cs_new:Npn \@@_execute_branches_charcode:
{ \if_charcode:w \@@_execute_branches_catcode_aux: }
-\cs_new_nopar:Npn \@@_execute_branches_catcode_aux:
+\cs_new:Npn \@@_execute_branches_catcode_aux:
{
\if_catcode:w \exp_not:N \l_peek_token \scan_stop:
\exp_after:wN \exp_after:wN
@@ -2290,7 +2290,7 @@
\fi:
#1
}
-\cs_new_nopar:Npn \@@_execute_branches_catcode_auxiii:
+\cs_new:Npn \@@_execute_branches_catcode_auxiii:
{
\exp_not:N \l_peek_token
\exp_after:wN \exp_not:N \l_@@_search_tl
@@ -2312,7 +2312,7 @@
% using a side-effect of \texttt{f}-expansion:
% |\exp:w \exp_end_continue_f:w| removes one space.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_ignore_spaces_execute_branches:
+\cs_new_protected:Npn \@@_ignore_spaces_execute_branches:
{
\if_meaning:w \l_peek_token \c_space_token
\exp_after:wN \peek_after:Nw
@@ -2341,7 +2341,7 @@
}
\cs_set:Npn \@@_def:nnnnn #1#2#3#4#5
{
- \cs_new_protected_nopar:cpx { #1 #5 }
+ \cs_new_protected:cpx { #1 #5 }
{
\tl_if_empty:nF {#2}
{ \exp_not:n { \cs_set_eq:NN \@@_execute_branches: #2 } }
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list