[latex3-commits] [git/LaTeX3-latex3-latex3] master: Drop IniTeX guards from l3packages (723c169f3)
Joseph Wright
joseph.wright at morningstar2.co.uk
Tue Aug 4 23:21:17 CEST 2020
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/723c169f312f45383fa8460f94beb3c293740f9e
>---------------------------------------------------------------
commit 723c169f312f45383fa8460f94beb3c293740f9e
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Aug 4 22:21:17 2020 +0100
Drop IniTeX guards from l3packages
>---------------------------------------------------------------
723c169f312f45383fa8460f94beb3c293740f9e
l3packages/xparse/xparse.dtx | 76 +++++++++++++++-----------------------------
1 file changed, 25 insertions(+), 51 deletions(-)
diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
index 1094e1c68..8fdf540ef 100644
--- a/l3packages/xparse/xparse.dtx
+++ b/l3packages/xparse/xparse.dtx
@@ -1044,20 +1044,8 @@
% \subsection{Variables and constants}
%
% \begin{macrocode}
-%<*core|initex>
-% \end{macrocode}
-%
-% \begin{variable}{\c_@@_special_chars_seq}
-% In \IniTeX{} mode, we store special characters in a sequence.
-% Maybe |$| or |&| will have to be added later.
-% \begin{macrocode}
-%<*initex>
-\seq_new:N \c_@@_special_chars_seq
-\seq_set_split:Nnn \c_@@_special_chars_seq { }
- { \ \\ \{ \} \# \^ \_ \% \~ }
-%</initex>
+%<*core>
% \end{macrocode}
-% \end{variable}
%
% \begin{variable}{\l_@@_arg_spec_tl}
% Holds the argument specification after normalization of shorthands.
@@ -1484,12 +1472,7 @@
\str_set:Nx \l_@@_environment_str {#1}
\str_set:Nx \l_@@_environment_str
{ \tl_trim_spaces:o { \l_@@_environment_str } }
-%<*initex>
- \cs_if_exist:cTF { environment~ \l_@@_environment_str }
-%</initex>
-%<*core>
\cs_if_exist:cTF { \l_@@_environment_str }
-%</core>
{
\__kernel_msg_info:nnxx { xparse } { redefine-environment }
{ \l_@@_environment_str } { \tl_to_str:n {#2} }
@@ -1913,7 +1896,7 @@
\@@_bad_def:wn
}
}
-%</core|initex>
+%</core>
%<*package>
\cs_gset_protected:Npn \@@_normalize_arg_spec_loop:n #1
{
@@ -1927,7 +1910,7 @@
}
}
%</package>
-%<*core|initex>
+%<*core>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1974,12 +1957,12 @@
{ \@@_normalize_type_t:w * }
}
\exp_args:No \@@_tmp:w { \c_novalue_tl }
-%</core|initex>
+%</core>
%<*package>
\cs_new_protected:Npx \@@_normalize_type_g:w
{ \exp_not:N \@@_normalize_type_G:w { \exp_not:V \c_novalue_tl } }
%</package>
-%<*core|initex>
+%<*core>
% \end{macrocode}
% \end{macro}
%
@@ -2093,7 +2076,7 @@
\@@_normalize_E_unique_check:w #2 \q_stop
}
}
-%</core|initex>
+%</core>
%<*package>
\cs_new_protected:Npn \@@_normalize_type_G:w #1
{
@@ -2104,7 +2087,7 @@
\@@_normalize_arg_spec_loop:n
}
%</package>
-%<*core|initex>
+%<*core>
\cs_new_protected:Npn \@@_normalize_type_t:w #1
{
\quark_if_recursion_tail_stop_do:Nn #1 { \@@_bad_arg_spec:wn }
@@ -2141,7 +2124,7 @@
% \cs{l_@@_arg_spec_tl}, count the mandatory argument, and empty the
% list of last delimiters.
% \begin{macrocode}
-%</core|initex>
+%</core>
%<*package>
\cs_new_protected:Npn \@@_normalize_type_l:w
{
@@ -2150,7 +2133,7 @@
\@@_normalize_arg_spec_loop:n
}
%</package>
-%<*core|initex>
+%<*core>
\cs_new_protected:Npn \@@_normalize_type_m:w
{
\@@_delimiter_check:nnn { } { m } { \iow_char:N \{ }
@@ -2167,7 +2150,7 @@
\@@_add_arg_spec_mandatory:n { R #1 #2 {#3} }
\@@_normalize_arg_spec_loop:n
}
-%</core|initex>
+%</core>
%<*package>
\cs_new_protected:Npn \@@_normalize_type_u:w #1
{
@@ -2177,7 +2160,7 @@
\@@_normalize_arg_spec_loop:n
}
%</package>
-%<*core|initex>
+%<*core>
\cs_new_protected:Npn \@@_normalize_type_v:w
{
\@@_normalize_check_gv:N v
@@ -2536,7 +2519,7 @@
% For the \texttt{G} type, the grabber and the default are added to the
% signature.
% \begin{macrocode}
-%</core|initex>
+%</core>
%<*package>
\cs_new_protected:Npn \@@_add_type_G:w #1
{
@@ -2560,7 +2543,7 @@
\@@_prepare_signature:N
}
%</package>
-%<*core|initex>
+%<*core>
% \end{macrocode}
% \end{macro}
%
@@ -2616,7 +2599,7 @@
% At the set up stage, the \texttt{u} type argument is identical to the
% \texttt{G} type except for the name of the grabber function.
% \begin{macrocode}
-%</core|initex>
+%</core>
%<*package>
\cs_new_protected:Npn \@@_add_type_u:w #1
{
@@ -2627,7 +2610,7 @@
\@@_prepare_signature:N
}
%</package>
-%<*core|initex>
+%<*core>
% \end{macrocode}
% \end{macro}
%
@@ -2846,12 +2829,12 @@
% parameter text ends with |#| in fact end up being delimited by an
% open brace.
% \begin{macrocode}
-%</core|initex>
+%</core>
%<*package>
\cs_new_protected:Npn \@@_add_expandable_type_l:w
{ \@@_add_expandable_type_u:w ## }
%</package>
-%<*core|initex>
+%<*core>
% \end{macrocode}
% \end{macro}
%
@@ -2900,7 +2883,7 @@
% Define an auxiliary that will be used directly in the signature. It
% grabs one argument delimited by |#1| and places it before \cs{q_@@}.
% \begin{macrocode}
-%</core|initex>
+%</core>
%<*package>
\cs_new_protected:Npn \@@_add_expandable_type_u:w #1
{
@@ -2915,7 +2898,7 @@
\@@_prepare_signature:N
}
%</package>
-%<*core|initex>
+%<*core>
% \end{macrocode}
% \end{macro}
%
@@ -3319,7 +3302,7 @@
% Optional groups are checked by meaning, so that the same code will
% work with, for example, \ConTeXt{}-like input.
% \begin{macrocode}
-%</core|initex>
+%</core>
%<*package>
\cs_new_protected:Npn \@@_grab_G:w #1 \@@_run_code:
{
@@ -3351,7 +3334,7 @@
{ \@@_add_arg:o \c_novalue_tl }
}
%</package>
-%<*core|initex>
+%<*core>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3364,7 +3347,7 @@
% \begin{macro}{\@@_grab_l_aux:nN}
% Argument grabbers for mandatory \TeX{} arguments are pretty simple.
% \begin{macrocode}
-%</core|initex>
+%</core>
%<*package>
\cs_new_protected:Npn \@@_grab_l:w #1 \@@_run_code:
{ \@@_grab_l_aux:nN {#1} \cs_set_protected_nopar:Npn }
@@ -3378,7 +3361,7 @@
\l_@@_fn_tl
}
%</package>
-%<*core|initex>
+%<*core>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3550,7 +3533,7 @@
% Grabbing up to a list of tokens is quite easy: define the grabber,
% and then collect.
% \begin{macrocode}
-%</core|initex>
+%</core>
%<*package>
\cs_new_protected:Npn \@@_grab_u:w #1#2 \@@_run_code:
{ \@@_grab_u_aux:nnN {#1} {#2} \cs_set_protected_nopar:Npn }
@@ -3564,7 +3547,7 @@
\l_@@_fn_tl
}
%</package>
-%<*core|initex>
+%<*core>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3761,9 +3744,6 @@
%
% \begin{macro}{\@@_grab_v_aux_catcodes:}
% \begin{macro}{\@@_grab_v_aux_abort:n}
-% In a standalone format, the list of special characters is kept
-% as a sequence, \cs{c_@@_special_chars_seq}, and we use
-% \tn{dospecials} in package mode.
% The approach for short verbatim arguments is to make the end-line
% character a macro parameter character: this is forbidden by the
% rest of the code. Then the error branch can check what caused the
@@ -3771,11 +3751,6 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_grab_v_aux_catcodes:
{
-%<*initex>
- \seq_map_function:NN
- \c_@@_special_chars_seq
- \char_set_catcode_other:N
-%</initex>
%<*core>
\cs_set_eq:NN \do \char_set_catcode_other:N
\dospecials
@@ -5203,7 +5178,6 @@
%<*core>
\@@_file_end_hook:
%</core>
-%</core|initex>
% \end{macrocode}
%
% \begin{macrocode}
More information about the latex3-commits
mailing list.