1 files changed, 24 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3prop.sty b/Master/texmf-dist/tex/latex/expl3/l3prop.sty
index 14c542416e8..9d702a4004f 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3prop.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3prop.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3prop.dtx 1622 2009-10-25 06:41:23Z will $
+\GetIdInfo$Id: l3prop.dtx 1857 2010-03-21 21:32:09Z joseph $
           {L3 Experimental Property Lists}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -70,7 +70,7 @@
 \cs_new_eq:NN \prop_gset_eq:cc \toks_gset_eq:cc
 \cs_new_eq:NN \prop_show:N \toks_show:N
 \cs_new_eq:NN \prop_show:c \toks_show:c
-\cs_new_nopar:Npn \prop_display:N #1 {
+\cs_new_protected_nopar:Npn \prop_display:N #1 {
   \iow_term:x { Property-list~\token_to_str:N #1~contains~
                    the~pairs~(without~outer~braces): }
   \toks_clear:N \l_tmpa_toks
@@ -79,50 +79,50 @@
       \toks_put_right:Nx \l_tmpa_toks {^^J>~}
     }
     \toks_put_right:Nx \l_tmpa_toks {
-      \iow_space: \iow_char:N \{ \exp_not:n {##1} \iow_char:N \} \iow_space:
-      \iow_space: => \iow_space:
-      \iow_space: \iow_char:N \{ \exp_not:n {##2} \iow_char:N \}
+      \c_space_tl \iow_char:N \{ \exp_not:n {##1} \iow_char:N \} \c_space_tl
+      \c_space_tl => \c_space_tl
+      \c_space_tl \iow_char:N \{ \exp_not:n {##2} \iow_char:N \}
     }
   }
   \toks_show:N \l_tmpa_toks
 }
 \cs_generate_variant:Nn \prop_display:N {c}
-\cs_new:Npn \prop_split_aux:Nnn #1#2#3{
+\cs_new_protected:Npn \prop_split_aux:Nnn #1#2#3{
   \cs_set:Npn \prop_tmp:w ##1 \q_prop #2 \q_prop ##2##3 \q_stop {
     #3 {##1}{##2}{##3}
   }
   \exp_after:wN \prop_tmp:w \toks_use:N #1 \q_prop #2 \q_prop \q_no_value \q_stop
 }
-\cs_new:Npn \prop_get:NnN #1#2 {
+\cs_new_protected:Npn \prop_get:NnN #1#2 {
   \prop_split_aux:Nnn #1{#2}\prop_get_aux:w
 }
-\cs_new:Npn \prop_get_aux:w #1#2#3#4 { \tl_set:Nx #4 {\exp_not:n{#2}} }
+\cs_new_protected:Npn \prop_get_aux:w #1#2#3#4 { \tl_set:Nn #4 {#2} }
 \cs_generate_variant:Nn \prop_get:NnN { NVN, cnN, cVN }
-\cs_new:Npn \prop_gget:NnN #1#2{
+\cs_new_protected:Npn \prop_gget:NnN #1#2{
   \prop_split_aux:Nnn #1{#2}\prop_gget_aux:w}
-\cs_new:Npn \prop_gget_aux:w #1#2#3#4{\tl_gset:Nx#4{\exp_not:n{#2}}}
+\cs_new_protected:Npn \prop_gget_aux:w #1#2#3#4{\tl_gset:Nx#4{\exp_not:n{#2}}}
 \cs_generate_variant:Nn \prop_gget:NnN { NVN, cnN, cVN }
-\cs_new:Npn \prop_get_gdel:NnN #1#2#3{
+\cs_new_protected:Npn \prop_get_gdel:NnN #1#2#3{
   \prop_split_aux:Nnn #1{#2}{\prop_get_del_aux:w #3{\toks_gset:Nn #1}{#2}}}
-\cs_new:Npn \prop_get_del_aux:w #1#2#3#4#5#6{
-  \tl_set:Nx #1{\exp_not:n{#5}}
+\cs_new_protected:Npn \prop_get_del_aux:w #1#2#3#4#5#6{
+  \tl_set:Nn #1 {#5}
   \quark_if_no_value:NF #1 {
     \cs_set_nopar:Npn \prop_tmp:w ##1\q_prop#3\q_prop\q_no_value {#2{#4##1}}
     \prop_tmp:w #6}
 }
-\cs_new:Npn \prop_put:Nnn #1#2{
+\cs_new_protected:Npn \prop_put:Nnn #1#2{
   \prop_split_aux:Nnn #1{#2}{
     \prop_clear:N #1
     \prop_put_aux:w {\toks_put_right:Nn #1}{#2}
   }
 }
-\cs_new:Npn \prop_gput:Nnn #1#2{
+\cs_new_protected:Npn \prop_gput:Nnn #1#2{
   \prop_split_aux:Nnn #1{#2}{
     \prop_gclear:N #1
     \prop_put_aux:w {\toks_gput_right:Nn #1}{#2}
   }
 }
