[latex3-commits] [l3svn] branch master updated: Drop protected status for end-of-environment code

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

The following commit(s) were added to refs/heads/master by this push:
       new  c73ec0d   Drop protected status for end-of-environment code
c73ec0d is described below

commit c73ec0dc7651a3d012e96e7aa699597ee56fb474
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Apr 20 20:44:48 2016 +0100

    Drop protected status for end-of-environment code
---
 l3packages/xparse/testfiles/xparse001.tlg |   34 ++++++++++++++---------------
 l3packages/xparse/xparse.dtx              |    8 +++----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/l3packages/xparse/testfiles/xparse001.tlg b/l3packages/xparse/testfiles/xparse001.tlg
index 9f20e08..025edc2 100644
--- a/l3packages/xparse/testfiles/xparse001.tlg
+++ b/l3packages/xparse/testfiles/xparse001.tlg
@@ -972,8 +972,8 @@ l. ...}
 \l__xparse_fn_tl {\environment foo  }\l__xparse_args_tl .
 <recently read> }
 l. ...}
-> \environment foo code=\protected\long macro:->\cs_set_protected_nopar:Npx
-\environment foo end aux {\environment foo end aux  \tl_tail:N
+> \environment foo code=\protected\long macro:->\cs_set_nopar:Npx \environment
+foo end aux {\exp_not:N \environment foo end aux  \tl_tail:N
 \l__xparse_args_tl }First.
 <recently read> }
 l. ...}
@@ -991,9 +991,9 @@ TEST 13: Valid environment declarations
 \l__xparse_fn_tl {\environment foo  }\__xparse_grab_m_3:w \l__xparse_args_tl .
 <recently read> }
 l. ...}
-> \environment foo code=\protected\long
-macro:#1#2#3->\cs_set_protected_nopar:Npx \environment foo end aux
-{\environment foo end aux  \tl_tail:N \l__xparse_args_tl }(#1)(#2)(#3).
+> \environment foo code=\protected\long macro:#1#2#3->\cs_set_nopar:Npx
+\environment foo end aux {\exp_not:N \environment foo end aux  \tl_tail:N
+\l__xparse_args_tl }(#1)(#2)(#3).
 <recently read> }
 l. ...}
 .................................................
@@ -1007,9 +1007,9 @@ l. ...}
 []{-NoValue-}\__xparse_grab_m_1:w \l__xparse_args_tl .
 <recently read> }
 l. ...}
-> \environment foo code=\protected\long
-macro:#1#2#3->\cs_set_protected_nopar:Npx \environment foo end aux
-{\environment foo end aux  \tl_tail:N \l__xparse_args_tl }(#1)(#2)(#3).
+> \environment foo code=\protected\long macro:#1#2#3->\cs_set_nopar:Npx
+\environment foo end aux {\exp_not:N \environment foo end aux  \tl_tail:N
+\l__xparse_args_tl }(#1)(#2)(#3).
 <recently read> }
 l. ...}
 .................................................
@@ -1023,9 +1023,9 @@ l. ...}
 []{-NoValue-}\__xparse_grab_m_long:w \l__xparse_args_tl .
 <recently read> }
 l. ...}
-> \environment foo code=\protected\long
-macro:#1#2#3->\cs_set_protected_nopar:Npx \environment foo end aux
-{\environment foo end aux  \tl_tail:N \l__xparse_args_tl }(#1)(#2)(#3).
+> \environment foo code=\protected\long macro:#1#2#3->\cs_set_nopar:Npx
+\environment foo end aux {\exp_not:N \environment foo end aux  \tl_tail:N
+\l__xparse_args_tl }(#1)(#2)(#3).
 <recently read> }
 l. ...}
 .................................................
@@ -1040,9 +1040,9 @@ l. ...}
 .
 <recently read> }
 l. ...}
-> \environment foo code=\protected\long
-macro:#1#2#3->\cs_set_protected_nopar:Npx \environment foo end aux
-{\environment foo end aux  \tl_tail:N \l__xparse_args_tl }(#1)(#2)(#3).
+> \environment foo code=\protected\long macro:#1#2#3->\cs_set_nopar:Npx
+\environment foo end aux {\exp_not:N \environment foo end aux  \tl_tail:N
+\l__xparse_args_tl }(#1)(#2)(#3).
 <recently read> }
 l. ...}
 .................................................
@@ -1057,9 +1057,9 @@ l. ...}
 []{-NoValue-}\l__xparse_args_tl .
 <recently read> }
 l. ...}
-> \environment foo code=\protected\long
-macro:#1#2#3->\cs_set_protected_nopar:Npx \environment foo end aux
-{\environment foo end aux  \tl_tail:N \l__xparse_args_tl }(#1)(#2)(#3).
+> \environment foo code=\protected\long macro:#1#2#3->\cs_set_nopar:Npx
+\environment foo end aux {\exp_not:N \environment foo end aux  \tl_tail:N
+\l__xparse_args_tl }(#1)(#2)(#3).
 <recently read> }
 l. ...}
 ============================================================
diff --git a/l3packages/xparse/xparse.dtx b/l3packages/xparse/xparse.dtx
index e621069..4150190 100644
--- a/l3packages/xparse/xparse.dtx
+++ b/l3packages/xparse/xparse.dtx
@@ -1088,17 +1088,17 @@
   {
     \@@_declare_cmd_internal:cnx { environment~ #1 } {#2}
       {
-        \cs_set_protected_nopar:Npx \exp_not:c { environment~ #1 ~end~aux }
+        \cs_set_nopar:Npx \exp_not:c { environment~ #1 ~end~aux }
           {
-            \exp_not:c { environment~ #1~end~aux~ }
+            \exp_not:N \exp_not:N \exp_not:c { environment~ #1~end~aux~ }
             \exp_not:n { \tl_tail:N \l_@@_args_tl }
           }
         \exp_not:n {#3}
       }
-    \cs_set_protected_nopar:cpx { environment~ #1 ~end }
+    \cs_set_nopar:cpx { environment~ #1 ~end }
       { \exp_not:c { environment~ #1 ~end~aux } }
     \cs_generate_from_arg_count:cNnn
-      { environment~ #1 ~end~aux~ } \cs_set_protected:Npn
+      { environment~ #1 ~end~aux~ } \cs_set:Npn
       \l_@@_current_arg_int {#4}
 %<*package>
     \cs_set_eq:cc {#1}       { environment~ #1 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.