diff options
author | Karl Berry <karl@freefriends.org> | 2010-05-28 15:55:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-05-28 15:55:00 +0000 |
commit | 6af54f30722dad7cd24d2b2b73c6de524885b108 (patch) | |
tree | 14f0fa01a5b5164a86c02413de148544caea295e /Master/texmf-dist/tex/latex | |
parent | 7db7ee076f98cc2b3dca7228ae0e38ba4e88715a (diff) |
expl3 update (26may10)
git-svn-id: svn://tug.org/texlive/trunk@18561 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3int.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3keys.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3skip.sty | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3toks.sty | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3int.sty b/Master/texmf-dist/tex/latex/expl3/l3int.sty index 7ece9f20bc8..6909f182286 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 1919 2010-05-22 05:56:38Z will $ +\GetIdInfo$Id: l3int.dtx 1933 2010-05-25 00:26:38Z will $ {L3 Experimental Integer module} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} diff --git a/Master/texmf-dist/tex/latex/expl3/l3keys.sty b/Master/texmf-dist/tex/latex/expl3/l3keys.sty index 9b9fb06ee5c..c2ef0cf8954 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3keys.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3keys.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3keys.dtx 1894 2010-04-13 07:37:59Z joseph $ +\GetIdInfo$Id: l3keys.dtx 1931 2010-05-24 21:06:50Z joseph $ {L3 Experimental key-value support} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -86,7 +86,7 @@ \tl_set:cx { \c_keys_root_tl \l_keys_path_tl .choice_code_tl } {#1} } \cs_new_protected_nopar:Npn \keys_choice_find:n #1 { - \keys_execute_aux:nn { \l_keys_path_tl / #1 } { + \keys_execute_aux:nn { \l_keys_path_tl / \tl_to_str:n {#1} } { \keys_execute_aux:nn { \l_keys_path_tl / unknown } { } } } diff --git a/Master/texmf-dist/tex/latex/expl3/l3skip.sty b/Master/texmf-dist/tex/latex/expl3/l3skip.sty index a809531c62f..86bf7cf1d43 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 1919 2010-05-22 05:56:38Z will $ +\GetIdInfo$Id: l3skip.dtx 1933 2010-05-25 00:26:38Z will $ {L3 Experimental skip registers} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -100,8 +100,8 @@ \cs_new_nopar:Npn \skip_vertical:n #1 { \skip_vertical:N \skip_eval:n{#1} } \cs_new_eq:NN \skip_use:N \tex_the:D \cs_generate_variant:Nn \skip_use:N {c} -\cs_new_eq:NN \skip_show:N \tex_showthe:D -\cs_new_nopar:Npn \skip_show:c #1 { \skip_show:N \cs:w #1 \cs_end: } +\cs_new_eq:NN \skip_show:N \kernel_register_show:N +\cs_generate_variant:Nn \skip_show:N {c} \cs_new_protected_nopar:Npn \skip_eval:n #1 { \etex_glueexpr:D #1 \scan_stop: } %%\chk_if_free_cs:N \l_tmpa_skip %%\tex_skipdef:D\l_tmpa_skip 255 %currently taken up by \skip@ @@ -155,8 +155,8 @@ \cs_generate_variant:Nn \dim_gsub:Nn {cn} \cs_new_eq:NN \dim_use:N \tex_the:D \cs_generate_variant:Nn \dim_use:N {c} -\cs_new_eq:NN \dim_show:N \tex_showthe:D -\cs_new_nopar:Npn \dim_show:c #1 { \dim_show:N \cs:w #1 \cs_end: } +\cs_new_eq:NN \dim_show:N \kernel_register_show:N +\cs_generate_variant:Nn \dim_show:N {c} \dim_new:N \l_tmpa_dim \dim_new:N \l_tmpb_dim \dim_new:N \l_tmpc_dim @@ -194,6 +194,7 @@ \cs_new_protected_nopar:Npn \muskip_sub:Nn#1#2{\tex_advance:D#1-\etex_muexpr:D#2\scan_stop:} \cs_new_protected_nopar:Npn \muskip_gsub:Nn{\pref_global:D\muskip_sub:Nn} \cs_new_eq:NN \muskip_use:N \tex_the:D +\cs_new_eq:NN \muskip_show:N \kernel_register_show:N %% %% %% End of file `l3skip.sty'. diff --git a/Master/texmf-dist/tex/latex/expl3/l3toks.sty b/Master/texmf-dist/tex/latex/expl3/l3toks.sty index b8f1e17568c..ce2a909f3db 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 1919 2010-05-22 05:56:38Z will $ +\GetIdInfo$Id: l3toks.dtx 1933 2010-05-25 00:26:38Z will $ {L3 Experimental Token Registers} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -96,7 +96,7 @@ } \cs_generate_variant:Nn \toks_use_clear:N {c} \cs_generate_variant:Nn \toks_use_gclear:N {c} -\cs_new_eq:NN \toks_show:N \tex_showthe:D +\cs_new_eq:NN \toks_show:N \kernel_register_show:N \cs_generate_variant:Nn \toks_show:N {c} \cs_new_protected_nopar:Npn \toks_put_left:Nn #1 { \exp_after:wN \toks_put_left_aux:w \exp_after:wN \q_mark |