diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 6e360dc8537..4ea50a5fa84 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -80,8 +80,8 @@ %% ----------------------------------------------------------------------- \def\ExplFileName{expl3} \def\ExplFileDescription{L3 programming layer} -\def\ExplFileDate{2014/08/25} -\def\ExplFileVersion{5378} +\def\ExplFileDate{2014/09/15} +\def\ExplFileVersion{5423} \begingroup \def\next{\endgroup} \expandafter\ifx\csname PackageError\endcsname\relax @@ -3816,7 +3816,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3int.dtx 5372 2014-08-25 02:01:41Z bruno $ +\GetIdInfo$Id: l3int.dtx 5421 2014-09-14 07:52:58Z joseph $ {L3 Integers} \cs_new_eq:NN \__int_value:w \tex_number:D \cs_new_eq:NN \__int_eval:w \etex_numexpr:D @@ -4208,7 +4208,7 @@ \int_step_function:nnnN {#3} {#4} {#5} #2 \__prg_break_point:Nn \scan_stop: { \int_gdecr:N \g__prg_map_int } } -\cs_new:Npn \int_to_arabic:n #1 { \int_eval:n {#1} } +\cs_new_eq:NN \int_to_arabic:n \int_eval:n \cs_new:Npn \int_to_symbols:nnn #1#2#3 { \int_compare:nNnTF {#1} > {#2} @@ -4473,7 +4473,7 @@ { \int_eval:n { - \__int_pass_signs:wn #1 + \exp_after:wN \__int_pass_signs:wn \tl_to_str:n {#1} \q_stop { \__int_from_alph:nN { 0 } } \q_recursion_tail \q_recursion_stop } @@ -4490,7 +4490,7 @@ { \int_eval:n { - \__int_pass_signs:wn #1 + \exp_after:wN \__int_pass_signs:wn \tl_to_str:n {#1} \q_stop { \__int_from_base:nnN { 0 } {#2} } \q_recursion_tail \q_recursion_stop } @@ -5711,7 +5711,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3token.dtx 5354 2014-08-23 01:35:39Z bruno $ +\GetIdInfo$Id: l3token.dtx 5422 2014-09-15 10:44:23Z joseph $ {L3 Experimental token manipulation} \cs_new_protected:Npn \char_set_catcode:nn #1#2 { \tex_catcode:D #1 = \__int_eval:w #2 \__int_eval_end: } @@ -5808,20 +5808,23 @@ \cs_new_protected:Npn \char_show_value_sfcode:n #1 { \int_show:n { \char_value_sfcode:n {#1} } } \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: + \__chk_if_free_cs:N \c_group_begin_token + \tex_global:D \tex_let:D \c_group_begin_token { + \__chk_if_free_cs:N \c_group_end_token + \tex_global:D \tex_let:D \c_group_end_token } \char_set_catcode_math_toggle:N \* - \token_new:Nn \c_math_toggle_token { * } + \cs_new_eq:NN \c_math_toggle_token * \char_set_catcode_alignment:N \* - \token_new:Nn \c_alignment_token { * } - \token_new:Nn \c_parameter_token { # } - \token_new:Nn \c_math_superscript_token { ^ } + \cs_new_eq:NN \c_alignment_token * + \cs_new_eq:NN \c_parameter_token # + \cs_new_eq:NN \c_math_superscript_token ^ \char_set_catcode_math_subscript:N \* - \token_new:Nn \c_math_subscript_token { * } - \token_new:Nn \c_space_token { ~ } - \token_new:Nn \c_catcode_letter_token { a } - \token_new:Nn \c_catcode_other_token { 1 } + \cs_new_eq:NN \c_math_subscript_token * + \__chk_if_free_cs:N \c_space_token + \use:n { \tex_global:D \tex_let:D \c_space_token = ~ } ~ + \cs_new_eq:NN \c_catcode_letter_token a + \cs_new_eq:NN \c_catcode_other_token 1 \group_end: \group_begin: \char_set_catcode_active:N \* @@ -10294,7 +10297,10 @@ \exp_after:wN \__fp_parse_prefix:NNN \exp_after:wN #1 \exp_after:wN #2 - \cs:w __fp_parse_prefix_#2:Nw \exp_after:wN \cs_end: + \cs:w + __fp_parse_prefix_ \token_to_str:N #2 :Nw + \exp_after:wN + \cs_end: \tex_romannumeral:D \fi: \__fp_parse_expand:w @@ -10340,7 +10346,7 @@ } \cs_new:Npn \__fp_parse_prefix_unknown:NNN #1#2#3 { - \cs_if_exist:cTF { __fp_parse_infix_#1:N } + \cs_if_exist:cTF { __fp_parse_infix_ \token_to_str:N #1 :N } { \__msg_kernel_expandable_error:nnn { kernel } { fp-missing-number } {#1} @@ -10951,7 +10957,7 @@ \else: \exp_after:wN \__fp_parse_infix_check:NNN \cs:w - __fp_parse_infix_#2:N + __fp_parse_infix_ \token_to_str:N #2 :N \exp_after:wN \exp_after:wN \exp_after:wN \cs_end: \fi: |