diff options
author | Karl Berry <karl@freefriends.org> | 2011-12-29 23:03:42 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-12-29 23:03:42 +0000 |
commit | 7a50f35d6fd3bd705c78298b1ccc085991638f87 (patch) | |
tree | 7f749391d34aa12a37a30a33c00b3098b2320e7c /Master/texmf-dist/tex | |
parent | 0bc9393ae50667d7ff769a76321a9548a70351fc (diff) |
l3kernel 3109 (29dec11)
git-svn-id: svn://tug.org/texlive/trunk@24971 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
20 files changed, 695 insertions, 608 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index b54a9d1255f..906b5d1fc9f 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -48,8 +48,8 @@ \RequirePackage{l3names} \def\ExplFileName{expl3} \def\ExplFileDescription{L3 Experimental code bundle wrapper} -\def\ExplFileDate{2011/12/07} -\def\ExplFileVersion{3036} +\def\ExplFileDate{2011/12/29} +\def\ExplFileVersion{3109} \RequirePackage{etex} \reserveinserts{32} \RequirePackage{calc} @@ -163,9 +163,9 @@ } } { - \cs_set_protected_nopar:Npn \box_rotate:Nn #1#2 + \cs_set_protected:Npn \box_rotate:Nn #1#2 { \hbox_set:Nn #1 { \rotatebox {#2} { \box_use:N #1 } } } - \cs_set_protected_nopar:Npn \box_resize:Nnn #1#2#3 + \cs_set_protected:Npn \box_resize:Nnn #1#2#3 { \hbox_set:Nn #1 { @@ -175,7 +175,7 @@ { \box_use:N #1 } } } - \cs_set_protected_nopar:Npn \box_resize_to_ht_plus_dp:Nn #1#2 + \cs_set_protected:Npn \box_resize_to_ht_plus_dp:Nn #1#2 { \hbox_set:Nn #1 { @@ -183,7 +183,7 @@ { \box_use:N #1 } } } - \cs_set_protected_nopar:Npn \box_resize_to_wd:Nn #1#2 + \cs_set_protected:Npn \box_resize_to_wd:Nn #1#2 { \hbox_set:Nn #1 { @@ -191,7 +191,7 @@ { \box_use:N #1 } } } - \cs_set_protected_nopar:Npn \box_scale:Nnn #1#2#3 + \cs_set_protected:Npn \box_scale:Nnn #1#2#3 { \hbox_set:Nn #1 { \scalebox {#2} [#3] { \box_use:N #1 } } } } \cs_set_protected_nopar:Npn \ExplSyntaxOn diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty index c9e56e990e1..6faa1110ad1 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3basics.dtx 3023 2011-12-04 07:25:04Z bruno $ +\GetIdInfo$Id: l3basics.dtx 3090 2011-12-23 03:12:53Z bruno $ {L3 Experimental basic definitions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -86,10 +86,30 @@ \tex_let:D \tex_long:D \tex_long:D \tex_let:D \tex_protected:D \etex_protected:D \tex_long:D \tex_def:D \exp_args:Nc #1#2 { \exp_after:wN #1 \cs:w #2 \cs_end: } -%% A small number of variants by hand. -\tex_def:D \cs_meaning:c { \exp_args:Nc \cs_meaning:N } \tex_def:D \token_to_str:c { \exp_args:Nc \token_to_str:N } -\tex_def:D \cs_show:c { \exp_args:Nc \cs_show:N } +\tex_long:D \tex_def:D \cs_meaning:c #1 + { + \if_cs_exist:w #1 \cs_end: + \exp_after:wN \use_i:nn + \else: + \exp_after:wN \use_ii:nn + \fi: + { \exp_args:Nc \cs_meaning:N {#1} } + { \tl_to_str:n {undefined} } + } +\tex_protected:D \tex_def:D \cs_show:c + { \group_begin: \exp_args:NNc \group_end: \cs_show:N } +\tex_let:D \c_minus_one \m@ne +\tex_chardef:D \c_sixteen = 16~ +\tex_chardef:D \c_zero = 0~ +\tex_chardef:D \c_six = 6~ +\tex_chardef:D \c_seven = 7~ +\tex_chardef:D \c_twelve = 12~ +\etex_ifdefined:D \luatex_luatexversion:D + \tex_chardef:D \c_max_register_int = 65 535 ~ +\tex_else:D + \tex_mathchardef:D \c_max_register_int = 32 767 ~ +\tex_fi:D \tex_let:D \cs_set_nopar:Npn \tex_def:D \tex_let:D \cs_set_nopar:Npx \tex_edef:D \tex_protected:D \cs_set_nopar:Npn \cs_set:Npn @@ -327,13 +347,13 @@ \tex_chardef:D \c_false_bool = 0~ \cs_set_nopar:Npn \cs_to_str:N { - \if:w \int_to_roman:w - `0 \token_to_str:N \ % - \cs_to_str_aux:w - \fi: - \exp_after:wN \use_none:n \token_to_str:N - } -\cs_set_nopar:Npn \cs_to_str_aux:w #1 \use_none:n - { ~ \int_to_roman:w - `0 \fi: } + \int_to_roman:w + \if:w \token_to_str:N \ \cs_to_str_aux:w \fi: + \exp_after:wN \cs_to_str_aux:N \token_to_str:N + } +\cs_set:Npn \cs_to_str_aux:N #1 { \c_zero } +\cs_set:Npn \cs_to_str_aux:w #1 \cs_to_str_aux:N + { - \int_value:w \fi: \exp_after:wN \c_zero } \group_begin: \tex_lccode:D `\@ = `\: \scan_stop: \tex_catcode:D `\@ = 12~ @@ -342,8 +362,9 @@ \group_end: \cs_set:Npn \cs_split_function:NN #1#2 { + \exp_after:wN \exp_after:wN \exp_after:wN \cs_split_function_aux:w - \int_to_roman:w - `\q \cs_to_str:N #1 @ a \q_stop #2 + \cs_to_str:N #1 @ a \q_stop #2 } \cs_set:Npn \cs_split_function_aux:w #1 @ #2#3 \q_stop #4 { @@ -434,18 +455,11 @@ { \cs_if_exist:cTF {#1} { \use:c {#1} #2 } { } } \cs_set:Npn \cs_if_exist_use:c #1 { \cs_if_exist:cTF {#1} { \use:c {#1} } { } } -\tex_let:D \c_minus_one \m@ne -\tex_chardef:D \c_sixteen = 16~ -\tex_chardef:D \c_zero = 0~ -\tex_chardef:D \c_six = 6~ -\tex_chardef:D \c_seven = 7~ -\tex_chardef:D \c_twelve = 12~ -\tex_mathchardef:D \c_max_register_int = 32 767 \scan_stop: \cs_set_protected_nopar:Npn \iow_log:x { \tex_immediate:D \tex_write:D \c_minus_one } \cs_set_protected_nopar:Npn \iow_term:x { \tex_immediate:D \tex_write:D \c_sixteen } -\cs_set_protected_nopar:Npn \msg_kernel_error:nnxx #1#2#3#4 +\cs_set_protected:Npn \msg_kernel_error:nnxx #1#2#3#4 { \tex_errmessage:D { @@ -457,13 +471,13 @@ } \tex_end:D } -\cs_set_protected_nopar:Npn \msg_kernel_error:nnx #1#2#3 +\cs_set_protected:Npn \msg_kernel_error:nnx #1#2#3 { \msg_kernel_error:nnxx {#1} {#2} {#3} { } } -\cs_set_protected_nopar:Npn \msg_kernel_error:nn #1#2 +\cs_set_protected:Npn \msg_kernel_error:nn #1#2 { \msg_kernel_error:nnxx {#1} {#2} { } { } } \cs_set_nopar:Npn \msg_line_context: { on~line~\tex_the:D \tex_inputlineno:D } -\cs_set_protected_nopar:Npn \chk_if_free_cs:N #1 +\cs_set_protected:Npn \chk_if_free_cs:N #1 { \cs_if_free:NF #1 { @@ -472,7 +486,7 @@ } } \tex_ifodd:D \l@expl@log@functions@bool - \cs_set_protected_nopar:Npn \chk_if_free_cs:N #1 + \cs_set_protected:Npn \chk_if_free_cs:N #1 { \cs_if_free:NF #1 { @@ -484,7 +498,7 @@ \fi: \cs_set_protected_nopar:Npn \chk_if_free_cs:c { \exp_args:Nc \chk_if_free_cs:N } -\cs_set_protected_nopar:Npn \chk_if_exist_cs:N #1 +\cs_set_protected:Npn \chk_if_exist_cs:N #1 { \cs_if_exist:NF #1 { @@ -496,7 +510,7 @@ { \exp_args:Nc \chk_if_exist_cs:N } \cs_set:Npn \cs_tmp:w #1#2 { - \cs_set_protected_nopar:Npn #1 ##1 + \cs_set_protected:Npn #1 ##1 { \chk_if_free_cs:N ##1 #2 ##1 @@ -552,9 +566,9 @@ \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_nopar:Npn \cs_undefine:N #1 +\cs_new_protected:Npn \cs_undefine:N #1 { \cs_gset_eq:NN #1 \c_undefined:D } -\cs_new_protected_nopar:Npn \cs_undefine:c #1 +\cs_new_protected:Npn \cs_undefine:c #1 { \if_cs_exist:w #1 \cs_end: \exp_after:wN \use:n @@ -601,7 +615,7 @@ {#2#1} {#4} } -\cs_new_protected_nopar:Npn +\cs_new_protected:Npn \cs_generate_from_arg_count_aux:nwn #1 #2 \fi: #3 { \fi: #3 #1 } \cs_new_nopar:Npn \cs_generate_from_arg_count:cNnn @@ -693,7 +707,7 @@ \cs_new_nopar:Npn \cs_if_eq:ccTF { \exp_args:Ncc \cs_if_eq:NNTF } \cs_new_nopar:Npn \cs_if_eq:ccT { \exp_args:Ncc \cs_if_eq:NNT } \cs_new_nopar:Npn \cs_if_eq:ccF { \exp_args:Ncc \cs_if_eq:NNF } -\cs_new_nopar:Npn \kernel_register_show:N #1 +\cs_new:Npn \kernel_register_show:N #1 { \cs_if_exist:NTF #1 { \tex_showthe:D #1 } @@ -702,7 +716,8 @@ { \token_to_str:N #1 } } } -\cs_new_nopar:Npn \kernel_register_show:c { \exp_args:Nc \int_show:N } +\cs_new_nopar:Npn \kernel_register_show:c + { \exp_args:Nc \kernel_register_show:N } \cs_new_eq:NN \luatex_if_engine:T \use_none:n \cs_new_eq:NN \luatex_if_engine:F \use:n \cs_new_eq:NN \luatex_if_engine:TF \use_ii:nn diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty index acf0671deb3..14f032e0ea5 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3box.dtx 3029 2011-12-06 22:47:30Z joseph $ +\GetIdInfo$Id: l3box.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental boxes} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -205,35 +205,41 @@ \cs_new_eq:NN \hbox_unpack_clear:N \tex_unhbox:D \cs_generate_variant:Nn \hbox_unpack:N { c } \cs_generate_variant:Nn \hbox_unpack_clear:N { c } -\cs_new_protected:Npn \vbox:n { \tex_vbox:D \scan_stop: } -\cs_new_protected:Npn \vbox_top:n { \tex_vtop:D \scan_stop: } +\cs_new_protected:Npn \vbox:n #1 { \tex_vbox:D { #1 \par } } +\cs_new_protected:Npn \vbox_top:n #1 { \tex_vtop:D { #1 \par } } \cs_new_protected:Npn \vbox_to_ht:nn #1#2 - { \tex_vbox:D to \dim_eval:w #1 \dim_eval_end: {#2} } -\cs_new_protected:Npn \vbox_to_zero:n #1 { \tex_vbox:D to \c_zero_dim {#1} } -\cs_new_protected:Npn \vbox_set:Nn #1#2 { \tex_setbox:D #1 \tex_vbox:D {#2} } + { \tex_vbox:D to \dim_eval:w #1 \dim_eval_end: { #2 \par } } +\cs_new_protected:Npn \vbox_to_zero:n #1 + { \tex_vbox:D to \c_zero_dim { #1 \par } } +\cs_new_protected:Npn \vbox_set:Nn #1#2 + { \tex_setbox:D #1 \tex_vbox:D { #2 \par } } \cs_new_protected:Npn \vbox_gset:Nn { \tex_global:D \vbox_set:Nn } \cs_generate_variant:Nn \vbox_set:Nn { c } \cs_generate_variant:Nn \vbox_gset:Nn { c } \cs_new_protected:Npn \vbox_set_top:Nn #1#2 - { \tex_setbox:D #1 \tex_vtop:D {#2} } + { \tex_setbox:D #1 \tex_vtop:D { #2 \par } } \cs_new_protected:Npn \vbox_gset_top:Nn { \tex_global:D \vbox_set_top:Nn } \cs_generate_variant:Nn \vbox_set_top:Nn { c } \cs_generate_variant:Nn \vbox_gset_top:Nn { c } \cs_new_protected:Npn \vbox_set_to_ht:Nnn #1#2#3 - { \tex_setbox:D #1 \tex_vbox:D to \dim_eval:w #2 \dim_eval_end: {#3} } + { \tex_setbox:D #1 \tex_vbox:D to \dim_eval:w #2 \dim_eval_end: { #3 \par } } \cs_new_protected:Npn \vbox_gset_to_ht:Nnn { \tex_global:D \vbox_set_to_ht:Nnn } \cs_generate_variant:Nn \vbox_set_to_ht:Nnn { c } \cs_generate_variant:Nn \vbox_gset_to_ht:Nnn { c } -\cs_new:Npn \vbox_set:Nw #1 +\cs_new_protected:Npn \vbox_set:Nw #1 { \tex_setbox:D #1 \tex_vbox:D \c_group_begin_token } \cs_new_protected:Npn \vbox_gset:Nw { \tex_global:D \vbox_set:Nw } \cs_generate_variant:Nn \vbox_set:Nw { c } \cs_generate_variant:Nn \vbox_gset:Nw { c } -\cs_new_eq:NN \vbox_set_end: \c_group_end_token -\cs_new_eq:NN \vbox_gset_end: \c_group_end_token +\cs_new_protected:Npn \vbox_set_end: + { + \par + \c_group_end_token + } +\cs_new_eq:NN \vbox_gset_end: \vbox_set_end: \cs_new_eq:NN \vbox_set_inline_begin:N \vbox_set:Nw \cs_new_eq:NN \vbox_set_inline_begin:c \vbox_set:cw \cs_new_eq:NN \vbox_set_inline_end: \vbox_set_end: diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty index 3dd557d6b8a..611599be6bd 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty @@ -47,7 +47,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3clist.dtx 3029 2011-12-06 22:47:30Z joseph $ +\GetIdInfo$Id: l3clist.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental comma separated lists} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -76,7 +76,7 @@ { \clist_concat_aux:NNNN \tl_set:Nx } \cs_new_protected_nopar:Npn \clist_gconcat:NNN { \clist_concat_aux:NNNN \tl_gset:Nx } -\cs_new_protected_nopar:Npn \clist_concat_aux:NNNN #1#2#3#4 +\cs_new_protected:Npn \clist_concat_aux:NNNN #1#2#3#4 { #1 #2 { @@ -147,7 +147,7 @@ \cs_generate_variant:Nn \clist_put_left:Nn { c , cV , co , cx } \cs_generate_variant:Nn \clist_gput_left:Nn { NV , No , Nx } \cs_generate_variant:Nn \clist_gput_left:Nn { c , cV , co , cx } -\cs_new_protected:Npn \clist_put_right:Nn +\cs_new_protected_nopar:Npn \clist_put_right:Nn { \clist_put_right_aux:NNNn \clist_concat:NNN \clist_set:Nn } \cs_new_protected_nopar:Npn \clist_gput_right:Nn { \clist_put_right_aux:NNNn \clist_gconcat:NNN \clist_gset:Nn } @@ -160,7 +160,7 @@ \cs_generate_variant:Nn \clist_put_right:Nn { c , cV , co , cx } \cs_generate_variant:Nn \clist_gput_right:Nn { NV , No , Nx } \cs_generate_variant:Nn \clist_gput_right:Nn { c , cV , co , cx } -\cs_new_protected_nopar:Npn \clist_get:NN #1#2 +\cs_new_protected:Npn \clist_get:NN #1#2 { \exp_after:wN \clist_get_aux:wN #1 , \q_stop #2 } \cs_new_protected:Npn \clist_get_aux:wN #1 , #2 \q_stop #3 { \tl_set:Nn #3 {#1} } @@ -169,7 +169,7 @@ { \clist_pop_aux:NNN \tl_set:Nf } \cs_new_protected_nopar:Npn \clist_gpop:NN { \clist_pop_aux:NNN \tl_gset:Nf } -\cs_new_protected_nopar:Npn \clist_pop_aux:NNN #1#2#3 +\cs_new_protected:Npn \clist_pop_aux:NNN #1#2#3 { \exp_after:wN \clist_pop_aux:wNNN #2 , \q_nil \q_stop #1#2#3 } @@ -281,7 +281,7 @@ \cs_generate_variant:Nn \clist_if_in:nnT { nV , no } \cs_generate_variant:Nn \clist_if_in:nnF { nV , no } \cs_generate_variant:Nn \clist_if_in:nnTF { nV , no } -\cs_new_nopar:Npn \clist_map_function:NN #1#2 +\cs_new:Npn \clist_map_function:NN #1#2 { \clist_if_empty:NF #1 { @@ -355,7 +355,7 @@ \cs_generate_variant:Nn \clist_map_variable:NNn { c } \cs_new_eq:NN \clist_map_break: \prg_map_break: \cs_new_eq:NN \clist_map_break:n \prg_map_break:n -\cs_new_protected_nopar:Npn \clist_show:N #1 +\cs_new_protected:Npn \clist_show:N #1 { \msg_aux_show:Nnx #1 @@ -488,6 +488,20 @@ \cs_new_protected:Npn \clist_const:Nn #1#2 { \tl_const:Nx #1 { \clist_trim_spaces:n {#2} } } \cs_generate_variant:Nn \clist_const:Nn { c , Nx , cx } +\prg_new_conditional:Npnn \clist_if_empty:n #1 { p , T , F , TF } + { + \clist_if_empty_n_aux:w ? #1 + , \q_mark \prg_return_false: + , \q_mark \prg_return_true: + \q_stop + } +\cs_new:Npn \clist_if_empty_n_aux:w #1 , + { + \tl_if_empty:oTF { \use_none:nn #1 ? } + { \clist_if_empty_n_aux:w ? } + { \clist_if_empty_n_aux:wNw } + } +\cs_new:Npn \clist_if_empty_n_aux:wNw #1 \q_mark #2#3 \q_stop {#2} \cs_new_protected:Npn \clist_trim_spaces:N #1 { \clist_set:No #1 {#1} } \cs_new_protected:Npn \clist_gtrim_spaces:N #1 { \clist_gset:No #1 {#1} } \cs_generate_variant:Nn \clist_trim_spaces:N { c } diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty index 01a360b3861..5edde5b4de8 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty @@ -47,7 +47,7 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{l3names} -\GetIdInfo$Id: l3coffins.dtx 2963 2011-11-15 22:06:41Z joseph $ +\GetIdInfo$Id: l3coffins.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental coffin code layer} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -117,7 +117,7 @@ { \token_to_str:N #1 } } } -\cs_new_protected_nopar:Npn \coffin_clear:N #1 +\cs_new_protected:Npn \coffin_clear:N #1 { \coffin_if_exist:NT #1 { @@ -126,7 +126,7 @@ } } \cs_generate_variant:Nn \coffin_clear:N { c } -\cs_new_protected_nopar:Npn \coffin_new:N #1 +\cs_new_protected:Npn \coffin_new:N #1 { \box_new:N #1 \prop_clear_new:c { l_coffin_corners_ \int_value:w #1 _prop } @@ -181,7 +181,7 @@ } } \cs_generate_variant:Nn \vcoffin_set:Nnn { c } -\cs_new_protected_nopar:Npn \hcoffin_set:Nw #1 +\cs_new_protected:Npn \hcoffin_set:Nw #1 { \coffin_if_exist:NT #1 { @@ -198,7 +198,7 @@ } \cs_new_protected_nopar:Npn \hcoffin_set_end: { } \cs_generate_variant:Nn \hcoffin_set:Nw { c } -\cs_new_protected_nopar:Npn \vcoffin_set:Nnw #1#2 +\cs_new_protected:Npn \vcoffin_set:Nnw #1#2 { \coffin_if_exist:NT #1 { @@ -228,7 +228,7 @@ } \cs_new_protected_nopar:Npn \vcoffin_set_end: { } \cs_generate_variant:Nn \vcoffin_set:Nnw { c } -\cs_new_protected_nopar:Npn \coffin_set_eq:NN #1#2 +\cs_new_protected:Npn \coffin_set_eq:NN #1#2 { \coffin_if_exist:NT #1 { @@ -247,7 +247,7 @@ \cs_new_eq:NN \coffin_ht:c \box_ht:c \cs_new_eq:NN \coffin_wd:N \box_wd:N \cs_new_eq:NN \coffin_wd:c \box_wd:c -\cs_new_protected_nopar:Npn \coffin_get_pole:NnN #1#2#3 +\cs_new_protected:Npn \coffin_get_pole:NnN #1#2#3 { \prop_get:cnNF { l_coffin_poles_ \int_value:w #1 _prop } {#2} #3 @@ -257,28 +257,28 @@ \tl_set:Nn #3 { { 0 pt } { 0 pt } { 0 pt } { 0 pt } } } } -\cs_new_protected_nopar:Npn \coffin_reset_structure:N #1 +\cs_new_protected:Npn \coffin_reset_structure:N #1 { \prop_set_eq:cN { l_coffin_corners_ \int_value:w #1 _prop } \c_coffin_corners_prop \prop_set_eq:cN { l_coffin_poles_ \int_value:w #1 _prop } \c_coffin_poles_prop } -\cs_new_protected_nopar:Npn \coffin_set_eq_structure:NN #1#2 +\cs_new_protected:Npn \coffin_set_eq_structure:NN #1#2 { \prop_set_eq:cc { l_coffin_corners_ \int_value:w #1 _prop } { l_coffin_corners_ \int_value:w #2 _prop } \prop_set_eq:cc { l_coffin_poles_ \int_value:w #1 _prop } { l_coffin_poles_ \int_value:w #2 _prop } } -\cs_new_protected_nopar:Npn \coffin_gset_eq_structure:NN #1#2 +\cs_new_protected:Npn \coffin_gset_eq_structure:NN #1#2 { \prop_gset_eq:cc { l_coffin_corners_ \int_value:w #1 _prop } { l_coffin_corners_ \int_value:w #2 _prop } \prop_gset_eq:cc { l_coffin_poles_ \int_value:w #1 _prop } { l_coffin_poles_ \int_value:w #2 _prop } } -\cs_new_protected_nopar:Npn \coffin_set_user_dimensions:N #1 +\cs_new_protected:Npn \coffin_set_user_dimensions:N #1 { \cs_set_eq:NN \coffin_saved_Height: \Height \cs_set_eq:NN \coffin_saved_Depth: \Depth @@ -300,7 +300,7 @@ \cs_set_eq:NN \TotalHeight \coffin_saved_TotalHeight: \cs_set_eq:NN \Width \coffin_saved_Width: } -\cs_new_protected_nopar:Npn \coffin_set_horizontal_pole:Nnn #1#2#3 +\cs_new_protected:Npn \coffin_set_horizontal_pole:Nnn #1#2#3 { \coffin_if_exist:NT #1 { @@ -313,7 +313,7 @@ \coffin_end_user_dimensions: } } -\cs_new_protected_nopar:Npn \coffin_set_vertical_pole:Nnn #1#2#3 +\cs_new_protected:Npn \coffin_set_vertical_pole:Nnn #1#2#3 { \coffin_if_exist:NT #1 { @@ -326,12 +326,12 @@ \coffin_end_user_dimensions: } } -\cs_new_protected_nopar:Npn \coffin_set_pole:Nnn #1#2#3 +\cs_new_protected:Npn \coffin_set_pole:Nnn #1#2#3 { \prop_put:cnn { l_coffin_poles_ \int_value:w #1 _prop } {#2} {#3} } \cs_generate_variant:Nn \coffin_set_horizontal_pole:Nnn { c } \cs_generate_variant:Nn \coffin_set_vertical_pole:Nnn { c } \cs_generate_variant:Nn \coffin_set_pole:Nnn { Nnx } -\cs_new_protected_nopar:Npn \coffin_update_corners:N #1 +\cs_new_protected:Npn \coffin_update_corners:N #1 { \prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } { tl } { { 0 pt } { \dim_use:N \box_ht:N #1 } } @@ -342,7 +342,7 @@ \prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } { br } { { \dim_use:N \box_wd:N #1 } { \dim_eval:n { - \box_dp:N #1 } } } } -\cs_new_protected_nopar:Npn \coffin_update_poles:N #1 +\cs_new_protected:Npn \coffin_update_poles:N #1 { \prop_put:cnx { l_coffin_poles_ \int_value:w #1 _prop } { hc } { @@ -376,7 +376,7 @@ { 0 pt } } } -\cs_new_protected_nopar:Npn \coffin_calculate_intersection:Nnn #1#2#3 +\cs_new_protected:Npn \coffin_calculate_intersection:Nnn #1#2#3 { \coffin_get_pole:NnN #1 {#2} \l_coffin_pole_a_tl \coffin_get_pole:NnN #1 {#3} \l_coffin_pole_b_tl @@ -391,7 +391,7 @@ \dim_zero:N \l_coffin_y_dim } } -\cs_new_protected_nopar:Npn \coffin_calculate_intersection:nnnnnnnn +\cs_new_protected:Npn \coffin_calculate_intersection:nnnnnnnn #1#2#3#4#5#6#7#8 { \dim_compare:nNnTF {#3} = { \c_zero_dim } @@ -477,7 +477,7 @@ } } } -\cs_new_protected_nopar:Npn \coffin_calculate_intersection_aux:nnnnnN +\cs_new_protected:Npn \coffin_calculate_intersection_aux:nnnnnN #1#2#3#4#5#6 { \fp_set_from_dim:Nn \l_coffin_calc_result_fp {#1} @@ -491,7 +491,7 @@ \fp_add:Nn \l_coffin_calc_result_fp { \l_coffin_calc_b_fp } \dim_set:Nn #6 { \fp_to_dim:N \l_coffin_calc_result_fp } } -\cs_new_protected_nopar:Npn \coffin_join:NnnNnnnn #1#2#3#4#5#6#7#8 +\cs_new_protected:Npn \coffin_join:NnnNnnnn #1#2#3#4#5#6#7#8 { \coffin_align:NnnNnnnnN #1 {#2} {#3} #4 {#5} {#6} {#7} {#8} \l_coffin_aligned_coffin @@ -528,7 +528,7 @@ \coffin_set_eq:NN #1 \l_coffin_aligned_coffin } \cs_generate_variant:Nn \coffin_join:NnnNnnnn { c , Nnnc , cnnc } -\cs_new_protected_nopar:Npn \coffin_attach:NnnNnnnn #1#2#3#4#5#6#7#8 +\cs_new_protected:Npn \coffin_attach:NnnNnnnn #1#2#3#4#5#6#7#8 { \coffin_align:NnnNnnnnN #1 {#2} {#3} #4 {#5} {#6} {#7} {#8} \l_coffin_aligned_coffin @@ -546,7 +546,7 @@ \coffin_update_vertical_poles:NNN #1 #4 \l_coffin_aligned_coffin \coffin_set_eq:NN #1 \l_coffin_aligned_coffin } -\cs_new_protected_nopar:Npn \coffin_attach_mark:NnnNnnnn #1#2#3#4#5#6#7#8 +\cs_new_protected:Npn \coffin_attach_mark:NnnNnnnn #1#2#3#4#5#6#7#8 { \coffin_align:NnnNnnnnN #1 {#2} {#3} #4 {#5} {#6} {#7} {#8} \l_coffin_aligned_coffin @@ -556,7 +556,7 @@ \box_set_eq:NN #1 \l_coffin_aligned_coffin } \cs_generate_variant:Nn \coffin_attach:NnnNnnnn { c , Nnnc , cnnc } -\cs_new_protected_nopar:Npn \coffin_align:NnnNnnnnN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \coffin_align:NnnNnnnnN #1#2#3#4#5#6#7#8#9 { \coffin_calculate_intersection:Nnn #4 {#5} {#6} \dim_set:Nn \l_coffin_x_prime_dim { \l_coffin_x_dim } @@ -575,12 +575,12 @@ } \coffin_set_eq:NN #9 \l_coffin_aligned_internal_coffin } -\cs_new_protected_nopar:Npn \coffin_offset_poles:Nnn #1#2#3 +\cs_new_protected:Npn \coffin_offset_poles:Nnn #1#2#3 { \prop_map_inline:cn { l_coffin_poles_ \int_value:w #1 _prop } { \coffin_offset_pole:Nnnnnnn #1 {##1} ##2 {#2} {#3} } } -\cs_new_protected_nopar:Npn \coffin_offset_pole:Nnnnnnn #1#2#3#4#5#6#7#8 +\cs_new_protected:Npn \coffin_offset_pole:Nnnnnnn #1#2#3#4#5#6#7#8 { \dim_set:Nn \l_coffin_x_dim { #3 + #7 } \dim_set:Nn \l_coffin_y_dim { #4 + #8 } @@ -594,12 +594,12 @@ {#5} {#6} } } -\cs_new_protected_nopar:Npn \coffin_offset_corners:Nnn #1#2#3 +\cs_new_protected:Npn \coffin_offset_corners:Nnn #1#2#3 { \prop_map_inline:cn { l_coffin_corners_ \int_value:w #1 _prop } { \coffin_offset_corner:Nnnnn #1 {##1} ##2 {#2} {#3} } } -\cs_new_protected_nopar:Npn \coffin_offset_corner:Nnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \coffin_offset_corner:Nnnnn #1#2#3#4#5#6 { \prop_put:cnx { l_coffin_corners_ \int_value:w \l_coffin_aligned_coffin _prop } @@ -609,7 +609,7 @@ { \dim_eval:n { #4 + #6 } } } } -\cs_new_protected_nopar:Npn \coffin_update_vertical_poles:NNN #1#2#3 +\cs_new_protected:Npn \coffin_update_vertical_poles:NNN #1#2#3 { \coffin_get_pole:NnN #3 { #1 -T } \l_coffin_pole_a_tl \coffin_get_pole:NnN #3 { #2 -T } \l_coffin_pole_b_tl @@ -620,7 +620,7 @@ \exp_last_two_unbraced:Noo \coffin_update_B:nnnnnnnnN \l_coffin_pole_a_tl \l_coffin_pole_b_tl #3 } -\cs_new_protected_nopar:Npn \coffin_update_T:nnnnnnnnN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \coffin_update_T:nnnnnnnnN #1#2#3#4#5#6#7#8#9 { \dim_compare:nNnTF {#2} < {#6} { @@ -632,7 +632,7 @@ { { 0 pt } {#2} { 1000 pt } { 0 pt } } } } -\cs_new_protected_nopar:Npn \coffin_update_B:nnnnnnnnN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \coffin_update_B:nnnnnnnnN #1#2#3#4#5#6#7#8#9 { \dim_compare:nNnTF {#2} < {#6} { @@ -644,7 +644,7 @@ { { 0 pt } {#6} { 1000 pt } { 0 pt } } } } -\cs_new_protected_nopar:Npn \coffin_typeset:Nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \coffin_typeset:Nnnnn #1#2#3#4#5 { \coffin_align:NnnNnnnnN \c_empty_coffin { H } { l } #1 {#2} {#3} {#4} {#5} \l_coffin_aligned_coffin @@ -658,7 +658,7 @@ \dim_new:N \l_coffin_right_corner_dim \dim_new:N \l_coffin_bottom_corner_dim \dim_new:N \l_coffin_top_corner_dim -\cs_new_protected_nopar:Npn \coffin_rotate:Nn #1#2 +\cs_new_protected:Npn \coffin_rotate:Nn #1#2 { \fp_set:Nn \l_coffin_tmp_fp {#2} \fp_div:Nn \l_coffin_tmp_fp { 180 } @@ -693,7 +693,7 @@ { \coffin_shift_pole:Nnnnnn #1 {##1} ##2 } } \cs_generate_variant:Nn \coffin_rotate:Nn { c } -\cs_new_protected_nopar:Npn \coffin_set_bounding:N #1 +\cs_new_protected:Npn \coffin_set_bounding:N #1 { \prop_put:Nnx \l_coffin_bounding_prop { tl } { { 0 pt } { \dim_use:N \box_ht:N #1 } } @@ -705,19 +705,19 @@ \prop_put:Nnx \l_coffin_bounding_prop { br } { { \dim_use:N \box_wd:N #1 } { \dim_use:N \l_coffin_tmp_dim } } } -\cs_new_protected_nopar:Npn \coffin_rotate_bounding:nnn #1#2#3 +\cs_new_protected:Npn \coffin_rotate_bounding:nnn #1#2#3 { \coffin_rotate_vector:nnNN {#2} {#3} \l_coffin_x_dim \l_coffin_y_dim \prop_put:Nnx \l_coffin_bounding_prop {#1} { { \dim_use:N \l_coffin_x_dim } { \dim_use:N \l_coffin_y_dim } } } -\cs_new_protected_nopar:Npn \coffin_rotate_corner:Nnnn #1#2#3#4 +\cs_new_protected:Npn \coffin_rotate_corner:Nnnn #1#2#3#4 { \coffin_rotate_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim \prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } {#2} { { \dim_use:N \l_coffin_x_dim } { \dim_use:N \l_coffin_y_dim } } } -\cs_new_protected_nopar:Npn \coffin_rotate_pole:Nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \coffin_rotate_pole:Nnnnnn #1#2#3#4#5#6 { \coffin_rotate_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim \coffin_rotate_vector:nnNN {#5} {#6} @@ -729,7 +729,7 @@ { \dim_use:N \l_coffin_y_prime_dim } } } -\cs_new_protected_nopar:Npn \coffin_rotate_vector:nnNN #1#2#3#4 +\cs_new_protected:Npn \coffin_rotate_vector:nnNN #1#2#3#4 { \fp_set_from_dim:Nn \l_coffin_x_fp {#1} \fp_set_from_dim:Nn \l_coffin_y_fp {#2} @@ -746,7 +746,7 @@ \dim_set:Nn #3 { \fp_to_dim:N \l_coffin_x_prime_fp } \dim_set:Nn #4 { \fp_to_dim:N \l_coffin_y_prime_fp } } -\cs_new_protected_nopar:Npn \coffin_find_corner_maxima:N #1 +\cs_new_protected:Npn \coffin_find_corner_maxima:N #1 { \dim_set:Nn \l_coffin_top_corner_dim { -\c_max_dim } \dim_set:Nn \l_coffin_right_corner_dim { -\c_max_dim } @@ -755,7 +755,7 @@ \prop_map_inline:cn { l_coffin_corners_ \int_value:w #1 _prop } { \coffin_find_corner_maxima_aux:nn ##2 } } -\cs_new_protected_nopar:Npn \coffin_find_corner_maxima_aux:nn #1#2 +\cs_new_protected:Npn \coffin_find_corner_maxima_aux:nn #1#2 { \dim_set_min:Nn \l_coffin_left_corner_dim {#1} \dim_set_max:Nn \l_coffin_right_corner_dim {#1} @@ -768,9 +768,9 @@ \prop_map_inline:Nn \l_coffin_bounding_prop { \coffin_find_bounding_shift_aux:nn ##2 } } -\cs_new_protected_nopar:Npn \coffin_find_bounding_shift_aux:nn #1#2 +\cs_new_protected:Npn \coffin_find_bounding_shift_aux:nn #1#2 { \dim_set_min:Nn \l_coffin_bounding_shift_dim {#1} } -\cs_new_protected_nopar:Npn \coffin_shift_corner:Nnnn #1#2#3#4 +\cs_new_protected:Npn \coffin_shift_corner:Nnnn #1#2#3#4 { \prop_put:cnx { l_coffin_corners_ \int_value:w #1 _ prop } {#2} { @@ -778,7 +778,7 @@ { \dim_eval:n { #4 - \l_coffin_bottom_corner_dim } } } } -\cs_new_protected_nopar:Npn \coffin_shift_pole:Nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \coffin_shift_pole:Nnnnnn #1#2#3#4#5#6 { \prop_put:cnx { l_coffin_poles_ \int_value:w #1 _ prop } {#2} { @@ -791,7 +791,7 @@ \fp_new:N \l_coffin_scale_y_fp \dim_new:N \l_coffin_scaled_total_height_dim \dim_new:N \l_coffin_scaled_width_dim -\cs_new_protected_nopar:Npn \coffin_resize:Nnn #1#2#3 +\cs_new_protected:Npn \coffin_resize:Nnn #1#2#3 { \coffin_set_user_dimensions:N #1 \box_resize:Nnn #1 {#2} {#3} @@ -804,7 +804,7 @@ \coffin_resize_common:Nnn #1 {#2} {#3} } \cs_generate_variant:Nn \coffin_resize:Nnn { c } -\cs_new_protected_nopar:Npn \coffin_resize_common:Nnn #1#2#3 +\cs_new_protected:Npn \coffin_resize_common:Nnn #1#2#3 { \prop_map_inline:cn { l_coffin_corners_ \int_value:w #1 _prop } { \coffin_scale_corner:Nnnn #1 {##1} ##2 } @@ -819,7 +819,7 @@ } \coffin_end_user_dimensions: } -\cs_new_protected_nopar:Npn \coffin_scale:Nnn #1#2#3 +\cs_new_protected:Npn \coffin_scale:Nnn #1#2#3 { \box_scale:Nnn #1 {#2} {#3} \coffin_set_user_dimensions:N #1 @@ -835,7 +835,7 @@ { \l_coffin_scaled_width_dim } { \l_coffin_scaled_total_height_dim } } \cs_generate_variant:Nn \coffin_scale:Nnn { c } -\cs_new_protected_nopar:Npn \coffin_scale_vector:nnNN #1#2#3#4 +\cs_new_protected:Npn \coffin_scale_vector:nnNN #1#2#3#4 { \fp_set_from_dim:Nn \l_coffin_tmp_fp {#1} \fp_mul:Nn \l_coffin_tmp_fp { \l_coffin_scale_x_fp } @@ -844,13 +844,13 @@ \fp_mul:Nn \l_coffin_tmp_fp { \l_coffin_scale_y_fp } \dim_set:Nn #4 { \fp_to_dim:N \l_coffin_tmp_fp } } -\cs_new_protected_nopar:Npn \coffin_scale_corner:Nnnn #1#2#3#4 +\cs_new_protected:Npn \coffin_scale_corner:Nnnn #1#2#3#4 { \coffin_scale_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim \prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } {#2} { { \dim_use:N \l_coffin_x_dim } { \dim_use:N \l_coffin_y_dim } } } -\cs_new_protected_nopar:Npn \coffin_scale_pole:Nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \coffin_scale_pole:Nnnnnn #1#2#3#4#5#6 { \coffin_scale_vector:nnNN {#3} {#4} \l_coffin_x_dim \l_coffin_y_dim \coffin_set_pole:Nnx #1 {#2} @@ -859,14 +859,14 @@ {#5} {#6} } } -\cs_new_protected_nopar:Npn \coffin_x_shift_corner:Nnnn #1#2#3#4 +\cs_new_protected:Npn \coffin_x_shift_corner:Nnnn #1#2#3#4 { \prop_put:cnx { l_coffin_corners_ \int_value:w #1 _prop } {#2} { { \dim_eval:n { #3 + \box_wd:N #1 } } {#4} } } -\cs_new_protected_nopar:Npn \coffin_x_shift_pole:Nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \coffin_x_shift_pole:Nnnnnn #1#2#3#4#5#6 { \prop_put:cnx { l_coffin_poles_ \int_value:w #1 _prop } {#2} { @@ -922,7 +922,7 @@ \tl_new:N \l_coffin_display_font_tl \tl_set:Nn \l_coffin_display_font_tl { \sffamily \tiny } \prop_new:N \l_coffin_handles_tmp_prop -\cs_new_protected_nopar:Npn \coffin_mark_handle:Nnnn #1#2#3#4 +\cs_new_protected:Npn \coffin_mark_handle:Nnnn #1#2#3#4 { \hcoffin_set:Nn \l_coffin_display_pole_coffin { @@ -959,7 +959,7 @@ \l_coffin_tmp_tl #1 {#2} {#3} } } -\cs_new_protected_nopar:Npn \coffin_mark_handle_aux:nnnnNnn #1#2#3#4#5#6#7 +\cs_new_protected:Npn \coffin_mark_handle_aux:nnnnNnn #1#2#3#4#5#6#7 { \coffin_attach_mark:NnnNnnnn #5 {#6} {#7} \l_coffin_display_coord_coffin {#1} {#2} @@ -967,7 +967,7 @@ { #4 \l_coffin_display_offset_dim } } \cs_generate_variant:Nn \coffin_mark_handle:Nnnn { c } -\cs_new_protected_nopar:Npn \coffin_display_handles:Nn #1#2 +\cs_new_protected:Npn \coffin_display_handles:Nn #1#2 { \hcoffin_set:Nn \l_coffin_display_pole_coffin { @@ -992,7 +992,7 @@ } \box_use:N \l_coffin_display_coffin } -\cs_new_protected_nopar:Npn \coffin_display_handles_aux:nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \coffin_display_handles_aux:nnnnnn #1#2#3#4#5#6 { \prop_map_inline:Nn \l_coffin_display_poles_prop { @@ -1036,7 +1036,7 @@ } } } -\cs_new_protected_nopar:Npn \coffin_display_handles_aux:nnnn #1#2#3#4 +\cs_new_protected:Npn \coffin_display_handles_aux:nnnn #1#2#3#4 { \coffin_display_attach:Nnnnn \l_coffin_display_coord_coffin {#1} {#2} @@ -1044,7 +1044,7 @@ { #4 \l_coffin_display_offset_dim } } \cs_generate_variant:Nn \coffin_display_handles:Nn { c } -\cs_new_protected_nopar:Npn \coffin_display_attach:Nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \coffin_display_attach:Nnnnn #1#2#3#4#5 { \coffin_calculate_intersection:Nnn #1 {#2} {#3} \dim_set:Nn \l_coffin_x_prime_dim { \l_coffin_x_dim } @@ -1068,7 +1068,7 @@ { \box_wd:N \l_coffin_display_coffin } \box_set_eq:NN \l_coffin_display_coffin \l_coffin_aligned_coffin } -\cs_new_protected_nopar:Npn \coffin_show_structure:N #1 +\cs_new_protected:Npn \coffin_show_structure:N #1 { \cs_if_exist:cTF { l_coffin_poles_ \int_value:w #1 _prop } { @@ -1100,7 +1100,7 @@ \iow_newline: > \c_space_tl \c_space_tl #1 \c_space_tl \c_space_tl => \c_space_tl \c_space_tl \exp_not:n {#2} } -\cs_new_nopar:Npn \coffin_show_aux:w #1 > ~ { } +\cs_new:Npn \coffin_show_aux:w #1 > ~ { } \cs_generate_variant:Nn \coffin_show_structure:N { c } \msg_kernel_new:nnnn { coffins } { no-pole-intersection } { No~intersection~between~coffin~poles. } diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty index 303e369e694..b0fded9bb79 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3expan.dtx 3031 2011-12-07 05:27:05Z bruno $ +\GetIdInfo$Id: l3expan.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental argument expansion} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -85,7 +85,7 @@ \exp_after:wN { \tex_romannumeral:D \exp_eval_register:c {#3} } {#1} {#2} } -\cs_new_nopar:Npn \exp_eval_register:N #1 +\cs_new:Npn \exp_eval_register:N #1 { \exp_after:wN \if_meaning:w \exp_not:N #1 #1 \if_meaning:w \scan_stop: #1 @@ -96,7 +96,7 @@ \fi: \exp_after:wN \c_zero \tex_the:D #1 } -\cs_new_nopar:Npn \exp_eval_register:c #1 +\cs_new:Npn \exp_eval_register:c #1 { \exp_after:wN \exp_eval_register:N \cs:w #1 \cs_end: } \cs_new:Npn \exp_eval_error_msg:w #1 \tex_the:D #2 { @@ -165,7 +165,7 @@ \cs:w #2 \exp_after:wN \cs_end: \exp_after:wN { \tex_romannumeral:D -`0 #3 } } -\cs_new_nopar:Npn \exp_args:NVV #1#2#3 +\cs_new:Npn \exp_args:NVV #1#2#3 { \exp_after:wN #1 \exp_after:wN { \tex_romannumeral:D \exp_after:wN @@ -369,7 +369,7 @@ \tex_lowercase:D { \group_end: - \cs_new_nopar:Npn \cs_generate_variant_aux:N #1 + \cs_new:Npn \cs_generate_variant_aux:N #1 { \exp_after:wN \cs_generate_variant_aux:w \token_to_meaning:N #1 diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty index 1437c74f4da..5ee45083280 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3file.dtx 2896 2011-10-09 20:36:50Z joseph $ +\GetIdInfo$Id: l3file.dtx 3095 2011-12-26 22:33:23Z joseph $ {L3 Experimental file operations} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -59,17 +59,17 @@ \seq_new:N \l_file_search_path_seq \seq_new:N \l_file_search_path_saved_seq \seq_new:N \l_file_tmpa_seq -\cs_new_protected_nopar:Npn \file_add_path:nN #1#2 +\cs_new_protected:Npn \file_add_path:nN #1#2 { - \ior_open:Nn \g_file_test_stream {#1} - \ior_if_eof:NTF \g_file_test_stream + \ior_open:Nn \g_file_test_ior {#1} + \ior_if_eof:NTF \g_file_test_ior { \file_add_path_search:nN {#1} #2 } { - \ior_close:N \g_file_test_stream + \ior_close:N \g_file_test_ior \tl_set:Nx #2 {#1} } } -\cs_new_protected_nopar:Npn \file_add_path_search:nN #1#2 +\cs_new_protected:Npn \file_add_path_search:nN #1#2 { \tl_clear:N #2 \cs_if_exist:NT \input@path @@ -81,8 +81,8 @@ } \seq_map_inline:Nn \l_file_search_path_seq { - \ior_open:Nn \g_file_test_stream { ##1 #1 } - \ior_if_eof:NF \g_file_test_stream + \ior_open:Nn \g_file_test_ior { ##1 #1 } + \ior_if_eof:NF \g_file_test_ior { \tl_set:Nx #2 { ##1 #1 } \seq_map_break: @@ -90,7 +90,7 @@ } \cs_if_exist:NT \input@path { \seq_set_eq:NN \l_file_search_path_seq \l_file_search_path_saved_seq } - \ior_close:N \g_file_test_stream + \ior_close:N \g_file_test_ior } \prg_new_protected_conditional:Nnn \file_if_exist:n { T , F , TF } { @@ -99,7 +99,7 @@ { \prg_return_false: } { \prg_return_true: } } -\cs_new_protected_nopar:Npn \file_input:n #1 +\cs_new_protected:Npn \file_input:n #1 { \file_add_path:nN {#1} \l_file_name_tl \tl_if_empty:NF \l_file_name_tl @@ -111,12 +111,12 @@ \seq_gpop:NN \g_file_stack_seq \g_file_current_name_tl } } -\cs_new_protected_nopar:Npn \file_path_include:n #1 +\cs_new_protected:Npn \file_path_include:n #1 { \seq_if_in:NnF \l_file_search_path_seq {#1} { \seq_put_right:Nn \l_file_search_path_seq {#1} } } -\cs_new_protected_nopar:Npn \file_path_remove:n #1 +\cs_new_protected:Npn \file_path_remove:n #1 { \seq_remove_all:Nn \l_file_search_path_seq {#1} } \cs_new_protected_nopar:Npn \file_list: { diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty index 3eb68b0727d..00d73728018 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3fp.dtx 3029 2011-12-06 22:47:30Z joseph $ +\GetIdInfo$Id: l3fp.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental floating-point operations} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -121,9 +121,9 @@ \int_new:N \l_fp_trig_sign_int \int_new:N \l_fp_trig_decimal_int \int_new:N \l_fp_trig_extended_int -\cs_new_protected_nopar:Npn \fp_read:N #1 +\cs_new_protected:Npn \fp_read:N #1 { \exp_after:wN \fp_read_aux:w #1 \q_stop } -\cs_new_protected_nopar:Npn \fp_read_aux:w #1#2 . #3 e #4 \q_stop +\cs_new_protected:Npn \fp_read_aux:w #1#2 . #3 e #4 \q_stop { \if:w #1 - \l_fp_input_a_sign_int \c_minus_one @@ -134,7 +134,7 @@ \l_fp_input_a_decimal_int #3 \scan_stop: \l_fp_input_a_exponent_int #4 \scan_stop: } -\cs_new_protected_nopar:Npn \fp_split:Nn #1#2 +\cs_new_protected:Npn \fp_split:Nn #1#2 { \tl_set:Nx \l_fp_tmp_tl {#2} \tl_set_rescan:Nno \l_fp_tmp_tl { \char_set_catcode_ignore:n { 32 } } @@ -169,7 +169,7 @@ \fi: \fi: } -\cs_new_protected_nopar:Npn \fp_split_exponent:w #1 e #2 e #3 \q_stop #4 +\cs_new_protected:Npn \fp_split_exponent:w #1 e #2 e #3 \q_stop #4 { \use:c { l_fp_input_ #4 _exponent_int } \int_eval:w 0 #2 \scan_stop: @@ -177,19 +177,19 @@ \use:c { l_fp_input_ #4 _integer_int } \int_eval:w 0 #1 . . \q_stop #4 } -\cs_new_protected_nopar:Npn \fp_split_aux_i:w #1 . #2 . #3 \q_stop +\cs_new_protected:Npn \fp_split_aux_i:w #1 . #2 . #3 \q_stop { \fp_split_aux_ii:w #2 000000000 \q_stop } -\cs_new_protected_nopar:Npn \fp_split_aux_ii:w #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_split_aux_ii:w #1#2#3#4#5#6#7#8#9 { \fp_split_aux_iii:w {#1#2#3#4#5#6#7#8#9} } -\cs_new_protected_nopar:Npn \fp_split_aux_iii:w #1#2 \q_stop +\cs_new_protected:Npn \fp_split_aux_iii:w #1#2 \q_stop { \l_fp_tmp_int 1 #1 \scan_stop: \exp_after:wN \fp_split_decimal:w \int_use:N \l_fp_tmp_int 000000000 \q_stop } -\cs_new_protected_nopar:Npn \fp_split_decimal:w #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_split_decimal:w #1#2#3#4#5#6#7#8#9 { \fp_split_decimal_aux:w {#2#3#4#5#6#7#8#9} } -\cs_new_protected_nopar:Npn \fp_split_decimal_aux:w #1#2#3 \q_stop #4 +\cs_new_protected:Npn \fp_split_decimal_aux:w #1#2#3 \q_stop #4 { \use:c { l_fp_input_ #4 _decimal_int } #1#2 \scan_stop: \if_int_compare:w @@ -206,7 +206,7 @@ \exp_after:wN \fp_overflow_msg: \fi: } -\cs_new_protected_nopar:Npn \fp_standardise:NNNN #1#2#3#4 +\cs_new_protected:Npn \fp_standardise:NNNN #1#2#3#4 { \if_int_compare:w \int_eval:w #2 + #3 = \c_zero @@ -218,7 +218,7 @@ \fi: #1#2#3#4 } -\cs_new_protected_nopar:Npn \fp_standardise_aux:NNNN #1#2#3#4 +\cs_new_protected:Npn \fp_standardise_aux:NNNN #1#2#3#4 { \cs_set_protected_nopar:Npn \fp_standardise_aux: { @@ -229,7 +229,7 @@ \exp_after:wN \fp_standardise_aux: \fi: } - \cs_set_protected_nopar:Npn + \cs_set_protected:Npn \fp_standardise_aux:w ##1##2##3##4##5##6##7##8##9 \q_stop { #2 ##2 \scan_stop: @@ -246,7 +246,7 @@ \exp_after:wN \fp_standardise_aux: \fi: } - \cs_set_protected_nopar:Npn + \cs_set_protected:Npn \fp_standardise_aux:w ##1##2##3##4##5##6##7##8##9 { #2 ##1##2##3##4##5##6##7##8 \scan_stop: @@ -293,7 +293,7 @@ \exp_after:wN \fp_level_input_exponents_a: \fi: } -\cs_new_protected_nopar:Npn \fp_level_input_exponents_a:NNNNNNNNN +\cs_new_protected:Npn \fp_level_input_exponents_a:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \l_fp_input_b_integer_int #1#2#3#4#5#6#7#8 \scan_stop: @@ -318,7 +318,7 @@ \exp_after:wN \fp_level_input_exponents_b: \fi: } -\cs_new_protected_nopar:Npn \fp_level_input_exponents_b:NNNNNNNNN +\cs_new_protected:Npn \fp_level_input_exponents_b:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \l_fp_input_a_integer_int #1#2#3#4#5#6#7#8 \scan_stop: @@ -333,28 +333,28 @@ \l_fp_input_a_decimal_int \l_fp_tmp_tl \scan_stop: \tex_advance:D \l_fp_input_a_exponent_int \c_one } -\cs_new_protected_nopar:Npn \fp_tmp:w #1#2 { } -\cs_new_protected_nopar:Npn \fp_new:N #1 +\cs_new_protected:Npn \fp_tmp:w #1#2 { } +\cs_new_protected:Npn \fp_new:N #1 { \tl_new:N #1 \tl_gset_eq:NN #1 \c_zero_fp } \cs_generate_variant:Nn \fp_new:N { c } -\cs_new_protected_nopar:Npn \fp_const:Nn #1#2 +\cs_new_protected:Npn \fp_const:Nn #1#2 { \fp_new:N #1 \fp_gset:Nn #1 {#2} } \cs_generate_variant:Nn \fp_const:Nn { c } -\cs_new_protected_nopar:Npn \fp_zero:N #1 +\cs_new_protected:Npn \fp_zero:N #1 { \tl_set_eq:NN #1 \c_zero_fp } -\cs_new_protected_nopar:Npn \fp_gzero:N #1 +\cs_new_protected:Npn \fp_gzero:N #1 { \tl_gset_eq:NN #1 \c_zero_fp } \cs_generate_variant:Nn \fp_zero:N { c } \cs_generate_variant:Nn \fp_gzero:N { c } \cs_new_protected_nopar:Npn \fp_set:Nn { \fp_set_aux:NNn \tl_set:Nn } \cs_new_protected_nopar:Npn \fp_gset:Nn { \fp_set_aux:NNn \tl_gset:Nn } -\cs_new_protected_nopar:Npn \fp_set_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_set_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -390,7 +390,7 @@ { \fp_set_from_dim_aux:NNn \tl_set:Nx } \cs_new_protected_nopar:Npn \fp_gset_from_dim:Nn { \fp_set_from_dim_aux:NNn \tl_gset:Nx } -\cs_new_protected_nopar:Npn \fp_set_from_dim_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_set_from_dim_aux:NNn #1#2#3 { \group_begin: \l_fp_tmp_skip \etex_glueexpr:D #3 \scan_stop: @@ -428,7 +428,7 @@ } \cs_set_protected_nopar:Npx \fp_set_from_dim_aux:w { - \cs_set_nopar:Npn \exp_not:N \fp_set_from_dim_aux:w + \cs_set:Npn \exp_not:N \fp_set_from_dim_aux:w ##1 \tl_to_str:n { pt } {##1} } \fp_set_from_dim_aux:w @@ -446,10 +446,10 @@ \cs_new_eq:NN \fp_gset_eq:cc \tl_gset_eq:cc \cs_new_eq:NN \fp_show:N \tl_show:N \cs_new_eq:NN \fp_show:c \tl_show:c -\cs_new_nopar:Npn \fp_use:N #1 +\cs_new:Npn \fp_use:N #1 { \exp_after:wN \fp_use_aux:w #1 \q_stop } \cs_generate_variant:Nn \fp_use:N { c } -\cs_new_nopar:Npn \fp_use_aux:w #1#2 e #3 \q_stop +\cs_new:Npn \fp_use_aux:w #1#2 e #3 \q_stop { \if:w #1 - - @@ -466,14 +466,14 @@ \fi: #2 e #3 \q_stop } -\cs_new_nopar:Npn \fp_use_none:w #1 e #2 \q_stop {#1} -\cs_new_nopar:Npn \fp_use_small:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_use_none:w #1 e #2 \q_stop {#1} +\cs_new:Npn \fp_use_small:w #1 . #2 e #3 \q_stop { 0 . \prg_replicate:nn { -#3 - 1 } { 0 } #1#2 } -\cs_new_nopar:Npn \fp_use_large:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_use_large:w #1 . #2 e #3 \q_stop { \if_int_compare:w #3 < \c_ten \exp_after:wN \fp_use_large_aux_i:w @@ -482,39 +482,39 @@ \fi: #1#2 e #3 \q_stop } -\cs_new_nopar:Npn \fp_use_large_aux_i:w #1#2 e #3 \q_stop +\cs_new:Npn \fp_use_large_aux_i:w #1#2 e #3 \q_stop { #1 \use:c { fp_use_large_aux_ #3 :w } #2 \q_stop } -\cs_new_nopar:cpn { fp_use_large_aux_1:w } #1#2 \q_stop { #1 . #2 } -\cs_new_nopar:cpn { fp_use_large_aux_2:w } #1#2#3 \q_stop +\cs_new:cpn { fp_use_large_aux_1:w } #1#2 \q_stop { #1 . #2 } +\cs_new:cpn { fp_use_large_aux_2:w } #1#2#3 \q_stop { #1#2 . #3 } -\cs_new_nopar:cpn { fp_use_large_aux_3:w } #1#2#3#4 \q_stop +\cs_new:cpn { fp_use_large_aux_3:w } #1#2#3#4 \q_stop { #1#2#3 . #4 } -\cs_new_nopar:cpn { fp_use_large_aux_4:w } #1#2#3#4#5 \q_stop +\cs_new:cpn { fp_use_large_aux_4:w } #1#2#3#4#5 \q_stop { #1#2#3#4 . #5 } -\cs_new_nopar:cpn { fp_use_large_aux_5:w } #1#2#3#4#5#6 \q_stop +\cs_new:cpn { fp_use_large_aux_5:w } #1#2#3#4#5#6 \q_stop { #1#2#3#4#5 . #6 } -\cs_new_nopar:cpn { fp_use_large_aux_6:w } #1#2#3#4#5#6#7 \q_stop +\cs_new:cpn { fp_use_large_aux_6:w } #1#2#3#4#5#6#7 \q_stop { #1#2#3#4#5#6 . #7 } -\cs_new_nopar:cpn { fp_use_large_aux_7:w } #1#2#3#4#5#6#7#8 \q_stop +\cs_new:cpn { fp_use_large_aux_7:w } #1#2#3#4#5#6#7#8 \q_stop { #1#2#3#4#6#7 . #8 } -\cs_new_nopar:cpn { fp_use_large_aux_8:w } #1#2#3#4#5#6#7#8#9 \q_stop +\cs_new:cpn { fp_use_large_aux_8:w } #1#2#3#4#5#6#7#8#9 \q_stop { #1#2#3#4#5#6#7#8 . #9 } -\cs_new_nopar:cpn { fp_use_large_aux_9:w } #1 \q_stop { #1 . } -\cs_new_nopar:Npn \fp_use_large_aux_ii:w #1 e #2 \q_stop +\cs_new:cpn { fp_use_large_aux_9:w } #1 \q_stop { #1 . } +\cs_new:Npn \fp_use_large_aux_ii:w #1 e #2 \q_stop { #1 \prg_replicate:nn { #2 - 9 } { 0 } . } -\cs_new_nopar:Npn \fp_to_dim:N #1 { \fp_use:N #1 pt } +\cs_new:Npn \fp_to_dim:N #1 { \fp_use:N #1 pt } \cs_generate_variant:Nn \fp_to_dim:N { c } -\cs_new_nopar:Npn \fp_to_int:N #1 +\cs_new:Npn \fp_to_int:N #1 { \exp_after:wN \fp_to_int_aux:w #1 \q_stop } \cs_generate_variant:Nn \fp_to_int:N { c } -\cs_new_nopar:Npn \fp_to_int_aux:w #1#2 e #3 \q_stop +\cs_new:Npn \fp_to_int_aux:w #1#2 e #3 \q_stop { \if:w #1 - - @@ -526,7 +526,7 @@ \fi: #2 e #3 \q_stop } -\cs_new_nopar:Npn \fp_to_int_small:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_int_small:w #1 . #2 e #3 \q_stop { \if_int_compare:w #3 > \c_one \else: @@ -537,7 +537,7 @@ \fi: \fi: } -\cs_new_nopar:Npn \fp_to_int_large:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_int_large:w #1 . #2 e #3 \q_stop { \if_int_compare:w #3 < \c_ten \exp_after:wN \fp_to_int_large_aux_i:w @@ -546,26 +546,26 @@ \fi: #1#2 e #3 \q_stop } -\cs_new_nopar:Npn \fp_to_int_large_aux_i:w #1#2 e #3 \q_stop +\cs_new:Npn \fp_to_int_large_aux_i:w #1#2 e #3 \q_stop { \use:c { fp_to_int_large_aux_ #3 :w } #2 \q_stop {#1} } -\cs_new_nopar:cpn { fp_to_int_large_aux_1:w } #1#2 \q_stop +\cs_new:cpn { fp_to_int_large_aux_1:w } #1#2 \q_stop { \fp_to_int_large_aux:nnn { #2 0 } {#1} } -\cs_new_nopar:cpn { fp_to_int_large_aux_2:w } #1#2#3 \q_stop +\cs_new:cpn { fp_to_int_large_aux_2:w } #1#2#3 \q_stop { \fp_to_int_large_aux:nnn { #3 00 } {#1#2} } -\cs_new_nopar:cpn { fp_to_int_large_aux_3:w } #1#2#3#4 \q_stop +\cs_new:cpn { fp_to_int_large_aux_3:w } #1#2#3#4 \q_stop { \fp_to_int_large_aux:nnn { #4 000 } {#1#2#3} } -\cs_new_nopar:cpn { fp_to_int_large_aux_4:w } #1#2#3#4#5 \q_stop +\cs_new:cpn { fp_to_int_large_aux_4:w } #1#2#3#4#5 \q_stop { \fp_to_int_large_aux:nnn { #5 0000 } {#1#2#3#4} } -\cs_new_nopar:cpn { fp_to_int_large_aux_5:w } #1#2#3#4#5#6 \q_stop +\cs_new:cpn { fp_to_int_large_aux_5:w } #1#2#3#4#5#6 \q_stop { \fp_to_int_large_aux:nnn { #6 00000 } {#1#2#3#4#5} } -\cs_new_nopar:cpn { fp_to_int_large_aux_6:w } #1#2#3#4#5#6#7 \q_stop +\cs_new:cpn { fp_to_int_large_aux_6:w } #1#2#3#4#5#6#7 \q_stop { \fp_to_int_large_aux:nnn { #7 000000 } {#1#2#3#4#5#6} } -\cs_new_nopar:cpn { fp_to_int_large_aux_7:w } #1#2#3#4#5#6#7#8 \q_stop +\cs_new:cpn { fp_to_int_large_aux_7:w } #1#2#3#4#5#6#7#8 \q_stop { \fp_to_int_large_aux:nnn { #8 0000000 } {#1#2#3#4#5#6#7} } -\cs_new_nopar:cpn { fp_to_int_large_aux_8:w } #1#2#3#4#5#6#7#8#9 \q_stop +\cs_new:cpn { fp_to_int_large_aux_8:w } #1#2#3#4#5#6#7#8#9 \q_stop { \fp_to_int_large_aux:nnn { #9 00000000 } {#1#2#3#4#5#6#7#8} } -\cs_new_nopar:cpn { fp_to_int_large_aux_9:w } #1 \q_stop {#1} -\cs_new_nopar:Npn \fp_to_int_large_aux:nnn #1#2#3 +\cs_new:cpn { fp_to_int_large_aux_9:w } #1 \q_stop {#1} +\cs_new:Npn \fp_to_int_large_aux:nnn #1#2#3 { \if_int_compare:w #1 < \c_five_hundred_million #3#2 @@ -573,15 +573,15 @@ \int_value:w \int_eval:w #3#2 + 1 \int_eval_end: \fi: } -\cs_new_nopar:Npn \fp_to_int_large_aux_ii:w #1 e #2 \q_stop +\cs_new:Npn \fp_to_int_large_aux_ii:w #1 e #2 \q_stop { #1 \prg_replicate:nn { #2 - 9 } { 0 } } -\cs_new_nopar:Npn \fp_to_tl:N #1 +\cs_new:Npn \fp_to_tl:N #1 { \exp_after:wN \fp_to_tl_aux:w #1 \q_stop } \cs_generate_variant:Nn \fp_to_tl:N { c } -\cs_new_nopar:Npn \fp_to_tl_aux:w #1#2 e #3 \q_stop +\cs_new:Npn \fp_to_tl_aux:w #1#2 e #3 \q_stop { \if:w #1 - - @@ -593,7 +593,7 @@ \fi: #2 e #3 \q_stop } -\cs_new_nopar:Npn \fp_to_tl_large:w #1 e #2 \q_stop +\cs_new:Npn \fp_to_tl_large:w #1 e #2 \q_stop { \if_int_compare:w #2 < \c_ten \exp_after:wN \fp_to_tl_large_aux_i:w @@ -602,66 +602,66 @@ \fi: #1 e #2 \q_stop } -\cs_new_nopar:Npn \fp_to_tl_large_aux_i:w #1 e #2 \q_stop +\cs_new:Npn \fp_to_tl_large_aux_i:w #1 e #2 \q_stop { \use:c { fp_to_tl_large_ #2 :w } #1 \q_stop } -\cs_new_nopar:Npn \fp_to_tl_large_aux_ii:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_tl_large_aux_ii:w #1 . #2 e #3 \q_stop { #1 \fp_to_tl_large_zeros:NNNNNNNNN #2 e #3 } -\cs_new_nopar:cpn { fp_to_tl_large_0:w } #1 . #2 \q_stop +\cs_new:cpn { fp_to_tl_large_0:w } #1 . #2 \q_stop { #1 \fp_to_tl_large_zeros:NNNNNNNNN #2 } -\cs_new_nopar:cpn { fp_to_tl_large_1:w } #1 . #2#3 \q_stop +\cs_new:cpn { fp_to_tl_large_1:w } #1 . #2#3 \q_stop { #1#2 \fp_to_tl_large_zeros:NNNNNNNNN #3 0 } -\cs_new_nopar:cpn { fp_to_tl_large_2:w } #1 . #2#3#4 \q_stop +\cs_new:cpn { fp_to_tl_large_2:w } #1 . #2#3#4 \q_stop { #1#2#3 \fp_to_tl_large_zeros:NNNNNNNNN #4 00 } -\cs_new_nopar:cpn { fp_to_tl_large_3:w } #1 . #2#3#4#5 \q_stop +\cs_new:cpn { fp_to_tl_large_3:w } #1 . #2#3#4#5 \q_stop { #1#2#3#4 \fp_to_tl_large_zeros:NNNNNNNNN #5 000 } -\cs_new_nopar:cpn { fp_to_tl_large_4:w } #1 . #2#3#4#5#6 \q_stop +\cs_new:cpn { fp_to_tl_large_4:w } #1 . #2#3#4#5#6 \q_stop { #1#2#3#4#5 \fp_to_tl_large_zeros:NNNNNNNNN #6 0000 } -\cs_new_nopar:cpn { fp_to_tl_large_5:w } #1 . #2#3#4#5#6#7 \q_stop +\cs_new:cpn { fp_to_tl_large_5:w } #1 . #2#3#4#5#6#7 \q_stop { #1#2#3#4#5#6 \fp_to_tl_large_zeros:NNNNNNNNN #7 00000 } -\cs_new_nopar:cpn { fp_to_tl_large_6:w } #1 . #2#3#4#5#6#7#8 \q_stop +\cs_new:cpn { fp_to_tl_large_6:w } #1 . #2#3#4#5#6#7#8 \q_stop { #1#2#3#4#5#6#7 \fp_to_tl_large_zeros:NNNNNNNNN #8 000000 } -\cs_new_nopar:cpn { fp_to_tl_large_7:w } #1 . #2#3#4#5#6#7#8#9 \q_stop +\cs_new:cpn { fp_to_tl_large_7:w } #1 . #2#3#4#5#6#7#8#9 \q_stop { #1#2#3#4#5#6#7#8 \fp_to_tl_large_zeros:NNNNNNNNN #9 0000000 } -\cs_new_nopar:cpn { fp_to_tl_large_8:w } #1 . +\cs_new:cpn { fp_to_tl_large_8:w } #1 . { #1 \use:c { fp_to_tl_large_8_aux:w } } -\cs_new_nopar:cpn { fp_to_tl_large_8_aux:w } #1#2#3#4#5#6#7#8#9 \q_stop +\cs_new:cpn { fp_to_tl_large_8_aux:w } #1#2#3#4#5#6#7#8#9 \q_stop { #1#2#3#4#5#6#7#8 \fp_to_tl_large_zeros:NNNNNNNNN #9 00000000 } -\cs_new_nopar:cpn { fp_to_tl_large_9:w } #1 . #2 \q_stop {#1#2} -\cs_new_nopar:Npn \fp_to_tl_small:w #1 e #2 \q_stop +\cs_new:cpn { fp_to_tl_large_9:w } #1 . #2 \q_stop {#1#2} +\cs_new:Npn \fp_to_tl_small:w #1 e #2 \q_stop { \if_int_compare:w #2 = \c_minus_one \exp_after:wN \fp_to_tl_small_one:w @@ -674,7 +674,7 @@ \fi: #1 e #2 \q_stop } -\cs_new_nopar:Npn \fp_to_tl_small_one:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_tl_small_one:w #1 . #2 e #3 \q_stop { \if_int_compare:w \fp_use_ix:NNNNNNNNN #2 > \c_four \if_int_compare:w @@ -693,7 +693,7 @@ \fp_to_tl_small_zeros:NNNNNNNNN #2 \fi: } -\cs_new_nopar:Npn \fp_to_tl_small_two:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_tl_small_two:w #1 . #2 e #3 \q_stop { \if_int_compare:w \fp_use_iix_ix:NNNNNNNNN #2 > \c_forty_four \if_int_compare:w @@ -713,13 +713,13 @@ \fp_to_tl_small_zeros:NNNNNNNNN #2 \fi: } -\cs_new_nopar:Npn \fp_to_tl_small_aux:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_tl_small_aux:w #1 . #2 e #3 \q_stop { #1 \fp_to_tl_large_zeros:NNNNNNNNN #2 e #3 } -\cs_new_nopar:Npn \fp_to_tl_large_zeros:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new:Npn \fp_to_tl_large_zeros:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \if_int_compare:w #9 = \c_zero \if_int_compare:w #8 = \c_zero @@ -758,7 +758,7 @@ . #1#2#3#4#5#6#7#8#9 \fi: } -\cs_new_nopar:Npn \fp_to_tl_small_zeros:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new:Npn \fp_to_tl_small_zeros:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \if_int_compare:w #9 = \c_zero \if_int_compare:w #8 = \c_zero @@ -797,11 +797,11 @@ #1#2#3#4#5#6#7#8#9 \fi: } -\cs_new_nopar:Npn \fp_use_iix_ix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#8#9} -\cs_new_nopar:Npn \fp_use_ix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#9} -\cs_new_nopar:Npn \fp_use_i_to_vii:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new:Npn \fp_use_iix_ix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#8#9} +\cs_new:Npn \fp_use_ix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#9} +\cs_new:Npn \fp_use_i_to_vii:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#1#2#3#4#5#6#7} -\cs_new_nopar:Npn \fp_use_i_to_iix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new:Npn \fp_use_i_to_iix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#1#2#3#4#5#6#7#8} \cs_new_protected_nopar:Npn \fp_round_figures:Nn { \fp_round_figures_aux:NNn \tl_set:Nn } @@ -809,7 +809,7 @@ \cs_new_protected_nopar:Npn \fp_ground_figures:Nn { \fp_round_figures_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_ground_figures:Nn { c } -\cs_new_protected_nopar:Npn \fp_round_figures_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_round_figures_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -844,7 +844,7 @@ \cs_new_protected_nopar:Npn \fp_ground_places:Nn { \fp_round_places_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_ground_places:Nn { c } -\cs_new_protected_nopar:Npn \fp_round_places_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_round_places_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -883,7 +883,7 @@ \exp_after:wN \use_i:nn \exp_after:wN \fp_round_aux:NNNNNNNNN \int_use:N \l_fp_input_a_decimal_int } -\cs_new_protected_nopar:Npn \fp_round_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_round_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \fp_round_loop:N #9#8#7#6#5#4#3#2#1 \bool_if:NT \l_fp_round_carry_bool @@ -896,7 +896,7 @@ \tex_advance:D \l_fp_input_a_exponent_int \c_one \fi: } -\cs_new_protected_nopar:Npn \fp_round_loop:N #1 +\cs_new_protected:Npn \fp_round_loop:N #1 { \if_int_compare:w \l_fp_round_position_int < \l_fp_round_target_int \bool_if:NTF \l_fp_round_carry_bool @@ -926,7 +926,7 @@ \cs_new_protected_nopar:Npn \fp_gabs:N { \fp_abs_aux:NN \tl_gset:Nn } \cs_generate_variant:Nn \fp_abs:N { c } \cs_generate_variant:Nn \fp_gabs:N { c } -\cs_new_protected_nopar:Npn \fp_abs_aux:NN #1#2 +\cs_new_protected:Npn \fp_abs_aux:NN #1#2 { \group_begin: \fp_read:N #2 @@ -951,7 +951,7 @@ \cs_new_protected_nopar:Npn \fp_gneg:N { \fp_neg_aux:NN \tl_gset:Nn } \cs_generate_variant:Nn \fp_neg:N { c } \cs_generate_variant:Nn \fp_gneg:N { c } -\cs_new_protected_nopar:Npn \fp_neg_aux:NN #1#2 +\cs_new_protected:Npn \fp_neg_aux:NN #1#2 { \group_begin: \fp_read:N #2 @@ -977,7 +977,7 @@ \cs_new_protected_nopar:Npn \fp_gadd:Nn { \fp_add_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_add:Nn { c } \cs_generate_variant:Nn \fp_gadd:Nn { c } -\cs_new_protected_nopar:Npn \fp_add_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_add_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -1007,7 +1007,7 @@ \l_fp_output_integer_int \l_fp_output_decimal_int \l_fp_output_exponent_int - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 @@ -1080,7 +1080,7 @@ \cs_new_protected_nopar:Npn \fp_gsub:Nn { \fp_sub_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_sub:Nn { c } \cs_generate_variant:Nn \fp_gsub:Nn { c } -\cs_new_protected_nopar:Npn \fp_sub_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_sub_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -1098,7 +1098,7 @@ \cs_new_protected_nopar:Npn \fp_gmul:Nn { \fp_mul_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_mul:Nn { c } \cs_generate_variant:Nn \fp_gmul:Nn { c } -\cs_new_protected_nopar:Npn \fp_mul_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_mul_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -1179,10 +1179,10 @@ \fp_mul_end_level: \l_fp_output_integer_int 0 \l_fp_mul_output_tl \scan_stop: } -\cs_new_protected_nopar:Npn \fp_mul_split:NNNN #1#2#3#4 +\cs_new_protected:Npn \fp_mul_split:NNNN #1#2#3#4 { \tex_advance:D #1 \c_one_thousand_million - \cs_set_protected_nopar:Npn \fp_mul_split_aux:w + \cs_set_protected:Npn \fp_mul_split_aux:w ##1##2##3##4##5##6##7##8##9 \q_stop { #2 ##2##3##4 \scan_stop: #3 ##5##6##7 \scan_stop: @@ -1191,7 +1191,7 @@ \exp_after:wN \fp_mul_split_aux:w \int_use:N #1 \q_stop \tex_advance:D #1 -\c_one_thousand_million } -\cs_new_protected_nopar:Npn \fp_mul_product:NN #1#2 +\cs_new_protected:Npn \fp_mul_product:NN #1#2 { \l_fp_mul_output_int \int_eval:w \l_fp_mul_output_int + #1 * #2 \scan_stop: @@ -1202,7 +1202,7 @@ \exp_after:wN \use_i:nn \exp_after:wN \fp_mul_end_level:NNNNNNNNN \int_use:N \l_fp_mul_output_int } -\cs_new_protected_nopar:Npn \fp_mul_end_level:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_mul_end_level:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \tl_set:Nx \l_fp_mul_output_tl { #7#8#9 \l_fp_mul_output_tl } \l_fp_mul_output_int #1#2#3#4#5#6 \scan_stop: @@ -1211,7 +1211,7 @@ \cs_new_protected_nopar:Npn \fp_gdiv:Nn { \fp_div_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_div:Nn { c } \cs_generate_variant:Nn \fp_gdiv:Nn { c } -\cs_new_protected_nopar:Npn \fp_div_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_div_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -1225,7 +1225,7 @@ \int_eval:w \l_fp_input_b_integer_int + \l_fp_input_b_decimal_int = \c_zero - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: #1 \exp_not:N #2 { \c_undefined_fp } @@ -1235,7 +1235,7 @@ \int_eval:w \l_fp_input_a_integer_int + \l_fp_input_a_decimal_int = \c_zero - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: #1 \exp_not:N #2 { \c_zero_fp } @@ -1261,7 +1261,7 @@ \l_fp_output_integer_int \l_fp_output_decimal_int \l_fp_output_exponent_int - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 @@ -1353,13 +1353,13 @@ \int_eval_end: \tex_divide:D \l_fp_div_offset_int \c_ten } -\cs_new_protected_nopar:Npn \fp_div_loop_step:w #1#2#3#4#5#6#7#8#9 \q_stop +\cs_new_protected:Npn \fp_div_loop_step:w #1#2#3#4#5#6#7#8#9 \q_stop { \l_fp_input_a_integer_int \int_eval:w #2 + \l_fp_input_a_integer_int \int_eval_end: \l_fp_input_a_decimal_int #3#4#5#6#7#8#9 0 \scan_stop: } -\cs_new_protected_nopar:Npn \fp_add:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_add:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { #7 \int_eval:w #1 + #4 \int_eval_end: #8 \int_eval:w #2 + #5 \int_eval_end: @@ -1375,7 +1375,7 @@ \tex_advance:D #8 -\c_one_thousand_million \fi: } -\cs_new_protected_nopar:Npn \fp_sub:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_sub:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { #7 \int_eval:w #1 - #4 \int_eval_end: #8 \int_eval:w #2 - #5 \int_eval_end: @@ -1398,7 +1398,7 @@ \fi: \fi: } -\cs_new_protected_nopar:Npn \fp_mul:NNNNNN #1#2#3#4#5#6 +\cs_new_protected:Npn \fp_mul:NNNNNN #1#2#3#4#5#6 { \fp_mul_split:NNNN #1 \l_fp_mul_a_i_int \l_fp_mul_a_ii_int \l_fp_mul_a_iii_int @@ -1442,7 +1442,7 @@ \fp_mul_end_level: #5 0 \l_fp_mul_output_tl \scan_stop: } -\cs_new_protected_nopar:Npn \fp_mul:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_mul:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \fp_mul_split:NNNN #2 \l_fp_mul_a_i_int \l_fp_mul_a_ii_int \l_fp_mul_a_iii_int @@ -1502,7 +1502,7 @@ \fp_mul_end_level: #7 0 \l_fp_mul_output_tl \scan_stop: } -\cs_new_protected_nopar:Npn \fp_div_integer:NNNNN #1#2#3#4#5 +\cs_new_protected:Npn \fp_div_integer:NNNNN #1#2#3#4#5 { \l_fp_tmp_int #1 \tex_divide:D \l_fp_tmp_int #3 @@ -1534,7 +1534,7 @@ \exp_after:wN \fp_extended_normalise_aux_i: \fi: } -\cs_new_protected_nopar:Npn \fp_extended_normalise_aux_i:w +\cs_new_protected:Npn \fp_extended_normalise_aux_i:w #1#2#3#4#5#6#7#8#9 \q_stop { \l_fp_input_a_integer_int @@ -1544,7 +1544,7 @@ \exp_after:wN \fp_extended_normalise_aux_ii:w \int_use:N \l_fp_input_a_extended_int \q_stop } -\cs_new_protected_nopar:Npn \fp_extended_normalise_aux_ii:w +\cs_new_protected:Npn \fp_extended_normalise_aux_ii:w #1#2#3#4#5#6#7#8#9 \q_stop { \l_fp_input_a_decimal_int @@ -1562,7 +1562,7 @@ \exp_after:wN \fp_extended_normalise_aux_ii: \fi: } -\cs_new_protected_nopar:Npn \fp_extended_normalise_ii_aux:NNNNNNNNN +\cs_new_protected:Npn \fp_extended_normalise_ii_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \if_int_compare:w \l_fp_input_a_integer_int = \c_zero @@ -1595,7 +1595,7 @@ \exp_after:wN \fp_extended_normalise_output: \fi: } -\cs_new_protected_nopar:Npn \fp_extended_normalise_output_aux_i:NNNNNNNNN +\cs_new_protected:Npn \fp_extended_normalise_output_aux_i:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \l_fp_output_integer_int #1#2#3#4#5#6#7#8 \scan_stop: @@ -1609,13 +1609,13 @@ \exp_after:wN \fp_extended_normalise_output_aux_ii:NNNNNNNNN \l_fp_tmp_tl } -\cs_new_protected_nopar:Npn \fp_extended_normalise_output_aux_ii:NNNNNNNNN +\cs_new_protected:Npn \fp_extended_normalise_output_aux_ii:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \l_fp_output_decimal_int #1#2#3#4#5#6#7#8#9 \scan_stop: \fp_extended_normalise_output_aux:N } -\cs_new_protected_nopar:Npn \fp_extended_normalise_output_aux:N #1 +\cs_new_protected:Npn \fp_extended_normalise_output_aux:N #1 { \tex_advance:D \l_fp_output_extended_int \c_one_thousand_million \tex_divide:D \l_fp_output_extended_int \c_ten @@ -1665,7 +1665,7 @@ \fi: \fi: } -\cs_new_protected_nopar:Npn \fp_trig_sub:NNN #1#2#3 +\cs_new_protected:Npn \fp_trig_sub:NNN #1#2#3 { \l_fp_input_a_integer_int \int_eval:w \l_fp_input_a_integer_int - #1 \int_eval_end: @@ -1763,7 +1763,7 @@ \cs_new_protected_nopar:Npn \fp_gsin:Nn { \fp_sin_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_sin:Nn { c } \cs_generate_variant:Nn \fp_gsin:Nn { c } -\cs_new_protected_nopar:Npn \fp_sin_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_sin_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -1860,7 +1860,7 @@ \cs_new_protected_nopar:Npn \fp_gcos:Nn { \fp_cos_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_cos:Nn { c } \cs_generate_variant:Nn \fp_gcos:Nn { c } -\cs_new_protected_nopar:Npn \fp_cos_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_cos_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -2061,7 +2061,7 @@ \cs_new_protected_nopar:Npn \fp_gtan:Nn { \fp_tan_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_tan:Nn { c } \cs_generate_variant:Nn \fp_gtan:Nn { c } -\cs_new_protected_nopar:Npn \fp_tan_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_tan_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -2254,7 +2254,7 @@ \cs_new_protected_nopar:Npn \fp_gexp:Nn { \fp_exp_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_exp:Nn { c } \cs_generate_variant:Nn \fp_gexp:Nn { c } -\cs_new_protected_nopar:Npn \fp_exp_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_exp_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -2425,13 +2425,13 @@ \fi: \fp_exp_decimal: } -\cs_new_protected_nopar:Npn \fp_exp_integer_const:n #1 +\cs_new_protected:Npn \fp_exp_integer_const:n #1 { \exp_after:wN \exp_after:wN \exp_after:wN \fp_exp_integer_const:nnnn \cs:w c_fp_exp_ #1 _tl \cs_end: } -\cs_new_protected_nopar:Npn \fp_exp_integer_const:nnnn #1#2#3#4 +\cs_new_protected:Npn \fp_exp_integer_const:nnnn #1#2#3#4 { \l_fp_exp_integer_int #1 \scan_stop: \l_fp_exp_decimal_int #2 \scan_stop: @@ -2550,7 +2550,7 @@ \exp_after:wN \fp_exp_Taylor: \fi: } -\cs_new_protected_nopar:Npn \fp_exp_const:Nx #1#2 +\cs_new_protected:Npn \fp_exp_const:Nx #1#2 { \tl_new:N #1 \tl_gset:Nx #1 {#2} @@ -2572,7 +2572,7 @@ \cs_new_protected_nopar:Npn \fp_gln:Nn { \fp_ln_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_ln:Nn { c } \cs_generate_variant:Nn \fp_gln:Nn { c } -\cs_new_protected_nopar:Npn \fp_ln_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_ln_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -2588,7 +2588,7 @@ > \c_zero \exp_after:wN \exp_after:wN \exp_after:wN \fp_ln_aux: \else: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 \exp_not:N ##2 { \c_zero_fp } @@ -2596,7 +2596,7 @@ \exp_after:wN \exp_after:wN \exp_after:wN \fp_ln_error_msg: \fi: \else: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 \exp_not:N ##2 { \c_zero_fp } @@ -2622,7 +2622,7 @@ \else: \exp_after:wN \fp_ln_exponent: \fi: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 \exp_not:N ##2 @@ -2682,7 +2682,7 @@ \fi: \fp_ln_exponent_units: } -\cs_new_protected_nopar:Npn \fp_ln_exponent_tens:NN #1 #2 +\cs_new_protected:Npn \fp_ln_exponent_tens:NN #1 #2 { \l_fp_input_a_exponent_int #2 \scan_stop: \fp_ln_const:nn { 10 } { #1 } @@ -2718,7 +2718,7 @@ \l_fp_output_exponent_int \l_fp_exp_exponent_int \fi: } -\cs_new_protected_nopar:Npn \fp_ln_normalise_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_ln_normalise_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \if_int_compare:w \l_fp_exp_integer_int = \c_zero \l_fp_exp_decimal_int #1#2#3#4#5#6#7#8 \scan_stop: @@ -2785,7 +2785,7 @@ \tex_divide:D \l_fp_input_a_decimal_int \c_two \tex_divide:D \l_fp_input_a_extended_int \c_two } -\cs_new_protected_nopar:Npn \fp_ln_const:nn #1#2 +\cs_new_protected:Npn \fp_ln_const:nn #1#2 { \exp_after:wN \exp_after:wN \exp_after:wN \fp_exp_integer_const:nnnn @@ -2855,7 +2855,7 @@ \exp_after:wN \fp_ln_fixed: \fi: } -\cs_new_protected_nopar:Npn \fp_ln_fixed_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_ln_fixed_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \if_int_compare:w \l_fp_output_integer_int = \c_zero \l_fp_output_decimal_int #1#2#3#4#5#6#7#8 \scan_stop: @@ -2906,7 +2906,7 @@ \cs_new_protected_nopar:Npn \fp_gpow:Nn { \fp_pow_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_pow:Nn { c } \cs_generate_variant:Nn \fp_gpow:Nn { c } -\cs_new_protected_nopar:Npn \fp_pow_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_pow_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -2928,13 +2928,13 @@ \int_eval:w \l_fp_input_a_integer_int + \l_fp_input_a_decimal_int = \c_zero - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 { \c_undefined_fp } } \else: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 { \c_zero_fp } @@ -2945,7 +2945,7 @@ \int_eval:w \l_fp_input_a_integer_int + \l_fp_input_a_decimal_int = \c_zero - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 { \c_one_fp } @@ -2978,14 +2978,14 @@ \exp_after:wN \fp_pow_aux_ii: \else: \group_end: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 { \c_undefined_fp } } \fi: \else: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 { \c_undefined_fp } @@ -3031,7 +3031,7 @@ \fp_pow_aux_iv: \fi: \fi: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 @@ -3150,7 +3150,7 @@ \fp_read:N #1 \fp_compare_aux:N #2 } -\cs_new_protected_nopar:Npn \fp_compare_aux:N #1 +\cs_new_protected:Npn \fp_compare_aux:N #1 { \cs_if_exist:cTF { fp_compare_#1: } { \use:c { fp_compare_#1: } } @@ -3336,43 +3336,43 @@ } \l_fp_tmp_tl } -\cs_new_protected_nopar:Npn \fp_compare_aux_i:w #1 == #2 == #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_i:w #1 == #2 == #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_ii:w #1 != \q_nil != \q_stop } { \fp_compare:nNnTF {#1} = {#2} \prg_return_true: \prg_return_false: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_ii:w #1 != #2 != #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_ii:w #1 != #2 != #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_iii:w #1 <= \q_nil <= \q_stop } { \fp_compare:nNnTF {#1} = {#2} \prg_return_false: \prg_return_true: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_iii:w #1 <= #2 <= #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_iii:w #1 <= #2 <= #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_iv:w #1 >= \q_nil >= \q_stop } { \fp_compare:nNnTF {#1} > {#2} \prg_return_false: \prg_return_true: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_iv:w #1 >= #2 >= #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_iv:w #1 >= #2 >= #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_v:w #1 = \q_nil \q_stop } { \fp_compare:nNnTF {#1} < {#2} \prg_return_false: \prg_return_true: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_v:w #1 = #2 = #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_v:w #1 = #2 = #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_vi:w #1 < \q_nil < \q_stop } { \fp_compare:nNnTF {#1} = {#2} \prg_return_true: \prg_return_false: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_vi:w #1 < #2 < #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_vi:w #1 < #2 < #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_vii:w #1 > \q_nil > \q_stop } { \fp_compare:nNnTF {#1} < {#2} \prg_return_true: \prg_return_false: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_vii:w #1 > #2 > #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_vii:w #1 > #2 > #3 \q_stop { \quark_if_nil:nTF {#2} { \prg_return_false: } diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty index b5f57e66b05..eaf62805f81 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3int.dtx 3029 2011-12-06 22:47:30Z joseph $ +\GetIdInfo$Id: l3int.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental integers} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -120,7 +120,7 @@ #1 - \int_div_truncate:nn {#1} {#2} * ( #2 ) \int_eval_end: } -\cs_new_protected_nopar:Npn \int_new:N #1 +\cs_new_protected:Npn \int_new:N #1 { \chk_if_free_cs:N #1 \newcount #1 @@ -130,14 +130,14 @@ { \int_compare:nNnTF {#2} > \c_minus_one { - \int_compare:nNnTF {#2} > \c_max_register_int + \int_compare:nNnTF {#2} > \c_max_const_int { \int_new:N #1 \int_gset:Nn #1 {#2} } { \chk_if_free_cs:N #1 - \tex_global:D \tex_mathchardef:D #1 = + \tex_global:D \int_constdef:Nw #1 = \int_eval:w #2 \int_eval_end: } } @@ -147,14 +147,29 @@ } } \cs_generate_variant:Nn \int_const:Nn { c } -\cs_new_protected_nopar:Npn \int_zero:N #1 { #1 = \c_zero } -\cs_new_protected_nopar:Npn \int_gzero:N #1 { \tex_global:D #1 = \c_zero } +\pdftex_if_engine:TF + { + \cs_new_eq:NN \int_constdef:Nw \tex_mathchardef:D + \tex_mathchardef:D \c_max_const_int 32 767 ~ + } + { + \cs_new_eq:NN \int_constdef:Nw \tex_chardef:D + \tex_chardef:D \c_max_const_int 1 114 111 ~ + } +\cs_new_protected:Npn \int_zero:N #1 { #1 = \c_zero } +\cs_new_protected:Npn \int_gzero:N #1 { \tex_global:D #1 = \c_zero } \cs_generate_variant:Nn \int_zero:N { c } \cs_generate_variant:Nn \int_gzero:N { c } -\cs_new_protected_nopar:Npn \int_set_eq:NN #1#2 { #1 = #2 } +\cs_new_protected:Npn \int_zero_new:N #1 + { \cs_if_exist:NTF #1 { \int_zero:N #1 } { \int_new:N #1 } } +\cs_new_protected:Npn \int_gzero_new:N #1 + { \cs_if_exist:NTF #1 { \int_gzero:N #1 } { \int_new:N #1 } } +\cs_generate_variant:Nn \int_zero_new:N { c } +\cs_generate_variant:Nn \int_gzero_new:N { c } +\cs_new_protected:Npn \int_set_eq:NN #1#2 { #1 = #2 } \cs_generate_variant:Nn \int_set_eq:NN { c } \cs_generate_variant:Nn \int_set_eq:NN { Nc , cc } -\cs_new_protected_nopar:Npn \int_gset_eq:NN #1#2 { \tex_global:D #1 = #2 } +\cs_new_protected:Npn \int_gset_eq:NN #1#2 { \tex_global:D #1 = #2 } \cs_generate_variant:Nn \int_gset_eq:NN { c } \cs_generate_variant:Nn \int_gset_eq:NN { Nc , cc } \cs_new_protected:Npn \int_add:Nn #1#2 @@ -169,9 +184,9 @@ \cs_generate_variant:Nn \int_gadd:Nn { c } \cs_generate_variant:Nn \int_sub:Nn { c } \cs_generate_variant:Nn \int_gsub:Nn { c } -\cs_new_protected_nopar:Npn \int_incr:N #1 +\cs_new_protected:Npn \int_incr:N #1 { \tex_advance:D #1 \c_one } -\cs_new_protected_nopar:Npn \int_decr:N #1 +\cs_new_protected:Npn \int_decr:N #1 { \tex_advance:D #1 \c_minus_one } \cs_new_protected_nopar:Npn \int_gincr:N { \tex_global:D \int_incr:N } @@ -495,7 +510,7 @@ \exp_after:wN \int_to_roman_aux:N \int_to_roman:w \int_eval:n {#1} Q } -\cs_new_nopar:Npn \int_to_roman_aux:N #1 +\cs_new:Npn \int_to_roman_aux:N #1 { \use:c { int_to_roman_ #1 :w } \int_to_roman_aux:N @@ -505,7 +520,7 @@ \exp_after:wN \int_to_Roman_aux:N \int_to_roman:w \int_eval:n {#1} Q } -\cs_new_nopar:Npn \int_to_Roman_aux:N #1 +\cs_new:Npn \int_to_Roman_aux:N #1 { \use:c { int_to_Roman_ #1 :w } \int_to_Roman_aux:N @@ -525,7 +540,7 @@ \cs_new_nopar:Npn \int_to_Roman_c:w { C } \cs_new_nopar:Npn \int_to_Roman_d:w { D } \cs_new_nopar:Npn \int_to_Roman_m:w { M } -\cs_new_nopar:Npn \int_to_Roman_Q:w #1 { } +\cs_new:Npn \int_to_Roman_Q:w #1 { } \cs_new:Npn \int_get_sign:n #1 { \int_get_sign_and_digits_aux:nNNN {#1} @@ -631,7 +646,7 @@ \int_const:cn { c_int_from_roman_C_int } { 100 } \int_const:cn { c_int_from_roman_D_int } { 500 } \int_const:cn { c_int_from_roman_M_int } { 1000 } -\cs_new_nopar:Npn \int_from_roman:n #1 +\cs_new:Npn \int_from_roman:n #1 { \tl_if_blank:nF {#1} { @@ -640,7 +655,7 @@ \int_from_roman_aux:NN #1 Q \q_stop } } -\cs_new_nopar:Npn \int_from_roman_aux:NN #1#2 +\cs_new:Npn \int_from_roman_aux:NN #1#2 { \str_if_eq:nnTF {#1} { Q } {#1#2} @@ -674,9 +689,9 @@ } } } -\cs_new_nopar:Npn \int_from_roman_end:w #1 Q #2 \q_stop +\cs_new:Npn \int_from_roman_end:w #1 Q #2 \q_stop { \tl_if_empty:nTF {#2} {#1} {#2} } -\cs_new_nopar:Npn \int_from_roman_clean_up:w #1 Q { + 0 Q -1 } +\cs_new:Npn \int_from_roman_clean_up:w #1 Q { + 0 Q -1 } \cs_new_eq:NN \int_show:N \kernel_register_show:N \cs_new_eq:NN \int_show:c \kernel_register_show:c \cs_new_protected:Npn \int_show:n #1 diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3io.sty b/Master/texmf-dist/tex/latex/l3kernel/l3io.sty index c074dbf0ea2..685dd7ca945 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3io.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3io.sty @@ -46,16 +46,15 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3io.dtx 3005 2011-11-25 13:19:47Z bruno $ +\GetIdInfo$Id: l3io.dtx 3096 2011-12-27 09:09:18Z joseph $ {L3 Experimental input-output operations} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \package_check_loaded_expl: \cs_new_eq:NN \if_eof:w \tex_ifeof:D -\cs_new_eq:NN \c_iow_term_stream \c_sixteen -\cs_new_eq:NN \c_ior_term_stream \c_sixteen -\cs_new_eq:NN \c_iow_log_stream \c_minus_one -\cs_new_eq:NN \c_ior_log_stream \c_minus_one +\cs_new_eq:NN \c_term_ior \c_sixteen +\cs_new_eq:NN \c_log_iow \c_minus_one +\cs_new_eq:NN \c_term_iow \c_sixteen \tl_const:Nn \c_iow_streams_tl { \c_zero @@ -88,34 +87,30 @@ \cs_set_eq:NN \ior_raw_new:N \newread \cs_generate_variant:Nn \ior_raw_new:N { c } \cs_generate_variant:Nn \iow_raw_new:N { c } -\cs_new_protected_nopar:Npn \ior_new:N #1 - { - \chk_if_free_cs:N #1 - \tex_global:D \tex_chardef:D #1 16 ~ - } -\cs_new_eq:NN \iow_new:N \ior_new:N +\cs_new_protected:Npn \ior_new:N #1 { \cs_new_eq:NN #1 \c_term_ior } \cs_generate_variant:Nn \ior_new:N { c } +\cs_new_protected:Npn \iow_new:N #1 { \cs_new_eq:NN #1 \c_term_iow } \cs_generate_variant:Nn \iow_new:N { c } -\cs_new_protected_nopar:Npn \ior_open:Nn #1#2 +\cs_new_protected:Npn \ior_open:Nn #1#2 { \ior_close:N #1 \int_set:Nn \l_ior_stream_int \c_sixteen \tl_map_function:NN \c_ior_streams_tl \ior_alloc_read:n \int_compare:nNnTF \l_ior_stream_int = \c_sixteen - { \msg_kernel_error:nn { ior } { streams-exhausted } } + { \msg_kernel_fatal:nn { ior } { streams-exhausted } } { \ior_stream_alloc:N #1 \prop_gput:NVn \g_ior_streams_prop \l_ior_stream_int {#2} \tex_openin:D #1#2 \scan_stop: } } -\cs_new_protected_nopar:Npn \iow_open:Nn #1#2 +\cs_new_protected:Npn \iow_open:Nn #1#2 { \iow_close:N #1 \int_set:Nn \l_iow_stream_int \c_sixteen \tl_map_function:NN \c_iow_streams_tl \iow_alloc_write:n \int_compare:nNnTF \l_iow_stream_int = \c_sixteen - { \msg_kernel_error:nn { iow } { streams-exhausted } } + { \msg_kernel_fatal:nn { iow } { streams-exhausted } } { \iow_stream_alloc:N #1 \prop_gput:NVn \g_iow_streams_prop \l_iow_stream_int {#2} @@ -124,7 +119,7 @@ } \cs_generate_variant:Nn \ior_open:Nn { c } \cs_generate_variant:Nn \iow_open:Nn { c } -\cs_new_protected_nopar:Npn \iow_alloc_write:n #1 +\cs_new_protected:Npn \iow_alloc_write:n #1 { \prop_if_in:NnF \g_iow_streams_prop {#1} { @@ -132,7 +127,7 @@ \tl_map_break: } } -\cs_new_protected_nopar:Npn \ior_alloc_read:n #1 +\cs_new_protected:Npn \ior_alloc_read:n #1 { \prop_if_in:NnF \g_iow_streams_prop {#1} { @@ -140,21 +135,20 @@ \tl_map_break: } } -\cs_new_protected_nopar:Npn \iow_stream_alloc:N #1 +\cs_new_protected:Npn \iow_stream_alloc:N #1 { - \cs_if_exist:cTF { g_iow_ \int_use:N \l_iow_stream_int _stream } - { \cs_gset_eq:Nc #1 { g_iow_ \int_use:N \l_iow_stream_int _stream } } + \cs_if_exist:cTF { g_iow_ \int_use:N \l_iow_stream_int _iow } + { \cs_gset_eq:Nc #1 { g_iow_ \int_use:N \l_iow_stream_int _iow } } { \iow_stream_alloc_aux: \int_compare:nNnT \l_iow_stream_int = \c_sixteen { - \iow_raw_new:N \g_iow_tmp_stream - \int_set:Nn \l_iow_stream_int { \g_iow_tmp_stream } + \iow_raw_new:N \g_iow_tmp_iow + \int_set:Nn \l_iow_stream_int { \g_iow_tmp_iow } \cs_gset_eq:cN - { g_iow_ \int_use:N \l_iow_stream_int _stream } - \g_iow_tmp_stream + { g_iow_ \int_use:N \l_iow_stream_int _iow } \g_iow_tmp_iow } - \cs_gset_eq:Nc #1 { g_iow_ \int_use:N \l_iow_stream_int _stream } + \cs_gset_eq:Nc #1 { g_iow_ \int_use:N \l_iow_stream_int _iow } } } \cs_new_protected_nopar:Npn \iow_stream_alloc_aux: @@ -162,7 +156,7 @@ \int_incr:N \l_iow_stream_int \int_compare:nNnT \l_iow_stream_int < \c_sixteen { - \cs_if_exist:cTF { g_iow_ \int_use:N \l_iow_stream_int _stream } + \cs_if_exist:cTF { g_iow_ \int_use:N \l_iow_stream_int _iow } { \prop_if_in:NVT \g_iow_streams_prop \l_iow_stream_int { \iow_stream_alloc_aux: } @@ -170,21 +164,20 @@ { \iow_stream_alloc_aux: } } } -\cs_new_protected_nopar:Npn \ior_stream_alloc:N #1 +\cs_new_protected:Npn \ior_stream_alloc:N #1 { - \cs_if_exist:cTF { g_ior_ \int_use:N \l_ior_stream_int _stream } - { \cs_gset_eq:Nc #1 { g_ior_ \int_use:N \l_ior_stream_int _stream } } + \cs_if_exist:cTF { g_ior_ \int_use:N \l_ior_stream_int _ior } + { \cs_gset_eq:Nc #1 { g_ior_ \int_use:N \l_ior_stream_int _ior } } { \ior_stream_alloc_aux: \int_compare:nNnT \l_ior_stream_int = \c_sixteen { - \ior_raw_new:N \g_ior_tmp_stream - \int_set:Nn \l_ior_stream_int { \g_ior_tmp_stream } + \ior_raw_new:N \g_ior_tmp_ior + \int_set:Nn \l_ior_stream_int { \g_ior_tmp_ior } \cs_gset_eq:cN - { g_ior_ \int_use:N \l_iow_stream_int _stream } - \g_ior_tmp_stream + { g_ior_ \int_use:N \l_iow_stream_int _ior } \g_ior_tmp_ior } - \cs_gset_eq:Nc #1 { g_ior_ \int_use:N \l_ior_stream_int _stream } + \cs_gset_eq:Nc #1 { g_ior_ \int_use:N \l_ior_stream_int _ior } } } \cs_new_protected_nopar:Npn \ior_stream_alloc_aux: @@ -192,7 +185,7 @@ \int_incr:N \l_ior_stream_int \int_compare:nNnT \l_ior_stream_int < \c_sixteen { - \cs_if_exist:cTF { g_ior_ \int_use:N \l_ior_stream_int _stream } + \cs_if_exist:cTF { g_ior_ \int_use:N \l_ior_stream_int _ior } { \prop_if_in:NVT \g_ior_streams_prop \l_ior_stream_int { \ior_stream_alloc_aux: } @@ -200,7 +193,7 @@ { \ior_stream_alloc_aux: } } } -\cs_new_protected_nopar:Npn \ior_close:N #1 +\cs_new_protected:Npn \ior_close:N #1 { \cs_if_exist:NT #1 { @@ -209,11 +202,11 @@ \int_compare:nNnF #1 = \c_sixteen { \tex_closein:D #1 } \prop_gdel:NV \g_ior_streams_prop #1 - \tex_global:D \tex_chardef:D #1 16 ~ + \cs_gset_eq:NN #1 \c_term_ior } } } -\cs_new_protected_nopar:Npn \iow_close:N #1 +\cs_new_protected:Npn \iow_close:N #1 { \cs_if_exist:NT #1 { @@ -222,7 +215,7 @@ \int_compare:nNnF #1 = \c_sixteen { \tex_closein:D #1 } \prop_gdel:NV \g_iow_streams_prop #1 - \tex_global:D \tex_chardef:D #1 16 ~ + \cs_gset_eq:NN #1 \c_term_iow } } } @@ -255,19 +248,19 @@ } \cs_new_eq:NN \iow_shipout_x:Nn \tex_write:D \cs_generate_variant:Nn \iow_shipout_x:Nn { Nx } -\cs_new_protected_nopar:Npn \iow_shipout:Nn #1#2 +\cs_new_protected:Npn \iow_shipout:Nn #1#2 { \iow_shipout_x:Nn #1 { \exp_not:n {#2} } } \cs_generate_variant:Nn \iow_shipout:Nn { Nx } \cs_new_protected_nopar:Npn \iow_now:Nx { \tex_immediate:D \iow_shipout_x:Nn } -\cs_new_protected_nopar:Npn \iow_now:Nn #1#2 +\cs_new_protected:Npn \iow_now:Nn #1#2 { \iow_now:Nx #1 { \exp_not:n {#2} } } -\cs_set_protected_nopar:Npn \iow_log:x { \iow_now:Nx \c_iow_log_stream } -\cs_new_protected_nopar:Npn \iow_log:n { \iow_now:Nn \c_iow_log_stream } -\cs_set_protected_nopar:Npn \iow_term:x { \iow_now:Nx \c_iow_term_stream } -\cs_new_protected_nopar:Npn \iow_term:n { \iow_now:Nn \c_iow_term_stream } -\cs_new_protected_nopar:Npn \iow_now_when_avail:Nn #1 +\cs_set_protected_nopar:Npn \iow_log:x { \iow_now:Nx \c_log_iow } +\cs_new_protected_nopar:Npn \iow_log:n { \iow_now:Nn \c_log_iow } +\cs_set_protected_nopar:Npn \iow_term:x { \iow_now:Nx \c_term_iow } +\cs_new_protected_nopar:Npn \iow_term:n { \iow_now:Nn \c_term_iow } +\cs_new_protected:Npn \iow_now_when_avail:Nn #1 { \cs_if_free:NTF #1 { \use_none:n } { \iow_now:Nn #1 } } -\cs_new_protected_nopar:Npn \iow_now_when_avail:Nx #1 +\cs_new_protected:Npn \iow_now_when_avail:Nx #1 { \cs_if_free:NTF #1 { \use_none:n } { \iow_now:Nx #1 } } \cs_new_nopar:Npn \iow_newline: { ^^J } \cs_new_eq:NN \iow_char:N \cs_to_str:N @@ -394,7 +387,7 @@ \tl_set:Nx \l_iow_current_line_tl { \l_iow_current_indentation_tl \l_iow_current_word_tl } } -\cs_new_protected_nopar:Npn \iow_wrap_special:w #1 ~ #2 ~ #3 ~ % +\cs_new_protected:Npn \iow_wrap_special:w #1 ~ #2 ~ #3 ~ % { \use:c { iow_wrap_#1: } \str_if_eq:xxTF { #2~#3 } { ~ \c_iow_wrap_marker_tl } @@ -461,13 +454,13 @@ } { \prg_return_true: } } -\cs_new_protected_nopar:Npn \ior_to:NN #1#2 +\cs_new_protected:Npn \ior_to:NN #1#2 { \tex_read:D #1 to #2 } -\cs_new_protected_nopar:Npn \ior_gto:NN #1#2 +\cs_new_protected:Npn \ior_gto:NN #1#2 { \tex_global:D \tex_read:D #1 to #2 } -\cs_new_protected_nopar:Npn \ior_str_to:NN #1#2 +\cs_new_protected:Npn \ior_str_to:NN #1#2 { \etex_readline:D #1 to #2 } -\cs_new_protected_nopar:Npn \ior_str_gto:NN #1#2 +\cs_new_protected:Npn \ior_str_gto:NN #1#2 { \tex_global:D \etex_readline:D #1 to #2 } %% %% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty index 721a7ecc09d..aab64765fa0 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3keys.dtx 2800 2011-09-10 16:54:36Z will $ +\GetIdInfo$Id: l3keys.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental key-value interfaces} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -181,7 +181,7 @@ \tl_set:Nn \l_keys_module_tl {#1} } \cs_generate_variant:Nn \keys_define_aux:nnn { o } -\cs_new_protected_nopar:Npn \keys_define_elt:n #1 +\cs_new_protected:Npn \keys_define_elt:n #1 { \bool_set_true:N \l_keys_no_value_bool \keys_define_elt_aux:nn {#1} { } @@ -200,14 +200,14 @@ { \l_keys_property_tl } { \l_keys_path_tl } } } -\cs_new_protected_nopar:Npn \keys_property_find:n #1 +\cs_new_protected:Npn \keys_property_find:n #1 { \tl_set:Nx \l_keys_path_tl { \l_keys_module_tl / } \tl_if_in:nnTF {#1} { . } { \keys_property_find_aux:w #1 \q_stop } { \msg_kernel_error:nnx { keys } { key-no-property } {#1} } } -\cs_new_protected_nopar:Npn \keys_property_find_aux:w #1 . #2 \q_stop +\cs_new_protected:Npn \keys_property_find_aux:w #1 . #2 \q_stop { \tl_set:Nx \l_keys_path_tl { \l_keys_path_tl \tl_to_str:n {#1} } \tl_if_in:nnTF {#2} { . } @@ -234,7 +234,7 @@ } \cs_new_protected:Npn \keys_define_key_aux:w #1 : #2 \q_stop { \tl_if_empty:nTF {#2} } -\cs_new_nopar:Npn \keys_bool_set:NN #1#2 +\cs_new:Npn \keys_bool_set:NN #1#2 { \cs_if_exist:NF #1 { \bool_new:N #1 } \keys_choice_make: @@ -249,7 +249,7 @@ } \keys_default_set:n { true } } -\cs_new_nopar:Npn \keys_bool_set_inverse:NN #1#2 +\cs_new:Npn \keys_bool_set_inverse:NN #1#2 { \cs_if_exist:NF #1 { \bool_new:N #1 } \keys_choice_make: @@ -304,7 +304,7 @@ { generate-choices-before-code } { \l_keys_path_tl } } } -\cs_new_protected_nopar:Npn \keys_choices_generate_aux:n #1 +\cs_new_protected:Npn \keys_choices_generate_aux:n #1 { \keys_cmd_set:nx { \l_keys_path_tl / #1 } { @@ -337,7 +337,7 @@ \keys_cmd_set_aux:n {#1} \cs_set:cpx { \c_keys_code_root_tl #1 } ##1 {#2} } -\cs_new_protected_nopar:Npn \keys_cmd_set_aux:n #1 +\cs_new_protected:Npn \keys_cmd_set_aux:n #1 { \tl_clear_new:c { \c_keys_vars_root_tl #1 .default } \tl_set:cn { \c_keys_vars_root_tl #1 .default } { \q_no_value } @@ -346,17 +346,17 @@ \cs_new_protected:Npn \keys_default_set:n #1 { \tl_set:cn { \c_keys_vars_root_tl \l_keys_path_tl .default } {#1} } \cs_generate_variant:Nn \keys_default_set:n { V } -\cs_new_protected_nopar:Npn \keys_meta_make:n #1 +\cs_new_protected:Npn \keys_meta_make:n #1 { \exp_args:NNo \keys_cmd_set:nn \l_keys_path_tl { \exp_after:wN \keys_set:nn \exp_after:wN { \l_keys_module_tl } {#1} } } -\cs_new_protected_nopar:Npn \keys_meta_make:x #1 +\cs_new_protected:Npn \keys_meta_make:x #1 { \keys_cmd_set:nx { \l_keys_path_tl } { \exp_not:N \keys_set:nn { \l_keys_module_tl } {#1} } } -\cs_new_nopar:Npn \keys_multichoice_find:n #1 +\cs_new:Npn \keys_multichoice_find:n #1 { \clist_map_function:nN {#1} \keys_choice_find:n } \cs_new_protected_nopar:Npn \keys_multichoice_make: { @@ -384,29 +384,29 @@ \int_incr:N \l_keys_choice_int } } -\cs_new_protected_nopar:Npn \keys_value_requirement:n #1 +\cs_new_protected:Npn \keys_value_requirement:n #1 { \tl_set_eq:cc { \c_keys_vars_root_tl \l_keys_path_tl .req } { c_keys_value_ #1 _tl } } -\cs_new_protected_nopar:Npn \keys_variable_set:NnNN #1#2#3#4 +\cs_new_protected:Npn \keys_variable_set:NnNN #1#2#3#4 { \cs_if_exist:NF #1 { \use:c { #2 _new:N } #1 } \keys_cmd_set:nx { \l_keys_path_tl } { \exp_not:c { #2 _ #3 set:N #4 } \exp_not:N #1 {##1} } } -\cs_new_protected_nopar:Npn \keys_variable_set:NnN #1#2#3 +\cs_new_protected:Npn \keys_variable_set:NnN #1#2#3 { \keys_variable_set:NnNN #1 {#2} { } #3 } \cs_generate_variant:Nn \keys_variable_set:NnNN { c } \cs_generate_variant:Nn \keys_variable_set:NnN { c } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .bool_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .bool_set:N } #1 { \keys_bool_set:NN #1 { } } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .bool_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .bool_gset:N } #1 { \keys_bool_set:NN #1 g } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .bool_set_inverse:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .bool_set_inverse:N } #1 { \keys_bool_set_inverse:NN #1 { } } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .bool_gset_inverse:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .bool_gset_inverse:N } #1 { \keys_bool_set_inverse:NN #1 g } \cs_new_protected_nopar:cpn { \c_keys_props_root_tl .choice: } { \keys_choice_make: } @@ -420,43 +420,43 @@ { \keys_choice_code_store:x { \exp_not:n {#1} } } \cs_new_protected:cpn { \c_keys_props_root_tl .choice_code:x } #1 { \keys_choice_code_store:x {#1} } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .clist_set:N } #1 { \keys_variable_set:NnN #1 { clist } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .clist_set:c } #1 { \keys_variable_set:cnN {#1} { clist } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .clist_gset:N } #1 { \keys_variable_set:NnNN #1 { clist } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .clist_gset:c } #1 { \keys_variable_set:cnNN {#1} { clist } g n } \cs_new_protected:cpn { \c_keys_props_root_tl .default:n } #1 { \keys_default_set:n {#1} } \cs_new_protected:cpn { \c_keys_props_root_tl .default:V } #1 { \keys_default_set:V #1 } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .dim_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .dim_set:N } #1 { \keys_variable_set:NnN #1 { dim } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .dim_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .dim_set:c } #1 { \keys_variable_set:cnN {#1} { dim } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .dim_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .dim_gset:N } #1 { \keys_variable_set:NnNN #1 { dim } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .dim_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .dim_gset:c } #1 { \keys_variable_set:cnNN {#1} { dim } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .fp_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .fp_set:N } #1 { \keys_variable_set:NnN #1 { fp } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .fp_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .fp_set:c } #1 { \keys_variable_set:cnN {#1} { fp } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .fp_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .fp_gset:N } #1 { \keys_variable_set:NnNN #1 { fp } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .fp_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .fp_gset:c } #1 { \keys_variable_set:cnNN {#1} { fp } g n } \cs_new_protected:cpn { \c_keys_props_root_tl .generate_choices:n } #1 { \keys_choices_generate:n {#1} } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .int_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .int_set:N } #1 { \keys_variable_set:NnN #1 { int } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .int_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .int_set:c } #1 { \keys_variable_set:cnN {#1} { int } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .int_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .int_gset:N } #1 { \keys_variable_set:NnNN #1 { int } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .int_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .int_gset:c } #1 { \keys_variable_set:cnNN {#1} { int } g n } \cs_new_protected:cpn { \c_keys_props_root_tl .meta:n } #1 { \keys_meta_make:n {#1} } @@ -466,29 +466,29 @@ { \keys_multichoice_make: } \cs_new_protected:cpn { \c_keys_props_root_tl .multichoices:nn } #1 { \keys_multichoices_make:nn #1 } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .skip_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .skip_set:N } #1 { \keys_variable_set:NnN #1 { skip } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .skip_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .skip_set:c } #1 { \keys_variable_set:cnN {#1} { skip } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .skip_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .skip_gset:N } #1 { \keys_variable_set:NnNN #1 { skip } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .skip_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .skip_gset:c } #1 { \keys_variable_set:cnNN {#1} { skip } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_set:N } #1 { \keys_variable_set:NnN #1 { tl } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_set:c } #1 { \keys_variable_set:cnN {#1} { tl } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_set_x:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_set_x:N } #1 { \keys_variable_set:NnN #1 { tl } x } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_set_x:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_set_x:c } #1 { \keys_variable_set:cnN {#1} { tl } x } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_gset:N } #1 { \keys_variable_set:NnNN #1 { tl } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_gset:c } #1 { \keys_variable_set:cnNN {#1} { tl } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_gset_x:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_gset_x:N } #1 { \keys_variable_set:NnNN #1 { tl } g x } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_gset_x:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_gset_x:c } #1 { \keys_variable_set:cnNN {#1} { tl } g x } \cs_new_protected_nopar:cpn { \c_keys_props_root_tl .value_forbidden: } { \keys_value_requirement:n { forbidden } } @@ -518,7 +518,7 @@ } \cs_generate_variant:Nn \keys_set_known:nnN { nV , nv , no } \cs_generate_variant:Nn \keys_set_known_aux:nnnN { o } -\cs_new_protected_nopar:Npn \keys_set_elt:n #1 +\cs_new_protected:Npn \keys_set_elt:n #1 { \bool_set_true:N \l_keys_no_value_bool \keys_set_elt_aux:nn {#1} { } @@ -597,7 +597,7 @@ { = { \exp_not:o \l_keys_value_tl } } } } -\cs_new_nopar:Npn \keys_execute:nn #1#2 +\cs_new:Npn \keys_execute:nn #1#2 { \cs_if_exist:cTF { \c_keys_code_root_tl #1 } { @@ -606,7 +606,7 @@ } {#2} } -\cs_new_nopar:Npn \keys_choice_find:n #1 +\cs_new:Npn \keys_choice_find:n #1 { \keys_execute:nn { \l_keys_path_tl / \tl_to_str:n {#1} } { \keys_execute:nn { \l_keys_path_tl / unknown } { } } @@ -623,7 +623,7 @@ { \prg_return_true: } { \prg_return_false: } } -\cs_new_nopar:Npn \keys_show:nn #1#2 +\cs_new:Npn \keys_show:nn #1#2 { \cs_show:c { \c_keys_code_root_tl #1 / \tl_to_str:n {#2} } } \msg_kernel_new:nnnn { keys } { boolean-values-only } { Key~'#1'~accepts~boolean~values~only. } diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty b/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty index 7494acf9185..2328dda0623 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3luatex.dtx 2995 2011-11-23 16:15:19Z bruno $ +\GetIdInfo$Id: l3luatex.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental LuaTeX-specific functions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -54,8 +54,8 @@ \msg_kernel_new:nnnn { luatex } { bad-engine } { LuaTeX~engine~not~in~use!~Ignoring~#1. } { - The~feature~you~are~using~is~only~available\ - with~the~luaTeX~engine.~LaTeX3~ignored~`#1#2'. + The~feature~you~are~using~is~only~available~ + with~the~LuaTeX~engine.~LaTeX3~ignored~`#1#2'. } \luatex_if_engine:TF { @@ -81,30 +81,24 @@ { \lua_shipout_x:n { \exp_not:n {#1} } } \cs_generate_variant:Nn \lua_shipout:n { x } \int_new:N \g_cctab_allocate_int -\int_set:Nn \g_cctab_allocate_int { -1 } +\int_set:Nn \g_cctab_allocate_int { \c_minus_one } \int_new:N \g_cctab_stack_int \seq_new:N \g_cctab_stack_seq -\cs_new_protected_nopar:Npn \cctab_new:N #1 +\cs_new_protected:Npn \cctab_new:N #1 { - \cs_if_free:NTF #1 - { - \int_gadd:Nn \g_cctab_allocate_int { 2 } - \int_compare:nNnTF - { \g_cctab_allocate_int } < { \c_max_register_int + 1 } - { - \tex_global:D \tex_mathchardef:D #1 \g_cctab_allocate_int - \luatex_initcatcodetable:D #1 - } - { \msg_kernel_fatal:nnx { alloc } { out-of-registers } { cctab } } - } + \chk_if_free_cs:N #1 + \int_gadd:Nn \g_cctab_allocate_int { \c_two } + \int_compare:nNnTF + \g_cctab_allocate_int < { \c_max_register_int + \c_one } { - \msg_kernel_error:nnx { code } { variable-already-defined } - { \token_to_str:N #1 } + \tex_global:D \tex_chardef:D #1 \g_cctab_allocate_int + \luatex_initcatcodetable:D #1 } + { \msg_kernel_fatal:nnx { alloc } { out-of-registers } { cctab } } } \luatex_if_engine:F { - \cs_set_protected_nopar:Npn \cctab_new:N #1 + \cs_set_protected:Npn \cctab_new:N #1 { \msg_kernel_error:nnx { luatex } { bad-engine } { \exp_not:N \cctab_new:N } @@ -112,33 +106,34 @@ } \luatex_if_engine:T { - \cs_set_protected_nopar:Npn \cctab_new:N #1 + \cs_set_protected:Npn \cctab_new:N #1 { + \chk_if_free_cs:N #1 \newcatcodetable #1 \luatex_initcatcodetable:D #1 } } -\cs_new_protected_nopar:Npn \cctab_begin:N #1 +\cs_new_protected:Npn \cctab_begin:N #1 { \seq_gpush:Nx \g_cctab_stack_seq { \tex_the:D \luatex_catcodetable:D } \luatex_catcodetable:D #1 - \int_gadd:Nn \g_cctab_stack_int { 2 } - \int_compare:nNnT { \g_cctab_stack_int } > { 268 435 453 } - { \msg_kernel_error:nn { code } { cctab-stack-full } } + \int_gadd:Nn \g_cctab_stack_int { \c_two } + \int_compare:nNnT \g_cctab_stack_int > \c_max_register_int + { \msg_kernel_fatal:nn { code } { cctab-stack-full } } \luatex_savecatcodetable:D \g_cctab_stack_int \luatex_catcodetable:D \g_cctab_stack_int } \cs_new_protected_nopar:Npn \cctab_end: { - \int_gsub:Nn \g_cctab_stack_int { 2 } - \seq_gpop:NN \g_cctab_stack_seq \l_cctab_tmp_tl - \quark_if_no_value:NT \l_cctab_tmp_tl + \int_gsub:Nn \g_cctab_stack_int { \c_two } + \seq_if_empty:NTF \g_cctab_stack_seq { \tl_set:Nn \l_cctab_tmp_tl { 0 } } + { \seq_gpop:NN \g_cctab_stack_seq \l_cctab_tmp_tl } \luatex_catcodetable:D \l_cctab_tmp_tl \scan_stop: } \luatex_if_engine:F { - \cs_set_protected_nopar:Npn \cctab_begin:N #1 + \cs_set_protected:Npn \cctab_begin:N #1 { \msg_kernel_error:nnxx { luatex } { bad-engine } { \exp_not:N \cctab_begin:N } {#1} @@ -151,7 +146,7 @@ } \luatex_if_engine:T { - \cs_set_protected_nopar:Npn \cctab_begin:N #1 { \BeginCatcodeRegime #1 } + \cs_set_protected:Npn \cctab_begin:N #1 { \BeginCatcodeRegime #1 } \cs_set_protected_nopar:Npn \cctab_end: { \EndCatcodeRegime } } \tl_new:N \l_cctab_tmp_tl @@ -164,7 +159,7 @@ } \luatex_if_engine:F { - \cs_set_protected_nopar:Npn \cctab_gset:Nn #1#2 + \cs_set_protected:Npn \cctab_gset:Nn #1#2 { \msg_kernel_error:nnxx { luatex } { bad-engine } { \exp_not:N \cctab_gset:Nn } { #1 {#2} } @@ -180,8 +175,9 @@ \cs_new_eq:NN \c_document_cctab \CatcodeTableLaTeX \cs_new_eq:NN \c_initex_cctab \CatcodeTableIniTeX \cs_new_eq:NN \c_other_cctab \CatcodeTableOther - \cs_new_eq:NN \c_string_cctab \CatcodeTableString + \cs_new_eq:NN \c_str_cctab \CatcodeTableString } +\cs_new_eq:NN \c_string_cctab \c_str_cctab %% %% %% End of file `l3luatex.sty'. diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty index d4991bc760c..7090d10d2a5 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3msg.dtx 3029 2011-12-06 22:47:30Z joseph $ +\GetIdInfo$Id: l3msg.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental messages} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -206,16 +206,16 @@ \iow_term:x { ************************************************* } } \int_set:Nn \tex_errorcontextlines:D { -1 } -\cs_new_nopar:Npn \msg_fatal_text:n #1 { Fatal~#1~error } -\cs_new_nopar:Npn \msg_critical_text:n #1 { Critical~#1~error } -\cs_new_nopar:Npn \msg_error_text:n #1 { #1~error } -\cs_new_nopar:Npn \msg_warning_text:n #1 { #1~warning } -\cs_new_nopar:Npn \msg_info_text:n #1 { #1~info } -\cs_new_nopar:Npn \msg_see_documentation_text:n #1 +\cs_new:Npn \msg_fatal_text:n #1 { Fatal~#1~error } +\cs_new:Npn \msg_critical_text:n #1 { Critical~#1~error } +\cs_new:Npn \msg_error_text:n #1 { #1~error } +\cs_new:Npn \msg_warning_text:n #1 { #1~warning } +\cs_new:Npn \msg_info_text:n #1 { #1~info } +\cs_new:Npn \msg_see_documentation_text:n #1 { \\ \\ See~the~#1~documentation~for~further~information. } \prop_new:N \l_msg_redirect_classes_prop \prop_new:N \l_msg_redirect_names_prop -\cs_new_protected_nopar:Npn \msg_class_set:nn #1#2 +\cs_new_protected:Npn \msg_class_set:nn #1#2 { \prop_clear_new:c { l_msg_redirect_ #1 _prop } \cs_set_protected:cpn { msg_ #1 :nnxxxx } ##1##2##3##4##5##6 @@ -337,7 +337,7 @@ { \msg_use_aux:nnn {#1} {#3} {#4} } { \msg_kernel_error:nnxx { msg } { message-unknown } {#3} {#4} } } -\cs_new_protected_nopar:Npn \msg_use_aux:nnn #1#2#3 +\cs_new_protected:Npn \msg_use_aux:nnn #1#2#3 { \tl_set:Nn \l_msg_current_class_tl {#1} \tl_set:Nn \l_msg_current_module_tl {#2} @@ -345,7 +345,7 @@ { \msg_use_loop_check:nn { names } { // #2 / #3 / } } { \msg_use_aux:nn {#1} {#2} } } -\cs_new_protected_nopar:Npn \msg_use_aux:nn #1#2 +\cs_new_protected:Npn \msg_use_aux:nn #1#2 { \prop_if_in:cnTF { l_msg_redirect_ #1 _prop } {#2} { \msg_use_loop_check:nn {#1} {#2} } @@ -367,19 +367,19 @@ \cs_new_protected_nopar:Npn \msg_use_code: { } \cs_new_protected:Npn \msg_use_loop:n #1 { } \cs_generate_variant:Nn \msg_use_loop:n { o } -\cs_new_protected_nopar:Npn \msg_redirect_class:nn #1#2 +\cs_new_protected:Npn \msg_redirect_class:nn #1#2 { \prop_put:cnn { l_msg_redirect_ #1 _prop } { * } {#2} } -\cs_new_protected_nopar:Npn \msg_redirect_module:nnn #1#2#3 +\cs_new_protected:Npn \msg_redirect_module:nnn #1#2#3 { \prop_put:cnn { l_msg_redirect_ #2 _prop } {#1} {#3} } -\cs_new_protected_nopar:Npn \msg_redirect_name:nnn #1#2#3 +\cs_new_protected:Npn \msg_redirect_name:nnn #1#2#3 { \prop_put:Nnn \l_msg_redirect_names_prop { // #1 / #2 / } {#3} } -\cs_new_protected_nopar:Npn \msg_kernel_new:nnnn #1#2 +\cs_new_protected:Npn \msg_kernel_new:nnnn #1#2 { \msg_new:nnnn { LaTeX } { #1 / #2 } } -\cs_new_protected_nopar:Npn \msg_kernel_new:nnn #1#2 +\cs_new_protected:Npn \msg_kernel_new:nnn #1#2 { \msg_new:nnn { LaTeX } { #1 / #2 } } -\cs_new_protected_nopar:Npn \msg_kernel_set:nnnn #1#2 +\cs_new_protected:Npn \msg_kernel_set:nnnn #1#2 { \msg_set:nnnn { LaTeX } { #1 / #2 } } -\cs_new_protected_nopar:Npn \msg_kernel_set:nnn #1#2 +\cs_new_protected:Npn \msg_kernel_set:nnn #1#2 { \msg_set:nnn { LaTeX } { #1 / #2 } } \cs_new_protected:Npn \msg_kernel_fatal:nnxxxx #1#2#3#4#5#6 { @@ -555,12 +555,21 @@ LaTeX~has~been~asked~to~replace~an~empty~pattern~by~'#1':~that~% would~lead~to~an~infinite~loop! } +\msg_kernel_new:nnnn { scan } { already-defined } + { Scan~mark~#1~already~defined. } + { + \c_msg_coding_error_text_tl + LaTeX~has~been~asked~to~create~a~new~scan~mark~'#1'~ + but~this~name~has~already~been~used~for~a~scan~mark. + } \msg_kernel_new:nnn { seq } { misused } { A~sequence~was~misused. } \msg_kernel_new:nnn { kernel } { bad-var } { Erroneous~variable~#1 used! } \msg_kernel_new:nnn { prg } { zero-step } { Zero~step~size~for~stepwise~function~#1. } +\msg_kernel_new:nnn { prg } { replicate-neg } + { Negative~argument~for~\prg_replicate:nn. } \msg_kernel_new:nnn { seq } { show } { Sequence~\token_to_str:N #1~ diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty index e86d4214429..69475b6617b 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3prg.dtx 3014 2011-11-27 06:55:43Z bruno $ +\GetIdInfo$Id: l3prg.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental control structures} %% \ProvidesExplPackage @@ -54,15 +54,15 @@ \package_check_loaded_expl: \tex_let:D \if_bool:N \tex_ifodd:D \tex_let:D \if_predicate:w \tex_ifodd:D -\cs_new_protected_nopar:Npn \bool_new:N #1 { \cs_new_eq:NN #1 \c_false_bool } +\cs_new_protected:Npn \bool_new:N #1 { \cs_new_eq:NN #1 \c_false_bool } \cs_generate_variant:Nn \bool_new:N { c } -\cs_new_protected_nopar:Npn \bool_set_true:N #1 +\cs_new_protected:Npn \bool_set_true:N #1 { \cs_set_eq:NN #1 \c_true_bool } -\cs_new_protected_nopar:Npn \bool_set_false:N #1 +\cs_new_protected:Npn \bool_set_false:N #1 { \cs_set_eq:NN #1 \c_false_bool } -\cs_new_protected_nopar:Npn \bool_gset_true:N #1 +\cs_new_protected:Npn \bool_gset_true:N #1 { \cs_gset_eq:NN #1 \c_true_bool } -\cs_new_protected_nopar:Npn \bool_gset_false:N #1 +\cs_new_protected:Npn \bool_gset_false:N #1 { \cs_gset_eq:NN #1 \c_false_bool } \cs_generate_variant:Nn \bool_set_true:N { c } \cs_generate_variant:Nn \bool_set_false:N { c } @@ -193,8 +193,8 @@ \exp_after:wN \bool_not_choose:NN \exp_after:wN #1 \int_to_roman:w - `\q } -\cs_new_nopar:Npn \bool_choose:NN #1#2 { \use:c { bool_ #2 _ #1 :w } } -\cs_new_nopar:Npn \bool_not_choose:NN #1#2 { \use:c { bool_not_ #2 _ #1 :w } } +\cs_new:Npn \bool_choose:NN #1#2 { \use:c { bool_ #2 _ #1 :w } } +\cs_new:Npn \bool_not_choose:NN #1#2 { \use:c { bool_not_ #2 _ #1 :w } } \cs_new_nopar:cpn { bool_&_1:w } & { \bool_get_next:N } \cs_new_nopar:cpn { bool_|_0:w } | { \bool_get_next:N } \cs_new_nopar:cpn { bool_not_&_0:w } & { \bool_get_next:N } @@ -335,18 +335,18 @@ { \prg_case_tl_aux:Nw #1 } } \cs_generate_variant:Nn \prg_case_tl:Nnn { c } -\cs_new_nopar:Npn \prg_replicate:nn #1 +\cs_new:Npn \prg_replicate:nn #1 { \int_to_roman:w \exp_after:wN \prg_replicate_first_aux:N \int_value:w \int_eval:w #1 \int_eval_end: \cs_end: } -\cs_new_nopar:Npn \prg_replicate_aux:N #1 +\cs_new:Npn \prg_replicate_aux:N #1 { \cs:w prg_replicate_#1 :n \prg_replicate_aux:N } -\cs_new_nopar:Npn \prg_replicate_first_aux:N #1 +\cs_new:Npn \prg_replicate_first_aux:N #1 { \cs:w prg_replicate_first_ #1 :n \prg_replicate_aux:N } -\cs_new_nopar:Npn \prg_replicate_ :n #1 { \cs_end: } +\cs_new:Npn \prg_replicate_ :n #1 { \cs_end: } \cs_new:cpn { prg_replicate_0:n } #1 { \cs_end: {#1#1#1#1#1#1#1#1#1#1} } \cs_new:cpn { prg_replicate_1:n } #1 { \cs_end: {#1#1#1#1#1#1#1#1#1#1} #1 } \cs_new:cpn { prg_replicate_2:n } #1 { \cs_end: {#1#1#1#1#1#1#1#1#1#1} #1#1 } @@ -364,7 +364,8 @@ { \cs_end: {#1#1#1#1#1#1#1#1#1#1} #1#1#1#1#1#1#1#1 } \cs_new:cpn { prg_replicate_9:n } #1 { \cs_end: {#1#1#1#1#1#1#1#1#1#1} #1#1#1#1#1#1#1#1#1 } -\cs_new:cpn { prg_replicate_first_-:n } #1 { \c_zero \negative_replication } +\cs_new:cpn { prg_replicate_first_-:n } #1 + { \c_zero \msg_expandable_kernel_error:nn { prg } { replicate-neg } } \cs_new:cpn { prg_replicate_first_0:n } #1 { \c_zero } \cs_new:cpn { prg_replicate_first_1:n } #1 { \c_zero #1 } \cs_new:cpn { prg_replicate_first_2:n } #1 { \c_zero #1#1 } @@ -446,12 +447,13 @@ \tl_to_lowercase:n { \group_end: - \cs_new_nopar:Npn \prg_variable_get_scope:N #1 + \cs_new:Npn \prg_variable_get_scope:N #1 { - \exp_last_unbraced:Nf \prg_variable_get_scope_aux:w - { \cs_to_str:N #1 \exp_stop_f: \q_stop } + \exp_after:wN \exp_after:wN + \exp_after:wN \prg_variable_get_scope_aux:w + \cs_to_str:N #1 \exp_stop_f: \q_stop } - \cs_new_nopar:Npn \prg_variable_get_scope_aux:w #1#2 \q_stop + \cs_new:Npn \prg_variable_get_scope_aux:w #1#2 \q_stop { \token_if_eq_meaning:NNT & #1 { g } } } \group_begin: @@ -460,12 +462,12 @@ \tl_to_lowercase:n { \group_end: - \cs_new_nopar:Npn \prg_variable_get_type:N #1 + \cs_new:Npn \prg_variable_get_type:N #1 { \exp_after:wN \prg_variable_get_type_aux:w \token_to_str:N #1 & a \q_stop } - \cs_new_nopar:Npn \prg_variable_get_type_aux:w #1 & #2#3 \q_stop + \cs_new:Npn \prg_variable_get_type_aux:w #1 & #2#3 \q_stop { \token_if_eq_meaning:NNTF a #2 {#1} @@ -473,7 +475,7 @@ } } \int_new:N \g_prg_map_int -\cs_new_protected_nopar:Npn \prg_define_quicksort:nnn #1#2#3 { +\cs_new_protected:Npn \prg_define_quicksort:nnn #1#2#3 { \cs_set:cpx{#1_quicksort:n}##1{ \exp_not:c{#1_quicksort_start_partition:w} ##1 \exp_not:n{#2\q_nil#3\q_stop} diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty index c3878515e49..869c381a1bb 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3prop.dtx 3029 2011-12-06 22:47:30Z joseph $ +\GetIdInfo$Id: l3prop.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental property lists} %% \ProvidesExplPackage @@ -230,7 +230,7 @@ \cs_generate_variant:Nn \prop_get:NnNT { c , cV , co } \cs_generate_variant:Nn \prop_get:NnNF { c , cV , co } \cs_generate_variant:Nn \prop_get:NnNTF { c , cV , co } -\cs_new_nopar:Npn \prop_map_function:NN #1#2 +\cs_new:Npn \prop_map_function:NN #1#2 { \exp_last_unbraced:NNo \prop_map_function_aux:Nwn #2 #1 \q_recursion_tail \q_prop { } @@ -260,7 +260,7 @@ \cs_generate_variant:Nn \prop_map_inline:Nn { c } \cs_new_eq:NN \prop_map_break: \prg_map_break: \cs_new_eq:NN \prop_map_break:n \prg_map_break:n -\cs_new_protected_nopar:Npn \prop_show:N #1 +\cs_new_protected:Npn \prop_show:N #1 { \msg_aux_show:Nnx #1 diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty index 31102e00c73..3a9a6489663 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty @@ -46,12 +46,12 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3quark.dtx 3014 2011-11-27 06:55:43Z bruno $ +\GetIdInfo$Id: l3quark.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental quarks} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \package_check_loaded_expl: -\cs_new_protected_nopar:Npn \quark_new:N #1 { \tl_const:Nn #1 {#1} } +\cs_new_protected:Npn \quark_new:N #1 { \tl_const:Nn #1 {#1} } \quark_new:N \q_nil \quark_new:N \q_mark \quark_new:N \q_no_value @@ -147,6 +147,21 @@ \cs_generate_variant:Nn \quark_if_nil:nF { V , o } \quark_new:N \q_tl_act_mark \quark_new:N \q_tl_act_stop +\tl_new:N \g_scan_marks_tl +\cs_new_protected:Npn \scan_new:N #1 + { + \tl_if_in:NnTF \g_scan_marks_tl { #1 } + { + \msg_kernel_error:nnx { scan } { already-defined } + { \token_to_str:N #1 } + } + { + \tl_gput_right:Nn \g_scan_marks_tl {#1} + \cs_new_eq:NN #1 \scan_stop: + } + } +\scan_new:N \s_stop +\cs_new:Npn \use_none_delimit_by_s_stop:w #1 \s_stop { } %% %% %% End of file `l3quark.sty'. diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty index adfb1684b43..743e17ed121 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3seq.dtx 3033 2011-12-07 10:12:21Z joseph $ +\GetIdInfo$Id: l3seq.dtx 3085 2011-12-22 16:29:26Z bruno $ {L3 Experimental sequences and stacks} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -80,7 +80,7 @@ { \seq_set_split_aux:NNnn \tl_set:Nx } \cs_new_protected_nopar:Npn \seq_gset_split:Nnn { \seq_set_split_aux:NNnn \tl_gset:Nx } -\cs_new_protected_nopar:Npn \seq_set_split_aux:NNnn #1 #2 #3 #4 +\cs_new_protected:Npn \seq_set_split_aux:NNnn #1 #2 #3 #4 { \tl_if_empty:nTF {#3} { #1 #2 { \tl_map_function:nN {#4} \seq_wrap_item:n } } @@ -108,9 +108,9 @@ } \cs_new:Npn \seq_set_split_aux_ii:w #1 \seq_set_split_aux_end: { \seq_wrap_item:n {#1} } -\cs_new_protected_nopar:Npn \seq_concat:NNN #1#2#3 +\cs_new_protected:Npn \seq_concat:NNN #1#2#3 { \tl_set:Nx #1 { \exp_not:o {#2} \exp_not:o {#3} } } -\cs_new_protected_nopar:Npn \seq_gconcat:NNN #1#2#3 +\cs_new_protected:Npn \seq_gconcat:NNN #1#2#3 { \tl_gset:Nx #1 { \exp_not:o {#2} \exp_not:o {#3} } } \cs_generate_variant:Nn \seq_concat:NNN { ccc } \cs_generate_variant:Nn \seq_gconcat:NNN { ccc } @@ -201,7 +201,7 @@ \cs_generate_variant:Nn \seq_if_in:NnF { c , cV , cv , co , cx } \cs_generate_variant:Nn \seq_if_in:NnTF { NV , Nv , No , Nx } \cs_generate_variant:Nn \seq_if_in:NnTF { c , cV , cv , co , cx } -\cs_new_protected_nopar:Npn \seq_get_left:NN #1#2 +\cs_new_protected:Npn \seq_get_left:NN #1#2 { \seq_if_empty_err_break:N #1 \exp_after:wN \seq_get_left_aux:NnwN #1 \q_stop #2 @@ -214,7 +214,7 @@ { \seq_pop_left_aux:NNN \tl_set:Nn } \cs_new_protected_nopar:Npn \seq_gpop_left:NN { \seq_pop_left_aux:NNN \tl_gset:Nn } -\cs_new_protected_nopar:Npn \seq_pop_left_aux:NNN #1#2#3 +\cs_new_protected:Npn \seq_pop_left_aux:NNN #1#2#3 { \seq_if_empty_err_break:N #2 \exp_after:wN \seq_pop_left_aux:NnwNNN #2 \q_stop #1#2#3 @@ -227,13 +227,13 @@ } \cs_generate_variant:Nn \seq_pop_left:NN { c } \cs_generate_variant:Nn \seq_gpop_left:NN { c } -\cs_new_protected_nopar:Npn \seq_get_right:NN #1#2 +\cs_new_protected:Npn \seq_get_right:NN #1#2 { \seq_if_empty_err_break:N #1 \seq_get_right_aux:NN #1#2 \prg_break_point:n { } } -\cs_new_protected_nopar:Npn \seq_get_right_aux:NN #1#2 +\cs_new_protected:Npn \seq_get_right_aux:NN #1#2 { \seq_push_item_def:n { } \exp_after:wN \exp_after:wN \exp_after:wN \seq_get_right_loop:nn @@ -255,13 +255,13 @@ { \seq_pop_right_aux:NNN \tl_set:Nx } \cs_new_protected_nopar:Npn \seq_gpop_right:NN { \seq_pop_right_aux:NNN \tl_gset:Nx } -\cs_new_protected_nopar:Npn \seq_pop_right_aux:NNN #1#2#3 +\cs_new_protected:Npn \seq_pop_right_aux:NNN #1#2#3 { \seq_if_empty_err_break:N #2 \seq_pop_right_aux_ii:NNN #1 #2 #3 \prg_break_point:n { } } -\cs_new_protected_nopar:Npn \seq_pop_right_aux_ii:NNN #1#2#3 +\cs_new_protected:Npn \seq_pop_right_aux_ii:NNN #1#2#3 { \seq_push_item_def:n { \seq_wrap_item:n {##1} } #1 #2 { \if_false: } \fi: @@ -283,7 +283,7 @@ \cs_new_eq:NN \seq_break:n \prg_map_break:n \cs_new_eq:NN \seq_map_break: \prg_map_break: \cs_new_eq:NN \seq_map_break:n \prg_map_break:n -\cs_new_protected_nopar:Npn \seq_if_empty_err_break:N #1 +\cs_new_protected:Npn \seq_if_empty_err_break:N #1 { \if_meaning:w #1 \c_empty_tl \msg_kernel_error:nnx { seq } { empty-sequence } { \token_to_str:N #1 } @@ -370,7 +370,7 @@ \cs_new_eq:NN \seq_pop:cN \seq_pop_left:cN \cs_new_eq:NN \seq_gpop:NN \seq_gpop_left:NN \cs_new_eq:NN \seq_gpop:cN \seq_gpop_left:cN -\cs_new_protected_nopar:Npn \seq_show:N #1 +\cs_new_protected:Npn \seq_show:N #1 { \msg_aux_show:Nnx #1 @@ -378,7 +378,7 @@ { \seq_map_function:NN #1 \msg_aux_show:n } } \cs_generate_variant:Nn \seq_show:N { c } -\cs_new_nopar:Npn \seq_if_empty_break_return_false:N #1 +\cs_new:Npn \seq_if_empty_break_return_false:N #1 { \if_meaning:w #1 \c_empty_tl \prg_return_false: @@ -456,7 +456,7 @@ } \cs_new:Npn \seq_length_aux:n #1 { +1 } \cs_generate_variant:Nn \seq_length:N { c } -\cs_new_nopar:Npn \seq_item:Nn #1#2 +\cs_new:Npn \seq_item:Nn #1#2 { \exp_last_unbraced:Nfo \seq_item_aux:nnn { @@ -472,7 +472,7 @@ { } \prg_break_point:n { } } -\cs_new_nopar:Npn \seq_item_aux:nnn #1#2#3 +\cs_new:Npn \seq_item_aux:nnn #1#2#3 { \use_none:n #2 \int_compare:nNnTF {#1} = \c_zero @@ -480,9 +480,9 @@ { \exp_args:Nf \seq_item_aux:nnn { \int_eval:n { #1 - 1 } } } } \cs_generate_variant:Nn \seq_item:Nn { c } -\cs_new_nopar:Npn \seq_use:N #1 { \seq_map_function:NN #1 \use:n } +\cs_new:Npn \seq_use:N #1 { \seq_map_function:NN #1 \use:n } \cs_generate_variant:Nn \seq_use:N { c } -\cs_new_nopar:Npn \seq_mapthread_function:NNN #1#2#3 +\cs_new:Npn \seq_mapthread_function:NNN #1#2#3 { \exp_after:wN \seq_mapthread_function_aux:NN \exp_after:wN #3 @@ -491,7 +491,7 @@ { ? \seq_break: } { } \prg_break_point:n { } } -\cs_new_nopar:Npn \seq_mapthread_function_aux:NN #1#2 +\cs_new:Npn \seq_mapthread_function_aux:NN #1#2 { \exp_after:wN \seq_mapthread_function_aux:Nnnwnn \exp_after:wN #1 @@ -539,7 +539,7 @@ { \seq_reverse_aux:NN \tl_set:Nx } \cs_new_protected_nopar:Npn \seq_greverse:N { \seq_reverse_aux:NN \tl_gset:Nx } -\cs_new_protected_nopar:Npn \seq_reverse_aux:NN #1 #2 +\cs_new_protected:Npn \seq_reverse_aux:NN #1 #2 { \cs_set_eq:NN \seq_tmp:w \seq_item:n \cs_set_eq:NN \seq_item:n \seq_reverse_aux_item:nwn @@ -553,6 +553,26 @@ } \cs_generate_variant:Nn \seq_reverse:N { c } \cs_generate_variant:Nn \seq_greverse:N { c } +\cs_new_protected_nopar:Npn \seq_set_filter:NNn + { \seq_set_filter_aux:NNNn \tl_set:Nx } +\cs_new_protected_nopar:Npn \seq_gset_filter:NNn + { \seq_set_filter_aux:NNNn \tl_gset:Nx } +\cs_new_protected:Npn \seq_set_filter_aux:NNNn #1#2#3#4 + { + \seq_push_item_def:n { \bool_if:nT {#4} { \seq_wrap_item:n {##1} } } + #1 #2 { #3 \prg_break_point:n { } } + \seq_pop_item_def: + } +\cs_new_protected_nopar:Npn \seq_set_map:NNn + { \seq_set_map_aux:NNNn \tl_set:Nx } +\cs_new_protected_nopar:Npn \seq_gset_map:NNn + { \seq_set_map_aux:NNNn \tl_gset:Nx } +\cs_new_protected:Npn \seq_set_map_aux:NNNn #1#2#3#4 + { + \seq_push_item_def:n { \exp_not:N \seq_item:n {#4} } + #1 #2 { #3 } + \seq_pop_item_def: + } %% %% %% End of file `l3seq.sty'. diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty index 40bcb9caad3..62cbdf92adb 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3skip.dtx 3029 2011-12-06 22:47:30Z joseph $ +\GetIdInfo$Id: l3skip.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental dimensions and skips} \ProvidesExplPackage diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty index f22f7bd8d66..413c68fd926 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty @@ -46,14 +46,12 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3tl.dtx 3034 2011-12-07 11:40:25Z bruno $ +\GetIdInfo$Id: l3tl.dtx 3091 2011-12-25 16:22:59Z bruno $ {L3 Experimental token lists} - - \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \package_check_loaded_expl: -\cs_new_protected_nopar:Npn \tl_new:N #1 +\cs_new_protected:Npn \tl_new:N #1 { \chk_if_free_cs:N #1 \cs_gset_eq:NN #1 \c_empty_tl @@ -72,15 +70,15 @@ \cs_generate_variant:Nn \tl_const:Nn { c } \cs_generate_variant:Nn \tl_const:Nx { c } \tl_const:Nn \c_empty_tl { } -\cs_new_protected_nopar:Npn \tl_clear:N #1 +\cs_new_protected:Npn \tl_clear:N #1 { \tl_set_eq:NN #1 \c_empty_tl } -\cs_new_protected_nopar:Npn \tl_gclear:N #1 +\cs_new_protected:Npn \tl_gclear:N #1 { \tl_gset_eq:NN #1 \c_empty_tl } \cs_generate_variant:Nn \tl_clear:N { c } \cs_generate_variant:Nn \tl_gclear:N { c } -\cs_new_protected_nopar:Npn \tl_clear_new:N #1 +\cs_new_protected:Npn \tl_clear_new:N #1 { \cs_if_exist:NTF #1 { \tl_clear:N #1 } { \tl_new:N #1 } } -\cs_new_protected_nopar:Npn \tl_gclear_new:N #1 +\cs_new_protected:Npn \tl_gclear_new:N #1 { \cs_if_exist:NTF #1 { \tl_gclear:N #1 } { \tl_new:N #1 } } \cs_generate_variant:Nn \tl_clear_new:N { c } \cs_generate_variant:Nn \tl_gclear_new:N { c } @@ -168,44 +166,40 @@ \group_end: \tl_const:Nn \c_tl_rescan_marker_tl { A B } } -\tl_new:N \l_tl_rescan_tl \cs_new_protected_nopar:Npn \tl_set_rescan:Nnn { \tl_set_rescan_aux:NNnn \tl_set:Nn } \cs_new_protected_nopar:Npn \tl_gset_rescan:Nnn { \tl_set_rescan_aux:NNnn \tl_gset:Nn } +\cs_new_protected_nopar:Npn \tl_rescan:nn + { \tl_set_rescan_aux:NNnn \prg_do_nothing: \use:n } \cs_new_protected:Npn \tl_set_rescan_aux:NNnn #1#2#3#4 { \group_begin: - \exp_args:No \etex_everyeof:D { \c_tl_rescan_marker_tl } + \exp_args:No \etex_everyeof:D { \c_tl_rescan_marker_tl \exp_not:N } \tex_endlinechar:D \c_minus_one \tex_newlinechar:D \c_minus_one #3 - \tl_clear:N \l_tl_rescan_tl - \exp_after:wN \tl_rescan_aux:w \etex_scantokens:D {#4} - \exp_args:NNNo \group_end: - #1 #2 \l_tl_rescan_tl + \use:x + { + \group_end: + #1 \exp_not:N #2 + { + \exp_after:wN \tl_rescan_aux:w + \exp_after:wN \prg_do_nothing: + \etex_scantokens:D {#4} + } + } } \use:x { - \cs_new_protected:Npn \exp_not:N \tl_rescan_aux:w ##1 + \cs_new:Npn \exp_not:N \tl_rescan_aux:w ##1 \c_tl_rescan_marker_tl - { \tl_set:Nn \exp_not:N \l_tl_rescan_tl {##1} } + { \exp_not:N \exp_not:o { ##1 } } } \cs_generate_variant:Nn \tl_set_rescan:Nnn { Nno , Nnx } \cs_generate_variant:Nn \tl_set_rescan:Nnn { c , cno , cnx } \cs_generate_variant:Nn \tl_gset_rescan:Nnn { Nno , Nnx } \cs_generate_variant:Nn \tl_gset_rescan:Nnn { c , cno } -\cs_new_protected:Npn \tl_rescan:nn #1#2 - { - \group_begin: - \exp_args:No \etex_everyeof:D { \c_tl_rescan_marker_tl } - \tex_endlinechar:D \c_minus_one - \tex_newlinechar:D \c_minus_one - #1 - \exp_after:wN \tl_rescan_aux:w \etex_scantokens:D {#2} - \exp_args:No \group_end: - \l_tl_rescan_tl - } \cs_new_eq:NN \tl_to_lowercase:n \tex_lowercase:D \cs_new_eq:NN \tl_to_uppercase:n \tex_uppercase:D \tl_new:N \l_tl_replace_tl @@ -229,6 +223,7 @@ { \tl_to_str:n {#5} } } { + \group_align_safe_begin: \cs_set:Npx \tl_tmp:w ##1##2 #4 { ##2 @@ -237,6 +232,7 @@ \exp_not:n { \exp_not:n {#5} } ##1 } + \group_align_safe_end: #2 #3 { \exp_after:wN #1 @@ -257,15 +253,15 @@ } \cs_new:Npn \tl_replace_once_aux_end:w #1 \q_mark #2 \q_stop { \exp_not:o {#1} } -\cs_new_protected_nopar:Npn \tl_remove_once:Nn #1#2 +\cs_new_protected:Npn \tl_remove_once:Nn #1#2 { \tl_replace_once:Nnn #1 {#2} { } } -\cs_new_protected_nopar:Npn \tl_gremove_once:Nn #1#2 +\cs_new_protected:Npn \tl_gremove_once:Nn #1#2 { \tl_greplace_once:Nnn #1 {#2} { } } \cs_generate_variant:Nn \tl_remove_once:Nn { c } \cs_generate_variant:Nn \tl_gremove_once:Nn { c } -\cs_new_protected_nopar:Npn \tl_remove_all:Nn #1#2 +\cs_new_protected:Npn \tl_remove_all:Nn #1#2 { \tl_replace_all:Nnn #1 {#2} { } } -\cs_new_protected_nopar:Npn \tl_gremove_all:Nn #1#2 +\cs_new_protected:Npn \tl_gremove_all:Nn #1#2 { \tl_greplace_all:Nnn #1 {#2} { } } \cs_generate_variant:Nn \tl_remove_all:Nn { c } \cs_generate_variant:Nn \tl_gremove_all:Nn { c } @@ -402,9 +398,9 @@ \cs_new_eq:NN \tl_map_break: \prg_map_break: \cs_new_eq:NN \tl_map_break:n \prg_map_break:n \cs_new_eq:NN \tl_to_str:n \etex_detokenize:D -\cs_new_nopar:Npn \tl_to_str:N #1 { \etex_detokenize:D \exp_after:wN {#1} } +\cs_new:Npn \tl_to_str:N #1 { \etex_detokenize:D \exp_after:wN {#1} } \cs_generate_variant:Nn \tl_to_str:N { c } -\cs_new_nopar:Npn \tl_use:N #1 +\cs_new:Npn \tl_use:N #1 { \cs_if_exist:NTF #1 {#1} { \msg_expandable_kernel_error:nnn { kernel } { bad-var } {#1} } @@ -415,7 +411,7 @@ \int_eval:n { 0 \tl_map_function:nN {#1} \tl_length_aux:n } } -\cs_new_nopar:Npn \tl_length:N #1 +\cs_new:Npn \tl_length:N #1 { \int_eval:n { 0 \tl_map_function:NN #1 \tl_length_aux:n } @@ -498,7 +494,7 @@ \tl_to_str:n {#1} { { } } ~ \q_stop } -\cs_new_nopar:Npn \str_head_aux:w #1 ~ % +\cs_new:Npn \str_head_aux:w #1 ~ % { \tl_head:w #1 { ~ } } \cs_new:Npn \str_tail:n #1 { @@ -506,7 +502,7 @@ \reverse_if:N \if_charcode:w \scan_stop: \tl_to_str:n {#1} X X \q_stop } -\cs_new_nopar:Npn \str_tail_aux:w #1 X #2 \q_stop { \fi: #1 } +\cs_new:Npn \str_tail_aux:w #1 X #2 \q_stop { \fi: #1 } \prg_new_conditional:Npnn \tl_if_head_eq_charcode:nN #1#2 { p , T , F , TF } { \if_charcode:w @@ -574,7 +570,11 @@ } } \prg_new_conditional:Npnn \tl_if_head_N_type:n #1 { p , T , F , TF } - { \str_if_eq_return:on { \use:n #1 { } } { #1 { } } } + { + \str_if_eq_return:xx + { \exp_not:o { \use:n #1 { } } } + { \exp_not:n { #1 { } } } + } \prg_new_conditional:Npnn \tl_if_head_group:n #1 { p , T , F , TF } { \if_catcode:w * @@ -611,11 +611,9 @@ \tl_new:N \g_tmpb_tl \tl_new:N \l_tmpa_tl \tl_new:N \l_tmpb_tl -\cs_new:Npn \str_if_eq_return:on #1 #2 +\cs_new:Npn \str_if_eq_return:xx #1 #2 { - \if_int_compare:w - \pdftex_strcmp:D { \exp_not:o {#1} } { \exp_not:n {#2} } - = \c_zero + \if_int_compare:w \pdftex_strcmp:D {#1} {#2} = \c_zero \prg_return_true: \else: \prg_return_false: @@ -626,16 +624,17 @@ \cs_new:Npn \tl_if_single:NF { \exp_args:No \tl_if_single:nF } \cs_new:Npn \tl_if_single:NTF { \exp_args:No \tl_if_single:nTF } \prg_new_conditional:Npnn \tl_if_single:n #1 { p , T , F , TF } - { \str_if_eq_return:on { \use_none:nn #1 ?? } {?} } + { \str_if_eq_return:xx { \exp_not:o { \use_none:nn #1 ?? } } {?} } \prg_new_conditional:Npnn \tl_if_single_token:n #1 { p , T , F , TF } { \tl_if_head_N_type:nTF {#1} - { \str_if_eq_return:on { \use_none:n #1 } { } } - { \str_if_eq_return:on { ~ } { #1 } } + { \str_if_eq_return:xx { \exp_not:o { \use_none:n #1 } } { } } + { \str_if_eq_return:xx { \exp_not:n {#1} } { ~ } } } \cs_new:Npn \tl_act:NNNnn { \tex_romannumeral:D \tl_act_aux:NNNnn } \cs_new:Npn \tl_act_aux:NNNnn #1 #2 #3 #4 #5 { + \group_align_safe_begin: \tl_act_loop:w #5 \q_tl_act_mark \q_tl_act_stop {#4} #1 #2 #3 \tl_act_result:n { } @@ -660,7 +659,8 @@ \tl_act_loop:w #2 \q_tl_act_stop {#3} #4 } -\cs_new:Npn \tl_act_end:wn #1 \tl_act_result:n #2 { \c_zero #2 } +\cs_new:Npn \tl_act_end:wn #1 \tl_act_result:n #2 + { \group_align_safe_end: \c_zero #2 } \cs_new:Npn \tl_act_group:nwnNNN #1 #2 \q_tl_act_stop #3#4#5 { #5 {#3} {#1} @@ -714,9 +714,9 @@ \cs_new:Npn \tl_act_reverse_group_preserve:nn #1 #2 { \tl_act_reverse_output:n { {#2} } } \cs_generate_variant:Nn \tl_reverse:n { o , V } -\cs_new_protected_nopar:Npn \tl_reverse:N #1 +\cs_new_protected:Npn \tl_reverse:N #1 { \tl_set:Nf #1 { \tl_reverse:o { #1 \exp_stop_f: } } } -\cs_new_protected_nopar:Npn \tl_greverse:N #1 +\cs_new_protected:Npn \tl_greverse:N #1 { \tl_gset:Nf #1 { \tl_reverse:o { #1 \exp_stop_f: } } } \cs_generate_variant:Nn \tl_reverse:N { c } \cs_generate_variant:Nn \tl_greverse:N { c } @@ -786,7 +786,7 @@ \q_recursion_tail \prg_break_point:n { } } -\cs_new_nopar:Npn \tl_item_aux:nn #1#2 +\cs_new:Npn \tl_item_aux:nn #1#2 { \quark_if_recursion_tail_break:n {#2} \int_compare:nNnTF {#1} = \c_zero @@ -795,6 +795,8 @@ } \cs_new_nopar:Npn \tl_item:Nn { \exp_args:No \tl_item:nn } \cs_generate_variant:Nn \tl_item:Nn { c } +\prg_new_conditional:Npnn \tl_if_empty:x #1 { p , T , F , TF } + { \str_if_eq_return:xx { } {#1} } %% %% %% End of file `l3tl.sty'. diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty index 4546eabd5f0..1a744a15610 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty @@ -46,107 +46,107 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3token.dtx 2931 2011-10-22 13:48:28Z bruno $ +\GetIdInfo$Id: l3token.dtx 3099 2011-12-27 21:41:02Z joseph $ {L3 Experimental token manipulation} %% \begin{function}[EXP,pTF]{\token_if_protected_long_macro:N} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \package_check_loaded_expl: -\cs_new_protected_nopar:Npn \char_set_catcode:nn #1#2 +\cs_new_protected:Npn \char_set_catcode:nn #1#2 { \tex_catcode:D #1 = \int_eval:w #2 \int_eval_end: } -\cs_new_nopar:Npn \char_value_catcode:n #1 +\cs_new:Npn \char_value_catcode:n #1 { \tex_the:D \tex_catcode:D \int_eval:w #1\int_eval_end: } -\cs_new_nopar:Npn \char_show_value_catcode:n #1 +\cs_new_protected:Npn \char_show_value_catcode:n #1 { \tex_showthe:D \tex_catcode:D \int_eval:w #1 \int_eval_end: } -\cs_new_protected_nopar:Npn \char_set_catcode_escape:N #1 +\cs_new_protected:Npn \char_set_catcode_escape:N #1 { \char_set_catcode:nn { `#1 } \c_zero } -\cs_new_protected_nopar:Npn \char_set_catcode_group_begin:N #1 +\cs_new_protected:Npn \char_set_catcode_group_begin:N #1 { \char_set_catcode:nn { `#1 } \c_one } -\cs_new_protected_nopar:Npn \char_set_catcode_group_end:N #1 +\cs_new_protected:Npn \char_set_catcode_group_end:N #1 { \char_set_catcode:nn { `#1 } \c_two } -\cs_new_protected_nopar:Npn \char_set_catcode_math_toggle:N #1 +\cs_new_protected:Npn \char_set_catcode_math_toggle:N #1 { \char_set_catcode:nn { `#1 } \c_three } -\cs_new_protected_nopar:Npn \char_set_catcode_alignment:N #1 +\cs_new_protected:Npn \char_set_catcode_alignment:N #1 { \char_set_catcode:nn { `#1 } \c_four } -\cs_new_protected_nopar:Npn \char_set_catcode_end_line:N #1 +\cs_new_protected:Npn \char_set_catcode_end_line:N #1 { \char_set_catcode:nn { `#1 } \c_five } -\cs_new_protected_nopar:Npn \char_set_catcode_parameter:N #1 +\cs_new_protected:Npn \char_set_catcode_parameter:N #1 { \char_set_catcode:nn { `#1 } \c_six } -\cs_new_protected_nopar:Npn \char_set_catcode_math_superscript:N #1 +\cs_new_protected:Npn \char_set_catcode_math_superscript:N #1 { \char_set_catcode:nn { `#1 } \c_seven } -\cs_new_protected_nopar:Npn \char_set_catcode_math_subscript:N #1 +\cs_new_protected:Npn \char_set_catcode_math_subscript:N #1 { \char_set_catcode:nn { `#1 } \c_eight } -\cs_new_protected_nopar:Npn \char_set_catcode_ignore:N #1 +\cs_new_protected:Npn \char_set_catcode_ignore:N #1 { \char_set_catcode:nn { `#1 } \c_nine } -\cs_new_protected_nopar:Npn \char_set_catcode_space:N #1 +\cs_new_protected:Npn \char_set_catcode_space:N #1 { \char_set_catcode:nn { `#1 } \c_ten } -\cs_new_protected_nopar:Npn \char_set_catcode_letter:N #1 +\cs_new_protected:Npn \char_set_catcode_letter:N #1 { \char_set_catcode:nn { `#1 } \c_eleven } -\cs_new_protected_nopar:Npn \char_set_catcode_other:N #1 +\cs_new_protected:Npn \char_set_catcode_other:N #1 { \char_set_catcode:nn { `#1 } \c_twelve } -\cs_new_protected_nopar:Npn \char_set_catcode_active:N #1 +\cs_new_protected:Npn \char_set_catcode_active:N #1 { \char_set_catcode:nn { `#1 } \c_thirteen } -\cs_new_protected_nopar:Npn \char_set_catcode_comment:N #1 +\cs_new_protected:Npn \char_set_catcode_comment:N #1 { \char_set_catcode:nn { `#1 } \c_fourteen } -\cs_new_protected_nopar:Npn \char_set_catcode_invalid:N #1 +\cs_new_protected:Npn \char_set_catcode_invalid:N #1 { \char_set_catcode:nn { `#1 } \c_fifteen } -\cs_new_protected_nopar:Npn \char_set_catcode_escape:n #1 +\cs_new_protected:Npn \char_set_catcode_escape:n #1 { \char_set_catcode:nn {#1} \c_zero } -\cs_new_protected_nopar:Npn \char_set_catcode_group_begin:n #1 +\cs_new_protected:Npn \char_set_catcode_group_begin:n #1 { \char_set_catcode:nn {#1} \c_one } -\cs_new_protected_nopar:Npn \char_set_catcode_group_end:n #1 +\cs_new_protected:Npn \char_set_catcode_group_end:n #1 { \char_set_catcode:nn {#1} \c_two } -\cs_new_protected_nopar:Npn \char_set_catcode_math_toggle:n #1 +\cs_new_protected:Npn \char_set_catcode_math_toggle:n #1 { \char_set_catcode:nn {#1} \c_three } -\cs_new_protected_nopar:Npn \char_set_catcode_alignment:n #1 +\cs_new_protected:Npn \char_set_catcode_alignment:n #1 { \char_set_catcode:nn {#1} \c_four } -\cs_new_protected_nopar:Npn \char_set_catcode_end_line:n #1 +\cs_new_protected:Npn \char_set_catcode_end_line:n #1 { \char_set_catcode:nn {#1} \c_five } -\cs_new_protected_nopar:Npn \char_set_catcode_parameter:n #1 +\cs_new_protected:Npn \char_set_catcode_parameter:n #1 { \char_set_catcode:nn {#1} \c_six } -\cs_new_protected_nopar:Npn \char_set_catcode_math_superscript:n #1 +\cs_new_protected:Npn \char_set_catcode_math_superscript:n #1 { \char_set_catcode:nn {#1} \c_seven } -\cs_new_protected_nopar:Npn \char_set_catcode_math_subscript:n #1 +\cs_new_protected:Npn \char_set_catcode_math_subscript:n #1 { \char_set_catcode:nn {#1} \c_eight } -\cs_new_protected_nopar:Npn \char_set_catcode_ignore:n #1 +\cs_new_protected:Npn \char_set_catcode_ignore:n #1 { \char_set_catcode:nn {#1} \c_nine } -\cs_new_protected_nopar:Npn \char_set_catcode_space:n #1 +\cs_new_protected:Npn \char_set_catcode_space:n #1 { \char_set_catcode:nn {#1} \c_ten } -\cs_new_protected_nopar:Npn \char_set_catcode_letter:n #1 +\cs_new_protected:Npn \char_set_catcode_letter:n #1 { \char_set_catcode:nn {#1} \c_eleven } -\cs_new_protected_nopar:Npn \char_set_catcode_other:n #1 +\cs_new_protected:Npn \char_set_catcode_other:n #1 { \char_set_catcode:nn {#1} \c_twelve } -\cs_new_protected_nopar:Npn \char_set_catcode_active:n #1 +\cs_new_protected:Npn \char_set_catcode_active:n #1 { \char_set_catcode:nn {#1} \c_thirteen } -\cs_new_protected_nopar:Npn \char_set_catcode_comment:n #1 +\cs_new_protected:Npn \char_set_catcode_comment:n #1 { \char_set_catcode:nn {#1} \c_fourteen } -\cs_new_protected_nopar:Npn \char_set_catcode_invalid:n #1 +\cs_new_protected:Npn \char_set_catcode_invalid:n #1 { \char_set_catcode:nn {#1} \c_fifteen } -\cs_new_protected_nopar:Npn \char_set_mathcode:nn #1#2 +\cs_new_protected:Npn \char_set_mathcode:nn #1#2 { \tex_mathcode:D #1 = \int_eval:w #2 \int_eval_end: } -\cs_new_nopar:Npn \char_value_mathcode:n #1 +\cs_new:Npn \char_value_mathcode:n #1 { \tex_the:D \tex_mathcode:D \int_eval:w #1\int_eval_end: } -\cs_new_nopar:Npn \char_show_value_mathcode:n #1 +\cs_new_protected:Npn \char_show_value_mathcode:n #1 { \tex_showthe:D \tex_mathcode:D \int_eval:w #1 \int_eval_end: } -\cs_new_protected_nopar:Npn \char_set_lccode:nn #1#2 +\cs_new_protected:Npn \char_set_lccode:nn #1#2 { \tex_lccode:D #1 = \int_eval:w #2 \int_eval_end: } -\cs_new_nopar:Npn \char_value_lccode:n #1 +\cs_new:Npn \char_value_lccode:n #1 { \tex_the:D \tex_lccode:D \int_eval:w #1\int_eval_end: } -\cs_new_nopar:Npn \char_show_value_lccode:n #1 +\cs_new_protected:Npn \char_show_value_lccode:n #1 { \tex_showthe:D \tex_lccode:D \int_eval:w #1 \int_eval_end: } -\cs_new_protected_nopar:Npn \char_set_uccode:nn #1#2 +\cs_new_protected:Npn \char_set_uccode:nn #1#2 { \tex_uccode:D #1 = \int_eval:w #2 \int_eval_end: } -\cs_new_nopar:Npn \char_value_uccode:n #1 +\cs_new:Npn \char_value_uccode:n #1 { \tex_the:D \tex_uccode:D \int_eval:w #1\int_eval_end: } -\cs_new_nopar:Npn \char_show_value_uccode:n #1 +\cs_new_protected:Npn \char_show_value_uccode:n #1 { \tex_showthe:D \tex_uccode:D \int_eval:w #1 \int_eval_end: } -\cs_new_protected_nopar:Npn \char_set_sfcode:nn #1#2 +\cs_new_protected:Npn \char_set_sfcode:nn #1#2 { \tex_sfcode:D #1 = \int_eval:w #2 \int_eval_end: } -\cs_new_nopar:Npn \char_value_sfcode:n #1 +\cs_new:Npn \char_value_sfcode:n #1 { \tex_the:D \tex_sfcode:D \int_eval:w #1\int_eval_end: } -\cs_new_nopar:Npn \char_show_value_sfcode:n #1 +\cs_new_protected:Npn \char_show_value_sfcode:n #1 { \tex_showthe:D \tex_sfcode:D \int_eval:w #1 \int_eval_end: } -\cs_new_protected_nopar:Npn \token_new:Nn #1#2 { \cs_new_eq:NN #1 #2 } +\cs_new_protected:Npn \token_new:Nn #1#2 { \cs_new_eq:NN #1 #2 } \cs_new_eq:NN \c_group_begin_token { \cs_new_eq:NN \c_group_end_token } \group_begin: @@ -253,7 +253,7 @@ \exp_after:wN \token_if_macro_p_aux:w \token_to_meaning:N #1 MA; \q_stop } - \cs_new_nopar:Npn \token_if_macro_p_aux:w #1 MA #2 ; #3 \q_stop + \cs_new:Npn \token_if_macro_p_aux:w #1 MA #2 ; #3 \q_stop { \if_int_compare:w \pdftex_strcmp:D { #2 } { cro } = \c_zero \prg_return_true: @@ -293,14 +293,14 @@ \exp_after:wN \token_if_chardef_aux:w \token_to_meaning:N #1 ?CHAR" \q_stop } - \cs_new_nopar:Npn \token_if_chardef_aux:w #1 ?CHAR" #2 \q_stop + \cs_new:Npn \token_if_chardef_aux:w #1 ?CHAR" #2 \q_stop { \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } } \prg_new_conditional:Npnn \token_if_mathchardef:N #1 { p , T , F , TF } { \exp_after:wN \token_if_mathchardef_aux:w \token_to_meaning:N #1 ?MAYHCHAR" \q_stop } - \cs_new_nopar:Npn \token_if_mathchardef_aux:w #1 ?MAYHCHAR" #2 \q_stop + \cs_new:Npn \token_if_mathchardef_aux:w #1 ?MAYHCHAR" #2 \q_stop { \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } } \prg_new_conditional:Npnn \token_if_int_register:N #1 { p , T , F , TF } { @@ -311,7 +311,7 @@ \token_to_meaning:N #1 ?COUXY \q_stop \fi: } - \cs_new_nopar:Npn \token_if_int_register_aux:w #1 ?COUXY #2 \q_stop + \cs_new:Npn \token_if_int_register_aux:w #1 ?COUXY #2 \q_stop { \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } } \prg_new_conditional:Npnn \token_if_skip_register:N #1 { p , T , F , TF } { @@ -322,7 +322,7 @@ \token_to_meaning:N #1?SKIP\q_stop \fi: } - \cs_new_nopar:Npn \token_if_skip_register_aux:w #1 ?SKIP #2 \q_stop + \cs_new:Npn \token_if_skip_register_aux:w #1 ?SKIP #2 \q_stop { \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } } \prg_new_conditional:Npnn \token_if_dim_register:N #1 { p , T , F , TF } { @@ -333,7 +333,7 @@ \token_to_meaning:N #1 ?ZIMEX \q_stop \fi: } - \cs_new_nopar:Npn \token_if_dim_register_aux:w #1 ?ZIMEX #2 \q_stop + \cs_new:Npn \token_if_dim_register_aux:w #1 ?ZIMEX #2 \q_stop { \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } } \prg_new_conditional:Npnn \token_if_toks_register:N #1 { p , T , F , TF } { @@ -344,7 +344,7 @@ \token_to_meaning:N #1 ?YOKS \q_stop \fi: } - \cs_new_nopar:Npn \token_if_toks_register_aux:w #1 ?YOKS #2 \q_stop + \cs_new:Npn \token_if_toks_register_aux:w #1 ?YOKS #2 \q_stop { \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } } \prg_new_conditional:Npnn \token_if_protected_macro:N #1 { p , T , F , TF } @@ -352,7 +352,7 @@ \exp_after:wN \token_if_protected_macro_aux:w \token_to_meaning:N #1 ?PROYECYEZ~MACRO \q_stop } - \cs_new_nopar:Npn \token_if_protected_macro_aux:w + \cs_new:Npn \token_if_protected_macro_aux:w #1 ?PROYECYEZ~MACRO #2 \q_stop { \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } } \prg_new_conditional:Npnn \token_if_long_macro:N #1 { p , T , F , TF } @@ -360,7 +360,7 @@ \exp_after:wN \token_if_long_macro_aux:w \token_to_meaning:N #1 ?LOXG~MACRO \q_stop } - \cs_new_nopar:Npn \token_if_long_macro_aux:w #1 ?LOXG~MACRO #2 \q_stop + \cs_new:Npn \token_if_long_macro_aux:w #1 ?LOXG~MACRO #2 \q_stop { \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } } \prg_new_conditional:Npnn \token_if_protected_long_macro:N #1 { p , T , F , TF } @@ -368,7 +368,7 @@ \exp_after:wN \token_if_protected_long_macro_aux:w \token_to_meaning:N #1 ?PROYECYEZ?LOXG~MACRO \q_stop } - \cs_new_nopar:Npn \token_if_protected_long_macro_aux:w + \cs_new:Npn \token_if_protected_long_macro_aux:w #1 ?PROYECYEZ?LOXG~MACRO #2 \q_stop { \tl_if_empty:nTF {#1} { \prg_return_true: } { \prg_return_false: } } } @@ -389,14 +389,14 @@ \token_to_meaning:N #1 ; ; ; \q_stop #1 } } - \cs_new_nopar:Npn \token_if_primitive_aux:NNw #1#2 #3 ; #4 \q_stop + \cs_new:Npn \token_if_primitive_aux:NNw #1#2 #3 ; #4 \q_stop { \tl_if_empty:oTF { \token_if_primitive_aux_space:w #3 ~ } { \token_if_primitive_aux_loop:N #3 ; \q_stop } { \token_if_primitive_aux_nullfont:N } } } -\cs_new_nopar:Npn \token_if_primitive_aux_space:w #1 ~ { } +\cs_new:Npn \token_if_primitive_aux_space:w #1 ~ { } \cs_new:Npn \token_if_primitive_aux_nullfont:N #1 { \if_meaning:w \tex_nullfont:D #1 @@ -405,7 +405,7 @@ \prg_return_false: \fi: } -\cs_new_nopar:Npn \token_if_primitive_aux_loop:N #1 +\cs_new:Npn \token_if_primitive_aux_loop:N #1 { \if_num:w `#1 < \c_token_A_int % \exp_after:wN \token_if_primitive_auxii:Nw @@ -414,7 +414,7 @@ \exp_after:wN \token_if_primitive_aux_loop:N \fi: } -\cs_new_nopar:Npn \token_if_primitive_auxii:Nw #1 #2 \q_stop +\cs_new:Npn \token_if_primitive_auxii:Nw #1 #2 \q_stop { \if:w : #1 \exp_after:wN \token_if_primitive_aux_undefined:N @@ -434,7 +434,7 @@ \cs_new_eq:NN \l_peek_token ? \cs_new_eq:NN \g_peek_token ? \cs_new_eq:NN \l_peek_search_token ? -\cs_new_nopar:Npn \l_peek_search_tl { } +\tl_new:N \l_peek_search_tl \cs_new_nopar:Npn \peek_true:w { } \cs_new_nopar:Npn \peek_true_aux:w { } \cs_new_nopar:Npn \peek_false:w { } @@ -540,13 +540,13 @@ \cs_new_protected_nopar:Npn \peek_ignore_spaces_execute_branches_aux: { \peek_after:Nw \peek_ignore_spaces_execute_branches: } \group_begin: - \cs_set_nopar:Npn \peek_def:nnnn #1#2#3#4 + \cs_set:Npn \peek_def:nnnn #1#2#3#4 { \peek_def_aux:nnnnn {#1} {#2} {#3} {#4} { TF } \peek_def_aux:nnnnn {#1} {#2} {#3} {#4} { T } \peek_def_aux:nnnnn {#1} {#2} {#3} {#4} { F } } - \cs_set_nopar:Npn \peek_def_aux:nnnnn #1#2#3#4#5 + \cs_set:Npn \peek_def_aux:nnnnn #1#2#3#4#5 { \cs_gset_nopar:cpx { #1 #5 } { @@ -606,7 +606,7 @@ { \peek_ignore_spaces_execute_branches: } \group_end: \exp_args:Nno \use:nn - { \cs_new_nopar:Npn \token_get_prefix_arg_replacement_aux:wN #1 } + { \cs_new:Npn \token_get_prefix_arg_replacement_aux:wN #1 } { \tl_to_str:n { macro : } #2 -> #3 \q_stop #4 } { #4 {#1} {#2} {#3} } \cs_new:Npn \token_get_prefix_spec:N #1 @@ -648,12 +648,12 @@ \tl_to_lowercase:n { \group_end: #2 ^^@ } } } - \char_tmp:NN \char_active_set:Npn \cs_set:Npn - \char_tmp:NN \char_active_set:Npx \cs_set:Npx - \char_tmp:NN \char_active_gset:Npn \cs_gset:Npn - \char_tmp:NN \char_active_gset:Npx \cs_gset:Npx - \char_tmp:NN \char_active_set_eq:NN \cs_set_eq:NN - \char_tmp:NN \char_active_gset_eq:NN \cs_gset_eq:NN + \char_tmp:NN \char_set_active:Npn \cs_set:Npn + \char_tmp:NN \char_set_active:Npx \cs_set:Npx + \char_tmp:NN \char_gset_active:Npn \cs_gset:Npn + \char_tmp:NN \char_gset_active:Npx \cs_gset:Npx + \char_tmp:NN \char_set_active_eq:NN \cs_set_eq:NN + \char_tmp:NN \char_gset_active_eq:NN \cs_gset_eq:NN \group_end: \cs_new_protected_nopar:Npn \peek_execute_branches_N_type: { |