[latex3-commits] [git/LaTeX3-latex3-latex3] xparse: Correct docstrip guards (784d4daf1)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex3
On branch  : xparse
Link       : https://github.com/latex3/latex3/commit/784d4daf18743e6c42e54e4c9c532d00f60fec05

>---------------------------------------------------------------

commit 784d4daf18743e6c42e54e4c9c532d00f60fec05
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Mon May 11 21:32:07 2020 -0300

    Correct docstrip guards
    
    So that \@@_normalize_arg_spec_loop:n is written to the .sty and the initex version also gets written


>---------------------------------------------------------------

784d4daf18743e6c42e54e4c9c532d00f60fec05
 l3packages/xparse/xparse.dtx | 57 +++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
index e4c81076c..19b41bf1e 100644
--- a/l3packages/xparse/xparse.dtx
+++ b/l3packages/xparse/xparse.dtx
@@ -1047,7 +1047,7 @@
 % \subsection{Variables and constants}
 %
 %    \begin{macrocode}
-%<*core>
+%<*!package>
 %    \end{macrocode}
 %
 % \begin{variable}{\c_@@_special_chars_seq}
@@ -1561,7 +1561,9 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_start_env:nnnnn #1#2
   {
+%<*core>
     \cs_if_exist_use:N \conditionally at traceoff
+%</core>
     \str_set:Nn \l_@@_environment_str {#2}
     \bool_set_true:N \l_@@_environment_bool
     \@@_start_aux:ccnnnn
@@ -1571,7 +1573,9 @@
   }
 \cs_new_protected:Npx \@@_start:nNNnnn #1#2#3
   {
+%<*core>
     \exp_not:n { \cs_if_exist_use:N \conditionally at traceoff }
+%</core>
     \exp_not:c { xparse~function~is~not~expandable }
     \exp_not:n { \bool_set_false:N \l_@@_environment_bool }
     \exp_not:N \@@_start_aux:NNnnnn
@@ -1888,7 +1892,6 @@
     \bool_if:NT \l_@@_environment_bool
       { \bool_set_false:N \l_@@_grab_expandably_bool }
   }
-%<*core>
 \cs_new_protected:Npn \@@_normalize_arg_spec_loop:n #1
   {
     \quark_if_recursion_tail_stop:n {#1}
@@ -1913,7 +1916,7 @@
         \@@_bad_def:wn
       }
   }
-%</core>
+%</!package>
 %<*package>
 \cs_gset_protected:Npn \@@_normalize_arg_spec_loop:n #1
   {
@@ -1927,6 +1930,7 @@
       }
   }
 %</package>
+%<*!package>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -1973,10 +1977,12 @@
       { \@@_normalize_type_t:w * }
   }
 \exp_args:No \@@_tmp:w { \c_novalue_tl }
+%</!package>
 %<*package>
 \cs_new_protected:Npx \@@_normalize_type_g:w
   { \exp_not:N \@@_normalize_type_G:w { \exp_not:V \c_novalue_tl } }
 %</package>
+%<*!package>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2090,7 +2096,7 @@
         \@@_normalize_E_unique_check:w #2 \q_stop
       }
   }
-%</core>
+%</!package>
 %<*package>
 \cs_new_protected:Npn \@@_normalize_type_G:w #1
   {
@@ -2101,7 +2107,7 @@
     \@@_normalize_arg_spec_loop:n
   }
 %</package>
