diff options
author | Karl Berry <karl@freefriends.org> | 2010-05-23 23:50:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-05-23 23:50:45 +0000 |
commit | ad61437dbc77ced3998eeb1fbc47f07382a9740b (patch) | |
tree | 43555571c2b6a10cae679df9a7e3677823a5bfa1 /Master/texmf-dist/tex/latex | |
parent | 64ba2a9dbcc524178aec8cecbb6947b449724990 (diff) |
expl3 1925 (23may10)
git-svn-id: svn://tug.org/texlive/trunk@18438 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3basics.sty | 116 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3box.sty | 18 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3int.sty | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3io.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3num.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3skip.sty | 25 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3tl.sty | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3toks.sty | 10 |
8 files changed, 22 insertions, 177 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3basics.sty b/Master/texmf-dist/tex/latex/expl3/l3basics.sty index 59d1e75cee0..06aec13b63e 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3basics.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3basics.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3basics.dtx 1905 2010-05-19 07:45:31Z joseph $ +\GetIdInfo$Id: l3basics.dtx 1921 2010-05-22 08:28:54Z joseph $ {L3 Experimental basic definitions} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -472,20 +472,13 @@ \cs_set:Npn\str_if_eq_var_stop:w\str_if_eq_var_start:nnN#1#2#3{ #1#3\scan_stop:'#213~\prg_return_true:\else:\prg_return_false:\fi: } -\cs_set:Npn \cs_tmp:w #1#2{ - \cs_set_protected_nopar:Npn #1 ##1 { - \chk_if_free_cs:N ##1 - #2 ##1 - } -} -\cs_tmp:w \cs_new_local_nopar:Npn \cs_set_nopar:Npn -\cs_tmp:w \cs_new_local_nopar:Npx \cs_set_nopar:Npx -\cs_tmp:w \cs_new_local:Npn \cs_set:Npn -\cs_tmp:w \cs_new_local:Npx \cs_set:Npx -\cs_tmp:w \cs_new_local_protected_nopar:Npn \cs_set_protected_nopar:Npn -\cs_tmp:w \cs_new_local_protected_nopar:Npx \cs_set_protected_nopar:Npx -\cs_tmp:w \cs_new_local_protected:Npn \cs_set_protected:Npn -\cs_tmp:w \cs_new_local_protected:Npx \cs_set_protected:Npx +\cs_set:Npn \cs_tmp:w #1#2 { + \cs_set_protected_nopar:Npn #1 ##1 + { + \chk_if_free_cs:N ##1 + #2 ##1 + } +} \cs_tmp:w \cs_new_nopar:Npn \cs_gset_nopar:Npn \cs_tmp:w \cs_new_nopar:Npx \cs_gset_nopar:Npx \cs_tmp:w \cs_new:Npn \cs_gset:Npn @@ -501,8 +494,6 @@ \cs_tmp:w \cs_set_nopar:cpx \cs_set_nopar:Npx \cs_tmp:w \cs_gset_nopar:cpn \cs_gset_nopar:Npn \cs_tmp:w \cs_gset_nopar:cpx \cs_gset_nopar:Npx -\cs_tmp:w \cs_new_local_nopar:cpn \cs_new_local_nopar:Npn -\cs_tmp:w \cs_new_local_nopar:cpx \cs_new_local_nopar:Npx \cs_tmp:w \cs_new_nopar:cpn \cs_new_nopar:Npn \cs_tmp:w \cs_new_nopar:cpx \cs_new_nopar:Npx \cs_tmp:w \cs_set:cpn \cs_set:Npn @@ -511,24 +502,18 @@ \cs_tmp:w \cs_gset:cpx \cs_gset:Npx \cs_tmp:w \cs_new:cpn \cs_new:Npn \cs_tmp:w \cs_new:cpx \cs_new:Npx -\cs_tmp:w \cs_new_local:cpn \cs_new_local:Npn -\cs_tmp:w \cs_new_local:cpx \cs_new_local:Npx \cs_tmp:w \cs_set_protected_nopar:cpn \cs_set_protected_nopar:Npn \cs_tmp:w \cs_set_protected_nopar:cpx \cs_set_protected_nopar:Npx \cs_tmp:w \cs_gset_protected_nopar:cpn \cs_gset_protected_nopar:Npn \cs_tmp:w \cs_gset_protected_nopar:cpx \cs_gset_protected_nopar:Npx \cs_tmp:w \cs_new_protected_nopar:cpn \cs_new_protected_nopar:Npn \cs_tmp:w \cs_new_protected_nopar:cpx \cs_new_protected_nopar:Npx -\cs_tmp:w \cs_new_local_protected_nopar:cpn \cs_new_local_protected_nopar:Npn -\cs_tmp:w \cs_new_local_protected_nopar:cpx \cs_new_local_protected_nopar:Npx \cs_tmp:w \cs_set_protected:cpn \cs_set_protected:Npn \cs_tmp:w \cs_set_protected:cpx \cs_set_protected:Npx \cs_tmp:w \cs_gset_protected:cpn \cs_gset_protected:Npn \cs_tmp:w \cs_gset_protected:cpx \cs_gset_protected:Npx \cs_tmp:w \cs_new_protected:cpn \cs_new_protected:Npn \cs_tmp:w \cs_new_protected:cpx \cs_new_protected:Npx -\cs_tmp:w \cs_new_local_protected:cpn \cs_new_local_protected:Npn -\cs_tmp:w \cs_new_local_protected:cpx \cs_new_local_protected:Npx \cs_set_eq:NwN \cs_gnew_nopar:Npn \cs_new_nopar:Npn \cs_set_eq:NwN \cs_gnew:Npn \cs_new:Npn \cs_set_eq:NwN \cs_gnew_protected_nopar:Npn \cs_new_protected_nopar:Npn @@ -572,13 +557,6 @@ \cs_new_protected_nopar:Npn \cs_gset_eq:Nc { \exp_args:NNc \cs_gset_eq:NN } \cs_new_protected_nopar:Npn \cs_gset_eq:cN { \exp_args:Nc \cs_gset_eq:NN } \cs_new_protected_nopar:Npn \cs_gset_eq:cc { \exp_args:Ncc \cs_gset_eq:NN } -\cs_new_protected:Npn \cs_new_local_eq:NN #1 { - \chk_if_free_cs:N #1 - \cs_set_eq:NN #1 -} -\cs_new_protected_nopar:Npn \cs_gnew_eq:cN { \exp_args:Nc \cs_gnew_eq:NN } -\cs_new_protected_nopar:Npn \cs_gnew_eq:Nc { \exp_args:NNc \cs_gnew_eq:NN } -\cs_new_protected_nopar:Npn \cs_gnew_eq:cc { \exp_args:Ncc \cs_gnew_eq:NN } \cs_set_eq:NN \cs_gnew_eq:NN \cs_new_eq:NN \cs_set_eq:NN \cs_gnew_eq:cN \cs_new_eq:cN \cs_set_eq:NN \cs_gnew_eq:Nc \cs_new_eq:Nc @@ -688,84 +666,6 @@ I~ can~ probably~ not~ help~ you~ here } } -\cs_set:Npn \cs_tmp:w #1#2#3{ - \cs_set_protected:cpx {cs_#1:#2}##1##2{ - \exp_not:N \cs_generate_from_arg_count:NNnn ##1 - \exp_after:wN \exp_not:N \cs:w cs_#1:#3 \cs_end: - {\exp_not:N\cs_get_arg_count_from_signature:N ##1}{##2} - } -} -\cs_tmp:w {set}{Nn}{Npn} -\cs_tmp:w {set}{Nx}{Npx} -\cs_tmp:w {set_nopar}{Nn}{Npn} -\cs_tmp:w {set_nopar}{Nx}{Npx} -\cs_tmp:w {set_protected}{Nn}{Npn} -\cs_tmp:w {set_protected}{Nx}{Npx} -\cs_tmp:w {set_protected_nopar}{Nn}{Npn} -\cs_tmp:w {set_protected_nopar}{Nx}{Npx} -\cs_tmp:w {gset}{Nn}{Npn} -\cs_tmp:w {gset}{Nx}{Npx} -\cs_tmp:w {gset_nopar}{Nn}{Npn} -\cs_tmp:w {gset_nopar}{Nx}{Npx} -\cs_tmp:w {gset_protected}{Nn}{Npn} -\cs_tmp:w {gset_protected}{Nx}{Npx} -\cs_tmp:w {gset_protected_nopar}{Nn}{Npn} -\cs_tmp:w {gset_protected_nopar}{Nx}{Npx} -\cs_tmp:w {new}{Nn}{Npn} -\cs_tmp:w {new}{Nx}{Npx} -\cs_tmp:w {new_nopar}{Nn}{Npn} -\cs_tmp:w {new_nopar}{Nx}{Npx} -\cs_tmp:w {new_protected}{Nn}{Npn} -\cs_tmp:w {new_protected}{Nx}{Npx} -\cs_tmp:w {new_protected_nopar}{Nn}{Npn} -\cs_tmp:w {new_protected_nopar}{Nx}{Npx} -\cs_tmp:w {new_local}{Nn}{Npn} -\cs_tmp:w {new_local}{Nx}{Npx} -\cs_tmp:w {new_local_nopar}{Nn}{Npn} -\cs_tmp:w {new_local_nopar}{Nx}{Npx} -\cs_tmp:w {new_local_protected}{Nn}{Npn} -\cs_tmp:w {new_local_protected}{Nx}{Npx} -\cs_tmp:w {new_local_protected_nopar}{Nn}{Npn} -\cs_tmp:w {new_local_protected_nopar}{Nx}{Npx} -\cs_set:Npn \cs_tmp:w #1#2#3{ - \cs_set_protected:cpx {cs_#1:#2}##1##2{ - \exp_not:N\cs_generate_from_arg_count:cNnn {##1} - \exp_after:wN \exp_not:N \cs:w cs_#1:#3 \cs_end: - {\exp_not:N\cs_get_arg_count_from_signature:c {##1}}{##2} - } -} -\cs_tmp:w {set}{cn}{Npn} -\cs_tmp:w {set}{cx}{Npx} -\cs_tmp:w {set_nopar}{cn}{Npn} -\cs_tmp:w {set_nopar}{cx}{Npx} -\cs_tmp:w {set_protected}{cn}{Npn} -\cs_tmp:w {set_protected}{cx}{Npx} -\cs_tmp:w {set_protected_nopar}{cn}{Npn} -\cs_tmp:w {set_protected_nopar}{cx}{Npx} -\cs_tmp:w {gset}{cn}{Npn} -\cs_tmp:w {gset}{cx}{Npx} -\cs_tmp:w {gset_nopar}{cn}{Npn} -\cs_tmp:w {gset_nopar}{cx}{Npx} -\cs_tmp:w {gset_protected}{cn}{Npn} -\cs_tmp:w {gset_protected}{cx}{Npx} -\cs_tmp:w {gset_protected_nopar}{cn}{Npn} -\cs_tmp:w {gset_protected_nopar}{cx}{Npx} -\cs_tmp:w {new}{cn}{Npn} -\cs_tmp:w {new}{cx}{Npx} -\cs_tmp:w {new_nopar}{cn}{Npn} -\cs_tmp:w {new_nopar}{cx}{Npx} -\cs_tmp:w {new_protected}{cn}{Npn} -\cs_tmp:w {new_protected}{cx}{Npx} -\cs_tmp:w {new_protected_nopar}{cn}{Npn} -\cs_tmp:w {new_protected_nopar}{cx}{Npx} -\cs_tmp:w {new_local}{cn}{Npn} -\cs_tmp:w {new_local}{cx}{Npx} -\cs_tmp:w {new_local_nopar}{cn}{Npn} -\cs_tmp:w {new_local_nopar}{cx}{Npx} -\cs_tmp:w {new_local_protected}{cn}{Npn} -\cs_tmp:w {new_local_protected}{cx}{Npx} -\cs_tmp:w {new_local_protected_nopar}{cn}{Npn} -\cs_tmp:w {new_local_protected_nopar}{cx}{Npx} \prg_set_conditional:Npnn \cs_if_eq:NN #1#2{p,TF,T,F}{ \if_meaning:w #1#2 \prg_return_true: \else: \prg_return_false: \fi: diff --git a/Master/texmf-dist/tex/latex/expl3/l3box.sty b/Master/texmf-dist/tex/latex/expl3/l3box.sty index f703cba4faf..69baad3296b 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3box.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3box.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3box.dtx 1902 2010-05-13 14:58:53Z mittelba $ +\GetIdInfo$Id: l3box.dtx 1919 2010-05-22 05:56:38Z will $ {L3 Experimental Box module} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -57,15 +57,7 @@ \chk_if_free_cs:N #1 \newbox #1 } -\cs_new_protected:Npn \box_new_local:N #1 { - \chk_if_free_cs:N #1 - \intexpr_compare:nNnTF - \etex_currentgrouplevel:D = 0 - \newbox \locbox - #1 -} \cs_generate_variant:Nn \box_new:N {c} -\cs_generate_variant:Nn \box_new_local:N {c} \cs_new_eq:NN \if_hbox:N \tex_ifhbox:D \cs_new_eq:NN \if_vbox:N \tex_ifvbox:D \cs_new_eq:NN \if_box_empty:N \tex_ifvoid:D @@ -90,10 +82,14 @@ \cs_generate_variant:Nn \box_if_empty:NTF {c} \cs_generate_variant:Nn \box_if_empty:NT {c} \cs_generate_variant:Nn \box_if_empty:NF {c} -\cs_new_protected_nopar:Npn \box_set_eq:NN #1#2 {\tex_setbox:D #1 \tex_box:D #2} +\cs_new_protected_nopar:Npn \box_set_eq:NN #1#2 {\tex_setbox:D #1 \tex_copy:D #2} \cs_generate_variant:Nn \box_set_eq:NN {cN,Nc,cc} +\cs_new_protected_nopar:Npn \box_set_eq_clear:NN #1#2 {\tex_setbox:D #1 \tex_box:D #2} +\cs_generate_variant:Nn \box_set_eq_clear:NN {cN,Nc,cc} \cs_new_protected_nopar:Npn \box_gset_eq:NN {\pref_global:D\box_set_eq:NN} \cs_generate_variant:Nn \box_gset_eq:NN {cN,Nc,cc} +\cs_new_protected_nopar:Npn \box_gset_eq_clear:NN {\pref_global:D\box_set_eq_clear:NN} +\cs_generate_variant:Nn \box_gset_eq_clear:NN {cN,Nc,cc} \cs_new_eq:NN \l_last_box \tex_lastbox:D \cs_new_protected_nopar:Npn \box_set_to_last:N #1{\tex_setbox:D#1\l_last_box} \cs_generate_variant:Nn \box_set_to_last:N {c} @@ -103,7 +99,7 @@ \cs_new:Npn \box_move_right:nn #1#2{\tex_moveright:D\dim_eval:n{#1} #2} \cs_new:Npn \box_move_up:nn #1#2{\tex_raise:D\dim_eval:n{#1} #2} \cs_new:Npn \box_move_down:nn #1#2{\tex_lower:D\dim_eval:n{#1} #2} -\cs_new_protected_nopar:Npn \box_clear:N #1{\box_set_eq:NN #1 \c_empty_box } +\cs_new_protected_nopar:Npn \box_clear:N #1{\box_set_eq_clear:NN #1 \c_empty_box } \cs_generate_variant:Nn \box_clear:N {c} \cs_new_protected_nopar:Npn \box_gclear:N {\pref_global:D\box_clear:N} \cs_generate_variant:Nn \box_gclear:N {c} diff --git a/Master/texmf-dist/tex/latex/expl3/l3int.sty b/Master/texmf-dist/tex/latex/expl3/l3int.sty index 61688872989..7ece9f20bc8 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3int.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3int.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3int.dtx 1893 2010-04-11 12:54:05Z will $ +\GetIdInfo$Id: l3int.dtx 1919 2010-05-22 05:56:38Z will $ {L3 Experimental Integer module} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -60,15 +60,7 @@ \chk_if_free_cs:N #1 \newcount #1 } -\cs_new_protected_nopar:Npn \int_new_local:N #1 { - \chk_if_free_cs:N #1 - \intexpr_compare:nNnTF - \etex_currentgrouplevel:D = 0 - \newcount \loccount - #1 -} \cs_generate_variant:Nn \int_new:N {c} -\cs_generate_variant:Nn \int_new_local:N {c} \cs_new_protected_nopar:Npn \int_set:Nn #1#2{#1 \intexpr_eval:w #2\intexpr_eval_end: } \cs_new_protected_nopar:Npn \int_gset:Nn { diff --git a/Master/texmf-dist/tex/latex/expl3/l3io.sty b/Master/texmf-dist/tex/latex/expl3/l3io.sty index 5b34cc4cf45..5999b5a476d 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3io.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3io.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3io.dtx 1890 2010-04-11 03:37:15Z will $ +\GetIdInfo$Id: l3io.dtx 1923 2010-05-22 12:45:49Z joseph $ {L3 Experimental i/o module} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -212,7 +212,7 @@ { \intexpr_compare:nF { #1 = \c_minus_one } { - \tex_closeout:D #1 + \tex_closein:D #1 \prop_gdel:NV \g_ior_streams_prop #1 \cs_gundefine:N #1 } diff --git a/Master/texmf-dist/tex/latex/expl3/l3num.sty b/Master/texmf-dist/tex/latex/expl3/l3num.sty index e75489bfc88..138dfef767f 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3num.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3num.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id$ +\GetIdInfo$Id: l3num.dtx 1914 2010-05-21 16:18:46Z schoepf $ {L3 Experimental token numbers} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} diff --git a/Master/texmf-dist/tex/latex/expl3/l3skip.sty b/Master/texmf-dist/tex/latex/expl3/l3skip.sty index edf9e627ada..a809531c62f 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3skip.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3skip.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3skip.dtx 1892 2010-04-11 08:59:45Z will $ +\GetIdInfo$Id: l3skip.dtx 1919 2010-05-22 05:56:38Z will $ {L3 Experimental skip registers} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -57,15 +57,7 @@ \chk_if_free_cs:N #1 \newskip #1 } -\cs_new_protected_nopar:Npn \skip_new_local:N #1 { - \chk_if_free_cs:N #1 - \intexpr_compare:nNnTF - \etex_currentgrouplevel:D = 0 - \newskip \locskip - #1 -} \cs_generate_variant:Nn \skip_new:N {c} -\cs_generate_variant:Nn \skip_new_local:N {c} \cs_new_protected_nopar:Npn \skip_set:Nn #1#2 { #1\skip_eval:n{#2} } @@ -142,15 +134,7 @@ \chk_if_free_cs:N #1 \newdimen #1 } -\cs_new_protected_nopar:Npn \dim_new_local:N #1 { - \chk_if_free_cs:N #1 - \intexpr_compare:nNnTF - \etex_currentgrouplevel:D = 0 - \newdimen \locdimen - #1 -} \cs_generate_variant:Nn \dim_new:N {c} -\cs_generate_variant:Nn \dim_new_local:N {c} \cs_new_protected_nopar:Npn \dim_set:Nn #1#2 { #1~ \dim_eval:n{#2} } \cs_generate_variant:Nn \dim_set:Nn {cn,Nc} \cs_new_protected_nopar:Npn \dim_gset:Nn { \pref_global:D \dim_set:Nn } @@ -203,13 +187,6 @@ \chk_if_free_cs:N #1 \newmuskip #1 } -\cs_new_protected_nopar:Npn \muskip_new_local:N #1 { - \chk_if_free_cs:N #1 - \intexpr_compare:nNnTF - \etex_currentgrouplevel:D = 0 - \newmuskip \locmuskip - #1 -} \cs_new_protected_nopar:Npn \muskip_set:Nn#1#2{#1\etex_muexpr:D#2\scan_stop:} \cs_new_protected_nopar:Npn \muskip_gset:Nn{\pref_global:D\muskip_set:Nn} \cs_new_protected_nopar:Npn \muskip_add:Nn#1#2{\tex_advance:D#1\etex_muexpr:D#2\scan_stop:} diff --git a/Master/texmf-dist/tex/latex/expl3/l3tl.sty b/Master/texmf-dist/tex/latex/expl3/l3tl.sty index 121cdb68c7f..c55f9dc82ab 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3tl.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3tl.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3tl.dtx 1905 2010-05-19 07:45:31Z joseph $ +\GetIdInfo$Id: l3tl.dtx 1919 2010-05-22 05:56:38Z will $ {L3 Experimental Token Lists} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -64,17 +64,6 @@ } \cs_new_protected_nopar:Npn \tl_new:N #1{\tl_new:Nn #1{}} \cs_new_protected_nopar:Npn \tl_new:c #1{\tl_new:cn {#1}{}} -\cs_new_protected:Npn \tl_new_local:Nn #1#2{ - \chk_if_free_cs:N #1 - \cs_set_nopar:Npn #1{#2} -} -\cs_generate_variant:Nn \tl_new_local:Nn {cn} -\cs_new_protected:Npn \tl_new_local:Nx #1#2{ - \chk_if_free_cs:N #1 - \cs_set_nopar:Npx #1{#2} -} -\cs_new_protected_nopar:Npn \tl_new_local:N #1{\tl_new_local:Nn #1{}} -\cs_new_protected_nopar:Npn \tl_new_local:c #1{\tl_new_local:cn {#1}{}} \cs_new_protected:Npn \tl_const:Nn #1#2 { \tl_new:N #1 \tl_gset:Nn #1 {#2} @@ -120,7 +109,6 @@ \cs_generate_variant:Nn \tl_gset:Nn { cV } \cs_generate_variant:Nn \tl_gset:Nn { cv } \cs_generate_variant:Nn \tl_gset:Nx { c } - \cs_new_eq:NN \tl_set_eq:NN \cs_set_eq:NN \cs_new_eq:NN \tl_gset_eq:NN \cs_gset_eq:NN \cs_generate_variant:Nn \tl_set_eq:NN {Nc,c,cc} diff --git a/Master/texmf-dist/tex/latex/expl3/l3toks.sty b/Master/texmf-dist/tex/latex/expl3/l3toks.sty index 534859a8c83..b8f1e17568c 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3toks.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3toks.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3toks.dtx 1892 2010-04-11 08:59:45Z will $ +\GetIdInfo$Id: l3toks.dtx 1919 2010-05-22 05:56:38Z will $ {L3 Experimental Token Registers} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -57,15 +57,7 @@ \chk_if_free_cs:N #1 \newtoks #1 } -\cs_new_protected_nopar:Npn \toks_new_local:N #1 { - \chk_if_free_cs:N #1 - \intexpr_compare:nNnTF - \etex_currentgrouplevel:D = 0 - \newtoks \loctoks - #1 -} \cs_generate_variant:Nn \toks_new:N {c} -\cs_generate_variant:Nn \toks_new_local:N {c} \cs_new_eq:NN \toks_use:N \tex_the:D \cs_generate_variant:Nn \toks_use:N {c} \cs_new_eq:NN \toks_set:Nn \prg_do_nothing: |