diff options
author | Karl Berry <karl@freefriends.org> | 2015-07-29 20:47:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-07-29 20:47:01 +0000 |
commit | db0facd61cf60ed3452c300b54f11c0524a50a53 (patch) | |
tree | 74963ac7b29b8e5c006ddeee61b1fe8b5c28a068 /Master/texmf-dist/tex/latex/l3kernel | |
parent | c65840a39db649af13ec3ceefaa2481d37d1e086 (diff) |
l3 (29jul15)
git-svn-id: svn://tug.org/texlive/trunk@37997 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel')
4 files changed, 63 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index a15d2022461..1b601e21869 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -81,8 +81,8 @@ %% ----------------------------------------------------------------------- \def\ExplFileName{expl3} \def\ExplFileDescription{L3 programming layer} -\def\ExplFileDate{2015/07/15} -\def\ExplFileVersion{5666} +\def\ExplFileDate{2015/07/28} +\def\ExplFileVersion{5700} \begingroup \def\next{\endgroup} \expandafter\ifx\csname PackageError\endcsname\relax @@ -446,7 +446,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3names.dtx 5644 2015-06-30 07:59:24Z joseph $ +\GetIdInfo$Id: l3names.dtx 5691 2015-07-27 19:53:13Z joseph $ {L3 Namespace for primitives} \let \tex_global:D \global \let \tex_let:D \let @@ -1269,7 +1269,10 @@ \tex_let:D \pdftex_primitive:D \primitive \tex_let:D \pdftex_shellescape:D \shellescape \tex_fi:D -\etex_unless:D \pdftex_ifprimitive:D \pdftex_mapfile:D +\tex_ifnum:D 0 + \etex_ifdefined:D \pdftex_pdftexversion:D 1 \tex_fi:D + \etex_ifdefined:D \luatex_luatexversion:D 1 \tex_fi:D + = 0 % \tex_let:D \pdftex_mapfile:D \tex_undefined:D \tex_let:D \pdftex_mapline:D \tex_undefined:D \tex_fi:D @@ -3640,7 +3643,7 @@ { c__unicode_ #9 _ #6 _X_ #7 _tl } { #8 } } -%% File: l3seq.dtx Copyright (C) 1990-2014 The LaTeX3 Project +%% File: l3seq.dtx Copyright (C) 1990-2015 The LaTeX3 Project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -3672,7 +3675,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3seq.dtx 5354 2014-08-23 01:35:39Z bruno $ +\GetIdInfo$Id: l3seq.dtx 5681 2015-07-24 03:01:31Z bruno $ {L3 Sequences and stacks} \cs_new:Npn \__seq_item:n { @@ -7926,10 +7929,11 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3file.dtx 5627 2015-06-07 09:26:26Z bruno $ +\GetIdInfo$Id: l3file.dtx 5688 2015-07-27 16:57:49Z bruno $ {L3 File and I/O operations} \tl_new:N \g_file_current_name_tl -\tl_gset_eq:NN \g_file_current_name_tl \@currname +\cs_if_exist:NT \@currname + { \tl_gset_eq:NN \g_file_current_name_tl \@currname } \seq_new:N \g__file_stack_seq \seq_new:N \g__file_record_seq \tl_new:N \l__file_internal_tl @@ -8133,13 +8137,15 @@ \prg_return_true: } } +\exp_args:NNNo \exp_args:NNo \cs_new_protected_nopar:Npn \__ior_new:N + { \cs:w newread \cs_end: } \cs_new_protected:Npn \__ior_open:Nn #1#2 { \ior_close:N #1 \seq_gpop:NNTF \g__ior_streams_seq \l__ior_stream_tl { \__ior_open_stream:Nn #1 {#2} } { - \cs:w newread \cs_end: #1 + \__ior_new:N #1 \tl_set:Nx \l__ior_stream_tl { \int_eval:n {#1} } \__ior_open_stream:Nn #1 {#2} } @@ -8223,6 +8229,8 @@ } \cs_new_protected:Npn \iow_new:N #1 { \cs_new_eq:NN #1 \c_term_iow } \cs_generate_variant:Nn \iow_new:N { c } +\exp_args:NNNo \exp_args:NNo \cs_new_protected_nopar:Npn \__iow_new:N + { \cs:w newwrite \cs_end: } \cs_new_protected:Npn \iow_open:Nn #1#2 { \__file_name_sanitize:nn {#2} { \__iow_open:Nn #1 } } \cs_generate_variant:Nn \iow_open:Nn { c } @@ -8232,7 +8240,7 @@ \seq_gpop:NNTF \g__iow_streams_seq \l__iow_stream_tl { \__iow_open_stream:Nn #1 {#2} } { - \cs:w newwrite \cs_end: #1 + \__iow_new:N #1 \tl_set:Nx \l__iow_stream_tl { \int_eval:n {#1} } \__iow_open_stream:Nn #1 {#2} } @@ -8972,7 +8980,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3keys.dtx 5665 2015-07-15 06:13:22Z joseph $ +\GetIdInfo$Id: l3keys.dtx 5684 2015-07-26 07:23:48Z joseph $ {L3 Key-value interfaces} \int_new:N \g__keyval_level_int \tl_new:N \l__keyval_key_tl @@ -9164,6 +9172,7 @@ } \cs_if_exist:cF { \c__keys_code_root_tl #1 } { + \__chk_if_free_cs:c { \c__keys_code_root_tl #1 } \cs_set_protected:cpn { \c__keys_code_root_tl #1 } ##1 { } } } @@ -9271,7 +9280,7 @@ \cs_new_protected:Npn \__keys_default_set:n #1 { \__keys_ensure_exist:V \l_keys_path_tl - \tl_if_blank:nTF {#1} + \tl_if_empty:nTF {#1} { \prop_remove:cn { \c__keys_info_root_tl \l_keys_path_tl } { default } @@ -9530,28 +9539,37 @@ \cs_new_protected:Npn \__keys_set_elt:n #1 { \bool_set_true:N \l__keys_no_value_bool - \__keys_set_elt_aux:nn {#1} { } + \__keys_set_elt_aux:onn \l__keys_module_tl {#1} { } } \cs_new_protected:Npn \__keys_set_elt:nn #1#2 { \bool_set_false:N \l__keys_no_value_bool - \__keys_set_elt_aux:nn {#1} {#2} + \__keys_set_elt_aux:onn \l__keys_module_tl {#1} {#2} } -\cs_new_protected:Npn \__keys_set_elt_aux:nn #1#2 +\cs_new_protected:Npn \__keys_set_elt_aux:nnn #1#2#3 { - \tl_set:Nx \l_keys_path_tl { \l__keys_module_tl / \tl_to_str:n {#1} } - \tl_set:Nx \l_keys_key_tl - { \exp_after:wN \__keys_key_find:w \l_keys_path_tl / \q_stop } - \__keys_value_or_default:n {#2} + \tl_set:Nx \l_keys_path_tl { \l__keys_module_tl / \tl_to_str:n {#2} } + \tl_clear:N \l__keys_module_tl + \exp_after:wN \__keys_find_key_module:w \l_keys_path_tl / \q_stop + \__keys_value_or_default:n {#3} \bool_if:NTF \l__keys_selective_bool { \__keys_set_elt_selective: } { \__keys_set_elt_aux: } + \tl_set:Nn \l__keys_module_tl {#1} } -\cs_new:Npn \__keys_key_find:w #1 / #2 \q_stop +\cs_generate_variant:Nn \__keys_set_elt_aux:nnn { o } +\cs_new_protected:Npn \__keys_find_key_module:w #1 / #2 \q_stop { \tl_if_blank:nTF {#2} - { #1 } - { \__keys_key_find:w #2 \q_stop } + { \tl_set:Nn \l_keys_key_tl {#1} } + { + \tl_put_right:Nx \l__keys_module_tl + { + \tl_if_empty:NF \l__keys_module_tl { / } + #1 + } + \__keys_find_key_module:w #2 \q_stop + } } \cs_new_protected_nopar:Npn \__keys_set_elt_aux: { @@ -16407,7 +16425,7 @@ %% %% ----------------------------------------------------------------------- %% -\GetIdInfo$Id: l3candidates.dtx 5613 2015-05-21 11:59:04Z joseph $ +\GetIdInfo$Id: l3candidates.dtx 5677 2015-07-22 14:47:23Z joseph $ {L3 Experimental additions to l3kernel} \group_begin: \tex_lccode:D `? = `: \scan_stop: @@ -17907,6 +17925,12 @@ #3 \q_recursion_stop } } +\cs_new:cpn { __tl_change_case_upper_de-alt:Nnw } #1#2 + { + \int_compare:nNnTF { `#1 } = { 223 } + { \__tl_change_case_output:Vwn \c__unicode_upper_Eszett_tl } + {#2} + } \cs_new:Npn \__tl_mixed_case:nn #1#2 { \etex_unexpanded:D \exp_after:wN diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 95d8485fd85..e9a3144afc8 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex @@ -47,8 +47,8 @@ %% ----------------------------------------------------------------------- \def\ExplFileName{expl3} \def\ExplFileDescription{L3 programming layer} -\def\ExplFileDate{2015/07/15} -\def\ExplFileVersion{5666} +\def\ExplFileDate{2015/07/28} +\def\ExplFileVersion{5700} \let\ExplLoaderFileVersion\ExplFileVersion \begingroup \def\tempa{LaTeX2e} diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index 4b34972bb49..5e8ed84d543 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -47,8 +47,8 @@ %% ----------------------------------------------------------------------- \def\ExplFileName{expl3} \def\ExplFileDescription{L3 programming layer} -\def\ExplFileDate{2015/07/15} -\def\ExplFileVersion{5666} +\def\ExplFileDate{2015/07/28} +\def\ExplFileVersion{5700} \let\ExplLoaderFileVersion\ExplFileVersion \ProvidesPackage{\ExplFileName} [% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3unicode-data.def b/Master/texmf-dist/tex/latex/l3kernel/l3unicode-data.def index f0802edf6c2..1246af783e5 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3unicode-data.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3unicode-data.def @@ -9,10 +9,9 @@ %% Version 8.0.0 dated 2015-01-13, 18:16:36 %% which are maintained by the Unicode Consortium. %% -%% Generated on 2015-07-01. +%% Generated on 2015-07-20. %% -\ProvidesExplFile {l3unicode-data.def} {2015/07/01} {5647} {L3 Unicode -data} +\ProvidesExplFile {l3unicode-data.def} {2015/07/20} {-1} {L3 Unicode data} \pdftex_if_engine:T { \group_begin: @@ -49,14 +48,15 @@ data} \tl_const:Nn \c__unicode_lower_exceptions_tl { } \tl_const:Nn \c__unicode_mixed_exceptions_tl { } \tl_const:Nn \c__unicode_upper_exceptions_tl { } - \tl_const:Nn \c__unicode_std_sigma_tl { } - \tl_const:Nn \c__unicode_final_sigma_tl { } - \tl_const:Nn \c__unicode_accents_lt_tl { } - \tl_const:Nn \c__unicode_dot_above_tl { } - \tl_const:Nn \c__unicode_dotless_i_tl { I } - \tl_const:Nn \c__unicode_dotted_I_tl { i } - \tl_const:Nn \c__unicode_i_ogonek_tl { } - \tl_const:Nn \c__unicode_I_ogonek_tl { } + \tl_const:Nn \c__unicode_std_sigma_tl { } + \tl_const:Nn \c__unicode_final_sigma_tl { } + \tl_const:Nn \c__unicode_accents_lt_tl { } + \tl_const:Nn \c__unicode_dot_above_tl { } + \tl_const:Nn \c__unicode_dotless_i_tl { I } + \tl_const:Nn \c__unicode_dotted_I_tl { i } + \tl_const:Nn \c__unicode_i_ogonek_tl { } + \tl_const:Nn \c__unicode_I_ogonek_tl { } + \tl_const:Nn \c__unicode_upper_Eszett_tl { } \tex_endinput:D } \tl_const:cn { c__unicode_lower_0_X_0_tl } { ÈèĬĭƐɛǴǵϨϩҰұԔԕᏬꮼḔḕṸṹỜờⒸⓒⰤⱔⲈⲉꙨꙩ } @@ -269,6 +269,7 @@ data} \tl_const:Nn \c__unicode_dotted_I_tl { İ } \tl_const:Nn \c__unicode_i_ogonek_tl { į } \tl_const:Nn \c__unicode_I_ogonek_tl { Į } +\tl_const:Nn \c__unicode_upper_Eszett_tl { ẞ } \tl_const:Nn \c__unicode_accents_lt_tl {Ì{i̇̀}Í{i̇́}Ĩ{i̇̃}} \tl_const:cn { c__unicode_fold_0_X_0_tl } { ÈèĬĭƐɛǴǵϨϩҰұԔԕḔḕṸṹỜờᾤ{ὤι}ⒸⓒⰤⱔⲈⲉꙨꙩꭼᎬ } \tl_const:cn { c__unicode_fold_0_X_1_tl } { ÉéƑƒჍⴭᾥ{ὥι}ⒹⓓⰥⱕⳭⳮꭽᎭ } |