-%<*core>
+%<*!package>
 \cs_new_protected:Npn \@@_normalize_type_t:w #1
   {
     \quark_if_recursion_tail_stop_do:Nn #1 { \@@_bad_arg_spec:wn }
@@ -2138,7 +2144,7 @@
 %   \cs{l_@@_arg_spec_tl}, count the mandatory argument, and empty the
 %   list of last delimiters.
 %    \begin{macrocode}
-%</core>
+%</!package>
 %<*package>
 \cs_new_protected:Npn \@@_normalize_type_l:w
   {
@@ -2147,7 +2153,7 @@
     \@@_normalize_arg_spec_loop:n
   }
 %</package>
-%<*core>
+%<*!package>
 \cs_new_protected:Npn \@@_normalize_type_m:w
   {
     \@@_delimiter_check:nnn { } { m } { \iow_char:N \{ }
@@ -2164,7 +2170,7 @@
     \@@_add_arg_spec_mandatory:n { R #1 #2 {#3} }
     \@@_normalize_arg_spec_loop:n
   }
-%</core>
+%</!package>
 %<*package>
 \cs_new_protected:Npn \@@_normalize_type_u:w #1
   {
@@ -2174,7 +2180,7 @@
     \@@_normalize_arg_spec_loop:n
   }
 %</package>
-%<*core>
+%<*!package>
 \cs_new_protected:Npn \@@_normalize_type_v:w
   {
     \@@_normalize_check_gv:N v
@@ -2533,7 +2539,7 @@
 %   For the \texttt{G} type, the grabber and the default are added to the
 %   signature.
 %    \begin{macrocode}
-%</core>
+%</!package>
 %<*package>
 \cs_new_protected:Npn \@@_add_type_G:w #1
   {
@@ -2557,7 +2563,7 @@
     \@@_prepare_signature:N
   }
 %</package>
-%<*core>
+%<*!package>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2613,7 +2619,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>
+%</!package>
 %<*package>
 \cs_new_protected:Npn \@@_add_type_u:w #1
   {
@@ -2624,7 +2630,7 @@
     \@@_prepare_signature:N
   }
 %</package>
-%<*core>
+%<*!package>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2843,12 +2849,12 @@
 %   parameter text ends with |#| in fact end up being delimited by an
 %   open brace.
 %    \begin{macrocode}
-%</core>
+%</!package>
 %<*package>
 \cs_new_protected:Npn \@@_add_expandable_type_l:w
   { \@@_add_expandable_type_u:w ## }
 %</package>
-%<*core>
+%<*!package>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2897,7 +2903,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>
+%</!package>
 %<*package>
 \cs_new_protected:Npn \@@_add_expandable_type_u:w #1
   {
@@ -2912,7 +2918,7 @@
     \@@_prepare_signature:N
   }
 %</package>
-%<*core>
+%<*!package>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -3316,7 +3322,7 @@
 %   Optional groups are checked by meaning, so that the same code will
 %   work with, for example, \ConTeXt{}-like input.
 %    \begin{macrocode}
-%</core>
+%</!package>
 %<*package>
 \cs_new_protected:Npn \@@_grab_G:w #1 \@@_run_code:
   {
@@ -3348,7 +3354,7 @@
       { \@@_add_arg:o \c_novalue_tl }
   }
 %</package>
-%<*core>
+%<*!package>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -3361,7 +3367,7 @@
 % \begin{macro}{\@@_grab_l_aux:nN}
 %   Argument grabbers for mandatory \TeX{} arguments are pretty simple.
 %    \begin{macrocode}
-%</core>
+%</!package>
 %<*package>
 \cs_new_protected:Npn \@@_grab_l:w #1 \@@_run_code:
   { \@@_grab_l_aux:nN {#1} \cs_set_protected_nopar:Npn }
@@ -3375,7 +3381,7 @@
     \l_@@_fn_tl
   }
 %</package>
-%<*core>
+%<*!package>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -3547,7 +3553,7 @@
 %   Grabbing up to a list of tokens is quite easy: define the grabber,
 %   and then collect.
 %    \begin{macrocode}
-%</core>
+%</!package>
 %<*package>
 \cs_new_protected:Npn \@@_grab_u:w #1#2 \@@_run_code:
   { \@@_grab_u_aux:nnN {#1} {#2} \cs_set_protected_nopar:Npn }
@@ -3561,7 +3567,7 @@
     \l_@@_fn_tl
   }
 %</package>
-%<*core>
+%<*!package>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -5197,10 +5203,6 @@
 % \end{macro}
 %
 %    \begin{macrocode}
-%</core>
-%    \end{macrocode}
-%
-%    \begin{macrocode}
 %<*2ekernel>
 %    \end{macrocode}
 %
@@ -5210,6 +5212,7 @@
 %
 %    \begin{macrocode}
 %</2ekernel>
+%</!package>
 %    \end{macrocode}
 %
 % \end{implementation}