-\cs_new:Npn \prop_put_aux:w #1#2#3#4#5#6{
+\cs_new_protected:Npn \prop_put_aux:w #1#2#3#4#5#6{
   #1{\q_prop#2\q_prop{#6}#3}
   \tl_if_empty:nF{#5}
   {
@@ -131,12 +131,12 @@
   }
 }
 \cs_generate_variant:Nn \prop_put:Nnn { NnV, NVn, NVV, cnn }
-\cs_generate_variant:Nn \prop_gput:Nnn {NnV,Nno,Nnx,Nox,cnn,ccx}
-\cs_new:Npn \prop_del:Nn #1#2{
+\cs_generate_variant:Nn \prop_gput:Nnn {NVn,NnV,Nno,Nnx,Nox,cnn,ccx}
+\cs_new_protected:Npn \prop_del:Nn #1#2{
   \prop_split_aux:Nnn #1{#2}{\prop_del_aux:w {\toks_set:Nn #1}{#2}}}
-\cs_new:Npn \prop_gdel:Nn #1#2{
+\cs_new_protected:Npn \prop_gdel:Nn #1#2{
   \prop_split_aux:Nnn #1{#2}{\prop_del_aux:w {\toks_gset:Nn #1}{#2}}}
-\cs_new:Npn \prop_del_aux:w #1#2#3#4#5{
+\cs_new_protected:Npn \prop_del_aux:w #1#2#3#4#5{
   \cs_set_nopar:Npn \prop_tmp:w {#4}
   \quark_if_no_value:NF \prop_tmp:w {
     \cs_set_nopar:Npn \prop_tmp:w ##1\q_prop#2\q_prop\q_no_value {#1{#3##1}}
@@ -145,9 +145,9 @@
 }
 \cs_generate_variant:Nn \prop_del:Nn { NV }
 \cs_generate_variant:Nn \prop_gdel:Nn { NV }
-\cs_new:Npn \prop_gput_if_new:Nnn #1#2{
+\cs_new_protected:Npn \prop_gput_if_new:Nnn #1#2{
   \prop_split_aux:Nnn #1{#2}{\prop_put_if_new_aux:w #1{#2}}}
-\cs_new:Npn \prop_put_if_new_aux:w #1#2#3#4#5#6{
+\cs_new_protected:Npn \prop_put_if_new_aux:w #1#2#3#4#5#6{
   \tl_if_empty:nT {#5}{#1{\q_prop#2\q_prop{#6}#3}}}
 \prg_new_eq_conditional:NNn \prop_if_empty:N \toks_if_empty:N {p,TF,T,F}
 \prg_new_eq_conditional:NNn \prop_if_empty:c \toks_if_empty:c {p,TF,T,F}
@@ -155,7 +155,7 @@
 \prg_new_eq_conditional:NNn \prop_if_eq:cN \toks_if_eq:cN {p,TF,T,F}
 \prg_new_eq_conditional:NNn \prop_if_eq:Nc \toks_if_eq:Nc {p,TF,T,F}
 \prg_new_eq_conditional:NNn \prop_if_eq:cc \toks_if_eq:cc {p,TF,T,F}
-\prg_new_conditional:Nnn \prop_if_in:Nn {TF,T,F} {
+\prg_new_protected_conditional:Nnn \prop_if_in:Nn {TF,T,F} {
   \prop_split_aux:Nnn #1 {#2} {\prop_if_in_aux:w}
 }
 \cs_new_nopar:Npn \prop_if_in_aux:w #1#2#3 {
@@ -177,7 +177,7 @@
 }
 \cs_generate_variant:Nn \prop_map_function:NN {c,Nc,cc}
 \int_new:N \g_prop_inline_level_int
-\cs_new_nopar:Npn \prop_map_inline:Nn #1#2 {
+\cs_new_protected_nopar:Npn \prop_map_inline:Nn #1#2 {
   \int_gincr:N \g_prop_inline_level_int
   \cs_gset:cpn {prop_map_inline_ \int_use:N \g_prop_inline_level_int :n}
     ##1##2{#2}