summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty429
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex424
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex8
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3basics.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3box.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3clist.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3color.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3doc.cls17
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex12
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3expan.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3file.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3fp.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3int.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3keys.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3msg.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3names.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3prg.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3prop.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3quark.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3seq.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3skip.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3sort.sty50
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3tl.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3token.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty8
43 files changed, 566 insertions, 544 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
deleted file mode 100644
index bc01c1d4039..00000000000
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
+++ /dev/null
@@ -1,429 +0,0 @@
-%%
-%% This is file `l3sort.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% l3sort.dtx (with options: `package')
-%%
-%% Copyright (C) 2012-2016 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 license or (at your option) any later version. The latest
-%% version of this license is in the file:
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3experimental bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% File l3sort.dtx (C) Copyright 2012,2014-2016 The LaTeX3 Project
-\RequirePackage{expl3}[2017/01/28]
-\@ifpackagelater{expl3}{2017/01/28}
- {}
- {%
- \PackageError{l3sort}{Support package l3kernel too old}
- {%
- Please install an up to date version of l3kernel\MessageBreak
- using your TeX package manager or from CTAN.\MessageBreak
- \MessageBreak
- Loading l3sort will abort!%
- }%
- \endinput
- }
-\GetIdInfo$Id: l3sort.dtx 6829 2017-01-28 08:52:51Z joseph $
- {L3 Experimental sorting functions}
-\ProvidesExplPackage
- {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\int_new:N \l__sort_length_int
-\int_new:N \l__sort_min_int
-\int_new:N \l__sort_top_int
-\int_new:N \l__sort_max_int
-\int_new:N \l__sort_true_max_int
-\int_new:N \l__sort_block_int
-\int_new:N \l__sort_begin_int
-\int_new:N \l__sort_end_int
-\int_new:N \l__sort_A_int
-\int_new:N \l__sort_B_int
-\int_new:N \l__sort_C_int
-\cs_new_protected:Npn \__sort_shrink_range:
- {
- \int_set:Nn \l__sort_A_int
- { \l__sort_true_max_int - \l__sort_min_int + \c_one }
- \int_set:Nn \l__sort_block_int { \c_max_register_int / \c_two }
- \__sort_shrink_range_loop:
- \int_set:Nn \l__sort_max_int
- {
- \int_compare:nNnTF
- { \l__sort_block_int * \c_three / \c_two } > \l__sort_A_int
- {
- \l__sort_min_int
- + ( \l__sort_A_int - \c_one ) / \c_two
- + \l__sort_block_int / \c_four
- - \c_one
- }
- { \l__sort_true_max_int - \l__sort_block_int / \c_two }
- }
- }
-\cs_new_protected:Npn \__sort_shrink_range_loop:
- {
- \if_int_compare:w \l__sort_A_int < \l__sort_block_int
- \tex_divide:D \l__sort_block_int \c_two
- \exp_after:wN \__sort_shrink_range_loop:
- \fi:
- }
-\cs_new_protected:Npn \__sort_compute_range:
- {
- \int_set:Nn \l__sort_min_int { \tex_count:D 15 + \c_one }
- \int_set:Nn \l__sort_true_max_int { \c_max_register_int + \c_one }
- \__sort_shrink_range:
- \if_meaning:w \loctoks \tex_undefined:D \else:
- \if_meaning:w \loctoks \scan_stop: \else:
- \__sort_redefine_compute_range:
- \__sort_compute_range:
- \fi:
- \fi:
- }
-\cs_new_protected:Npn \__sort_redefine_compute_range:
- {
- \cs_if_exist:cTF { ver@elocalloc.sty }
- {
- \cs_gset_protected:Npn \__sort_compute_range:
- {
- \int_set:Nn \l__sort_min_int { \tex_count:D 265 }
- \int_set_eq:NN \l__sort_true_max_int \e@alloc@top
- \__sort_shrink_range:
- }
- }
- {
- \cs_gset_protected:Npn \__sort_compute_range:
- {
- \int_set:Nn \l__sort_min_int { \tex_count:D 265 }
- \int_set:Nn \l__sort_true_max_int { \tex_count:D 275 }
- \__sort_shrink_range:
- }
- }
- }
-\cs_if_exist:NT \loctoks { \__sort_redefine_compute_range: }
-\tl_map_inline:nn { \lastallocatedtoks \c_syst_last_allocated_toks }
- {
- \cs_if_exist:NT #1
- {
- \cs_gset_protected:Npn \__sort_compute_range:
- {
- \int_set:Nn \l__sort_min_int { #1 + \c_one }
- \int_set:Nn \l__sort_true_max_int { \c_max_register_int + \c_one }
- \__sort_shrink_range:
- }
- }
- }
-\cs_new_protected:Npn \__sort_main:NNNnNn #1#2#3#4#5#6
- {
- \group_begin:
- \__sort_disable_toksdef:
- \__sort_compute_range:
- \int_set_eq:NN \l__sort_top_int \l__sort_min_int
- #2 #5
- {
- \if_int_compare:w \l__sort_top_int = \l__sort_max_int
- \__sort_too_long_error:NNw #3 #5
- \fi:
- \tex_toks:D \l__sort_top_int {##1}
- \tex_advance:D \l__sort_top_int \c_one
- }
- \int_set:Nn \l__sort_length_int
- { \l__sort_top_int - \l__sort_min_int }
- \cs_set:Npn \__sort_compare:nn ##1 ##2 { #6 }
- \int_set_eq:NN \l__sort_block_int \c_one
- \__sort_level:
- \use:x
- {
- \group_end:
- #1 \exp_not:N #5 {#4}
- }
- }
-\cs_new_protected:Npn \seq_sort:Nn
- {
- \__sort_main:NNNnNn \tl_set:Nn
- \seq_map_inline:Nn \seq_map_break:n
- { \s__seq \__sort_toks:NN \exp_not:N \__seq_item:n }
- }
-\cs_new_protected:Npn \seq_gsort:Nn
- {
- \__sort_main:NNNnNn \tl_gset:Nn
- \seq_map_inline:Nn \seq_map_break:n
- { \s__seq \__sort_toks:NN \exp_not:N \__seq_item:n }
- }
-\cs_new_protected:Npn \tl_sort:Nn
- {
- \__sort_main:NNNnNn \tl_set:Nn
- \tl_map_inline:Nn \tl_map_break:n
- { \__sort_toks:NN \prg_do_nothing: \prg_do_nothing: }
- }
-\cs_new_protected:Npn \tl_gsort:Nn
- {
- \__sort_main:NNNnNn \tl_gset:Nn
- \tl_map_inline:Nn \tl_map_break:n
- { \__sort_toks:NN \prg_do_nothing: \prg_do_nothing: }
- }
-\cs_new_protected:Npn \clist_sort:Nn
- { \__sort_clist:NNn \tl_set:Nn }
-\cs_new_protected:Npn \clist_gsort:Nn
- { \__sort_clist:NNn \tl_gset:Nn }
-\cs_new_protected:Npn \__sort_clist:NNn #1#2#3
- {
- \clist_if_empty:NF #2
- {
- \__sort_main:NNNnNn #1
- \clist_map_inline:Nn \clist_map_break:n
- {
- \exp_last_unbraced:Nf \use_none:n
- { \__sort_toks:NN \exp_args:No \__clist_wrap_item:n }
- }
- #2 {#3}
- }
- }
-\cs_new:Npn \__sort_toks:NN #1#2
- { \__sort_toks:NNw #1 #2 \l__sort_min_int ; }
-\cs_new:Npn \__sort_toks:NNw #1#2#3 ;
- {
- \if_int_compare:w #3 < \l__sort_top_int
- #1 #2 { \tex_the:D \tex_toks:D #3 }
- \exp_after:wN \__sort_toks:NNw \exp_after:wN #1 \exp_after:wN #2
- \__int_value:w \__int_eval:w #3 + \c_one \exp_after:wN ;
- \fi:
- }
-\cs_new_protected:Npn \__sort_level:
- {
- \if_int_compare:w \l__sort_block_int < \l__sort_length_int
- \l__sort_end_int \l__sort_min_int
- \__sort_merge_blocks:
- \tex_advance:D \l__sort_block_int \l__sort_block_int
- \exp_after:wN \__sort_level:
- \fi:
- }
-\cs_new_protected:Npn \__sort_merge_blocks:
- {
- \l__sort_begin_int \l__sort_end_int
- \tex_advance:D \l__sort_end_int \l__sort_block_int
- \if_int_compare:w \l__sort_end_int < \l__sort_top_int
- \l__sort_A_int \l__sort_end_int
- \tex_advance:D \l__sort_end_int \l__sort_block_int
- \if_int_compare:w \l__sort_end_int > \l__sort_top_int
- \l__sort_end_int \l__sort_top_int
- \fi:
- \l__sort_B_int \l__sort_A_int
- \l__sort_C_int \l__sort_top_int
- \__sort_copy_block:
- \tex_advance:D \l__sort_A_int - \c_one
- \tex_advance:D \l__sort_B_int - \c_one
- \tex_advance:D \l__sort_C_int - \c_one
- \exp_after:wN \__sort_merge_blocks_aux:
- \exp_after:wN \__sort_merge_blocks:
- \fi:
- }
-\cs_new_protected:Npn \__sort_copy_block:
- {
- \tex_toks:D \l__sort_C_int \tex_toks:D \l__sort_B_int
- \tex_advance:D \l__sort_C_int \c_one
- \tex_advance:D \l__sort_B_int \c_one
- \if_int_compare:w \l__sort_B_int = \l__sort_end_int
- \use_i:nn
- \fi:
- \__sort_copy_block:
- }
-\cs_new_protected:Npn \__sort_merge_blocks_aux:
- {
- \exp_after:wN \__sort_compare:nn \exp_after:wN
- { \tex_the:D \tex_toks:D \exp_after:wN \l__sort_A_int \exp_after:wN }
- \exp_after:wN { \tex_the:D \tex_toks:D \l__sort_C_int }
- \prg_do_nothing:
- \__sort_return_mark:N
- \__sort_return_mark:N
- \__sort_return_none_error:
- }
-\cs_new_protected:Npn \sort_ordered: #1 \__sort_return_mark:N
- { #1 \__sort_return_mark:N \__sort_return_two_error:w \__sort_ordered: }
-\cs_new_protected:Npn \sort_reversed: #1 \__sort_return_mark:N
- { #1 \__sort_return_mark:N \__sort_return_two_error:w \__sort_return_reversed: }
-\cs_new_protected:Npn \__sort_return_mark:N #1 { }
-\cs_new_protected:Npn \__sort_return_none_error:
- {
- \__msg_kernel_error:nnxx { sort } { return-none }
- { \tex_the:D \tex_toks:D \l__sort_A_int }
- { \tex_the:D \tex_toks:D \l__sort_C_int }
- \__sort_ordered:
- }
-\cs_new_protected:Npn \__sort_return_two_error:w
- #1 \__sort_return_none_error:
- { \__msg_kernel_error:nn { sort } { return-two } }
-\cs_new_protected:Npn \__sort_ordered:
- {
- \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_C_int
- \tex_advance:D \l__sort_B_int - \c_one
- \tex_advance:D \l__sort_C_int - \c_one
- \if_int_compare:w \l__sort_C_int < \l__sort_top_int
- \use_i:nn
- \fi:
- \__sort_merge_blocks_aux:
- }
-\cs_new_protected:Npn \__sort_return_reversed:
- {
- \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_A_int
- \tex_advance:D \l__sort_B_int - \c_one
- \tex_advance:D \l__sort_A_int - \c_one
- \if_int_compare:w \l__sort_A_int < \l__sort_begin_int
- \__sort_merge_blocks_end: \use_i:nn
- \fi:
- \__sort_merge_blocks_aux:
- }
-\cs_new_protected:Npn \__sort_merge_blocks_end:
- {
- \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_C_int
- \tex_advance:D \l__sort_B_int - \c_one
- \tex_advance:D \l__sort_C_int - \c_one
- \if_int_compare:w \l__sort_B_int < \l__sort_begin_int
- \use_i:nn
- \fi:
- \__sort_merge_blocks_end:
- }
-\cs_new:Npn \tl_sort:nN #1#2
- {
- \exp_not:f
- {
- \tl_if_blank:nF {#1}
- {
- \__sort_quick_prepare:Nnnn #2 { } { }
- #1
- { \__prg_break_point: \__sort_quick_prepare_end:NNNnw }
- \q_stop
- }
- }
- }
-\cs_new:Npn \__sort_quick_prepare:Nnnn #1#2#3#4
- {
- \__prg_break: #4 \__prg_break_point:
- \__sort_quick_prepare:Nnnn #1 { #2 #3 } { #1 {#4} }
- }
-\cs_new:Npn \__sort_quick_prepare_end:NNNnw #1#2#3#4#5 \q_stop
- {
- \__sort_quick_split:NnNn #4 \__sort_quick_end:nnTFNn { }
- \q_mark { \__sort_quick_cleanup:w \exp_stop_f: }
- \s__stop \q_stop
- }
-\cs_new:Npn \__sort_quick_cleanup:w #1 \s__stop \q_stop {#1}
-\cs_new:Npn \__sort_quick_split:NnNn #1#2#3#4
- {
- #3 {#2} {#4} \__sort_quick_only_ii:NnnnnNn \__sort_quick_only_i:NnnnnNn
- \__sort_quick_single_end:nnnwnw
- { #3 {#4} } { } { } {#2}
- }
-\cs_new:Npn \__sort_quick_only_i:NnnnnNn #1#2#3#4#5#6#7
- {
- #6 {#5} {#7} \__sort_quick_split_ii:NnnnnNn \__sort_quick_only_i:NnnnnNn
- \__sort_quick_only_i_end:nnnwnw
- { #6 {#7} } { #3 #2 } { } {#5}
- }
-\cs_new:Npn \__sort_quick_only_ii:NnnnnNn #1#2#3#4#5#6#7
- {
- #6 {#5} {#7} \__sort_quick_only_ii:NnnnnNn \__sort_quick_split_i:NnnnnNn
- \__sort_quick_only_ii_end:nnnwnw
- { #6 {#7} } { } { #4 #2 } {#5}
- }
-\cs_new:Npn \__sort_quick_split_i:NnnnnNn #1#2#3#4#5#6#7
- {
- #6 {#5} {#7} \__sort_quick_split_ii:NnnnnNn \__sort_quick_split_i:NnnnnNn
- \__sort_quick_split_end:nnnwnw
- { #6 {#7} } { #3 #2 } {#4} {#5}
- }
-\cs_new:Npn \__sort_quick_split_ii:NnnnnNn #1#2#3#4#5#6#7
- {
- #6 {#5} {#7} \__sort_quick_split_ii:NnnnnNn \__sort_quick_split_i:NnnnnNn
- \__sort_quick_split_end:nnnwnw
- { #6 {#7} } {#3} { #4 #2 } {#5}
- }
-\cs_new:Npn \__sort_quick_end:nnTFNn #1#2#3#4#5#6 {#5}
-\cs_new:Npn \__sort_quick_single_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
- { #5 {#3} #6 \q_stop }
-\cs_new:Npn \__sort_quick_only_i_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
- {
- \__sort_quick_split:NnNn #1
- \__sort_quick_end:nnTFNn { } \q_mark {#5}
- {#3}
- #6 \q_stop
- }
-\cs_new:Npn \__sort_quick_only_ii_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
- {
- \__sort_quick_split:NnNn #2
- \__sort_quick_end:nnTFNn { } \q_mark { #5 {#3} }
- #6 \q_stop
- }
-\cs_new:Npn \__sort_quick_split_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
- {
- \__sort_quick_split:NnNn #2 \__sort_quick_end:nnTFNn { } \q_mark
- {
- \__sort_quick_split:NnNn #1
- \__sort_quick_end:nnTFNn { } \q_mark {#5}
- {#3}
- }
- #6 \q_stop
- }
-\cs_new_protected:Npn \__sort_error:
- {
- \cs_set_eq:NN \__sort_merge_blocks_aux: \prg_do_nothing:
- \cs_set_eq:NN \__sort_merge_blocks: \prg_do_nothing:
- \cs_set_protected:Npn \__sort_level: \use:x ##1 { \group_end: }
- }
-\cs_new_protected:Npn \__sort_disable_toksdef:
- { \cs_set_eq:NN \toksdef \__sort_disabled_toksdef:n }
-\cs_new_protected:Npn \__sort_disabled_toksdef:n #1
- {
- \__msg_kernel_error:nnx { sort } { toksdef }
- { \token_to_str:N #1 }
- \__sort_error:
- \tex_toksdef:D #1
- }
-\__msg_kernel_new:nnnn { sort } { toksdef }
- { Allocation~of~\iow_char:N\\toks~registers~impossible~while~sorting. }
- {
- The~comparison~code~used~for~sorting~a~list~has~attempted~to~
- define~#1~as~a~new~\iow_char:N\\toks~register~using~\iow_char:N\\newtoks~
- or~a~similar~command.~The~list~will~not~be~sorted.
- }
-\cs_new_protected:Npn \__sort_too_long_error:NNw #1#2 \fi:
- {
- \fi:
- \__msg_kernel_error:nnxxx { sort } { too-large }
- { \token_to_str:N #2 }
- { \int_eval:n { \l__sort_true_max_int - \l__sort_min_int } }
- { \int_eval:n { \l__sort_top_int - \l__sort_min_int } }
- #1 \__sort_error:
- }
-\__msg_kernel_new:nnnn { sort } { too-large }
- { The~list~#1~is~too~long~to~be~sorted~by~TeX. }
- {
- TeX~has~#2~toks~registers~still~available:~
- this~only~allows~to~sort~with~up~to~#3~
- items.~All~extra~items~will~be~deleted.
- }
-\__msg_kernel_new:nnnn { sort } { return-none }
- { The~comparison~code~did~not~return. }
- {
- When~sorting~a~list,~the~code~to~compare~items~#1~and~#2~
- did~not~call~
- \iow_char:N\\sort_ordered: ~nor~
- \iow_char:N\\sort_reversed: .~
- Exactly~one~of~these~should~be~called.
- }
-\__msg_kernel_new:nnnn { sort } { return-two }
- { The~comparison~code~returned~multiple~times. }
- {
- When~sorting~a~list,~the~code~to~compare~items~called~
- \iow_char:N\\sort_ordered: ~or~
- \iow_char:N\\sort_reversed: ~multiple~times.~
- Exactly~one~of~these~should~be~called.
- }
-%%
-%%
-%% End of file `l3sort.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
index 1c712595718..eb625020ede 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
@@ -19,8 +19,8 @@
%% and all files in that bundle must be distributed together.
%%
%% File: l3flag.dtx Copyright (C) 2011-2012,2014-2016 The LaTeX3 Project
-\RequirePackage{expl3}[2017/01/28]
-\@ifpackagelater{expl3}{2017/01/28}
+\RequirePackage{expl3}[2017/02/07]
+\@ifpackagelater{expl3}{2017/02/07}
{}
{%
\PackageError{l3flag}{Support package l3kernel too old}
@@ -32,7 +32,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3flag.dtx 6829 2017-01-28 08:52:51Z joseph $
+\GetIdInfo$Id: l3flag.dtx 6846 2017-02-07 07:04:19Z joseph $
{L3 Experimental flags}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
index 9859252d594..cdf16a65441 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
@@ -19,8 +19,8 @@
%% and all files in that bundle must be distributed together.
%%
%% File: l3regex.dtx Copyright (C) 2011-2016 The LaTeX3 Project
-\RequirePackage{expl3}[2017/01/28]
-\@ifpackagelater{expl3}{2017/01/28}
+\RequirePackage{expl3}[2017/02/07]
+\@ifpackagelater{expl3}{2017/02/07}
{}
{%
\PackageError{l3regex}{Support package l3kernel too old}
@@ -32,7 +32,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3regex.dtx 6829 2017-01-28 08:52:51Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6846 2017-02-07 07:04:19Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
index 902f5126e0c..27872fd6b13 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
@@ -19,8 +19,8 @@
%% and all files in that bundle must be distributed together.
%%
%% File: l3regex.dtx Copyright (C) 2011-2016 The LaTeX3 Project
-\RequirePackage{expl3}[2017/01/28]
-\@ifpackagelater{expl3}{2017/01/28}
+\RequirePackage{expl3}[2017/02/07]
+\@ifpackagelater{expl3}{2017/02/07}
{}
{%
\PackageError{l3regex}{Support package l3kernel too old}
@@ -32,7 +32,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3regex.dtx 6829 2017-01-28 08:52:51Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6846 2017-02-07 07:04:19Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
index 8b278c5625e..3b8bf4de798 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
@@ -19,8 +19,8 @@
%% and all files in that bundle must be distributed together.
%%
%% File: l3tl-build.dtx Copyright (C) 2011-2016 The LaTeX3 Project
-\RequirePackage{expl3}[2017/01/28]
-\@ifpackagelater{expl3}{2017/01/28}
+\RequirePackage{expl3}[2017/02/07]
+\@ifpackagelater{expl3}{2017/02/07}
{}
{%
\PackageError{l3tl-build}{Support package l3kernel too old}
@@ -32,7 +32,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3tl-build.dtx 6829 2017-01-28 08:52:51Z joseph $
+\GetIdInfo$Id: l3tl-build.dtx 6846 2017-02-07 07:04:19Z joseph $
{L3 Experimental token list construction}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index 7a75fac96d3..8f33f00a1ed 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -20,8 +20,8 @@
%%
%% File: l3galley.dtx Copyright (C) 1999-2001, 2004-2009 Frank Mittelbach
%% (C) 2010-2016 The LaTeX3 Project
-\RequirePackage{expl3}[2017/01/28]
-\@ifpackagelater{expl3}{2017/01/28}
+\RequirePackage{expl3}[2017/02/07]
+\@ifpackagelater{expl3}{2017/02/07}
{}
{%
\PackageError{l3galley}{Support package l3kernel too old}
@@ -33,7 +33,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3galley.dtx 6829 2017-01-28 08:52:51Z joseph $
+\GetIdInfo$Id: l3galley.dtx 6846 2017-02-07 07:04:19Z joseph $
{L3 Experimental galley code}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -944,7 +944,7 @@
{ \galley_break_line:Nn \reserved@e {#1} }
\DeclareRobustCommand \newline
{ \galley_break_line:Nn \c_true_bool { 0pt } }
-\cs_set_eq:cN { @ @ par } \galley_par:
+\cs_set_eq:NN \@@par \galley_par:
\cs_set_protected:Npn \addpenalty { \galley_penalty_add_single:n }
\cs_set_protected:Npn \addvspace { \galley_vspace_max_single:n }
\cs_set_protected:Npn \@afterheading
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 0447f49538b..32d9b6e7f7f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -35,6 +35,7 @@
%% l3fp-convert.dtx (with options: `package')
%% l3fp-random.dtx (with options: `package')
%% l3fp-assign.dtx (with options: `package')
+%% l3sort.dtx (with options: `package')
%% l3box.dtx (with options: `package')
%% l3coffins.dtx (with options: `package')
%% l3color.dtx (with options: `package')
@@ -42,7 +43,7 @@
%% l3candidates.dtx (with options: `package')
%% l3luatex.dtx (with options: `package,tex')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -54,11 +55,11 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: expl3.dtx Copyright (C) 1990-2016 The LaTeX3 Project
+%% File: expl3.dtx Copyright (C) 1990-2017 The LaTeX3 Project
\def\ExplFileName{expl3}%
\def\ExplFileDescription{L3 programming layer}%
-\def\ExplFileDate{2017/01/28}%
-\def\ExplFileVersion{6834}%
+\def\ExplFileDate{2017/02/07}%
+\def\ExplFileVersion{6846}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -2554,7 +2555,7 @@
\__cs_generate_internal_variant_loop:n
}
%% File: l3tl.dtx Copyright (C) 1990-2016 The LaTeX3 Project
-\GetIdInfo$Id: l3tl.dtx 6805 2016-12-28 22:15:52Z joseph $
+\GetIdInfo$Id: l3tl.dtx 6842 2017-02-06 21:51:22Z joseph $
{L3 Token lists}
\cs_new_protected:Npn \tl_new:N #1
{
@@ -4064,8 +4065,8 @@
? \q_recursion_tail \q_recursion_stop
}
\group_end:
-%% File: l3seq.dtx Copyright (C) 1990-2016 The LaTeX3 Project
-\GetIdInfo$Id: l3seq.dtx 6805 2016-12-28 22:15:52Z joseph $
+%% File: l3seq.dtx Copyright (C) 1990-2017 The LaTeX3 Project
+\GetIdInfo$Id: l3seq.dtx 6842 2017-02-06 21:51:22Z joseph $
{L3 Sequences and stacks}
\cs_new:Npn \__seq_item:n
{
@@ -5800,8 +5801,8 @@
\int_new:N \g__prg_map_int
%% File: l3clist.dtx Copyright (C) 2004-2011 Frank Mittelbach,
%% The LaTeX3 project
-%% (C) 2012-2016 The LaTeX3 Project
-\GetIdInfo$Id: l3clist.dtx 6805 2016-12-28 22:15:52Z joseph $
+%% (C) 2012-2017 The LaTeX3 Project
+\GetIdInfo$Id: l3clist.dtx 6842 2017-02-06 21:51:22Z joseph $
{L3 Comma separated lists}
\cs_new_eq:NN \c_empty_clist \c_empty_tl
\tl_new:N \l__clist_internal_clist
@@ -15488,6 +15489,405 @@
\fp_new:N \l_tmpb_fp
\fp_new:N \g_tmpa_fp
\fp_new:N \g_tmpb_fp
+%% File l3sort.dtx (C) Copyright 2012,2014-2017 The LaTeX3 Project
+\GetIdInfo$Id: l3sort.dtx 6842 2017-02-06 21:51:22Z joseph $
+ {L3 Sorting functions}
+\int_new:N \l__sort_length_int
+\int_new:N \l__sort_min_int
+\int_new:N \l__sort_top_int
+\int_new:N \l__sort_max_int
+\int_new:N \l__sort_true_max_int
+\int_new:N \l__sort_block_int
+\int_new:N \l__sort_begin_int
+\int_new:N \l__sort_end_int
+\int_new:N \l__sort_A_int
+\int_new:N \l__sort_B_int
+\int_new:N \l__sort_C_int
+\cs_new_protected:Npn \__sort_shrink_range:
+ {
+ \int_set:Nn \l__sort_A_int
+ { \l__sort_true_max_int - \l__sort_min_int + \c_one }
+ \int_set:Nn \l__sort_block_int { \c_max_register_int / \c_two }
+ \__sort_shrink_range_loop:
+ \int_set:Nn \l__sort_max_int
+ {
+ \int_compare:nNnTF
+ { \l__sort_block_int * \c_three / \c_two } > \l__sort_A_int
+ {
+ \l__sort_min_int
+ + ( \l__sort_A_int - \c_one ) / \c_two
+ + \l__sort_block_int / \c_four
+ - \c_one
+ }
+ { \l__sort_true_max_int - \l__sort_block_int / \c_two }
+ }
+ }
+\cs_new_protected:Npn \__sort_shrink_range_loop:
+ {
+ \if_int_compare:w \l__sort_A_int < \l__sort_block_int
+ \tex_divide:D \l__sort_block_int \c_two
+ \exp_after:wN \__sort_shrink_range_loop:
+ \fi:
+ }
+\cs_new_protected:Npn \__sort_compute_range:
+ {
+ \int_set:Nn \l__sort_min_int { \tex_count:D 15 + \c_one }
+ \int_set:Nn \l__sort_true_max_int { \c_max_register_int + \c_one }
+ \__sort_shrink_range:
+ \if_meaning:w \loctoks \tex_undefined:D \else:
+ \if_meaning:w \loctoks \scan_stop: \else:
+ \__sort_redefine_compute_range:
+ \__sort_compute_range:
+ \fi:
+ \fi:
+ }
+\cs_new_protected:Npn \__sort_redefine_compute_range:
+ {
+ \cs_if_exist:cTF { ver@elocalloc.sty }
+ {
+ \cs_gset_protected:Npn \__sort_compute_range:
+ {
+ \int_set:Nn \l__sort_min_int { \tex_count:D 265 }
+ \int_set_eq:NN \l__sort_true_max_int \e@alloc@top
+ \__sort_shrink_range:
+ }
+ }
+ {
+ \cs_gset_protected:Npn \__sort_compute_range:
+ {
+ \int_set:Nn \l__sort_min_int { \tex_count:D 265 }
+ \int_set:Nn \l__sort_true_max_int { \tex_count:D 275 }
+ \__sort_shrink_range:
+ }
+ }
+ }
+\cs_if_exist:NT \loctoks { \__sort_redefine_compute_range: }
+\tl_map_inline:nn { \lastallocatedtoks \c_syst_last_allocated_toks }
+ {
+ \cs_if_exist:NT #1
+ {
+ \cs_gset_protected:Npn \__sort_compute_range:
+ {
+ \int_set:Nn \l__sort_min_int { #1 + \c_one }
+ \int_set:Nn \l__sort_true_max_int { \c_max_register_int + \c_one }
+ \__sort_shrink_range:
+ }
+ }
+ }
+\cs_new_protected:Npn \__sort_main:NNNnNn #1#2#3#4#5#6
+ {
+ \group_begin:
+ \__sort_disable_toksdef:
+ \__sort_compute_range:
+ \int_set_eq:NN \l__sort_top_int \l__sort_min_int
+ #2 #5
+ {
+ \if_int_compare:w \l__sort_top_int = \l__sort_max_int
+ \__sort_too_long_error:NNw #3 #5
+ \fi:
+ \tex_toks:D \l__sort_top_int {##1}
+ \tex_advance:D \l__sort_top_int \c_one
+ }
+ \int_set:Nn \l__sort_length_int
+ { \l__sort_top_int - \l__sort_min_int }
+ \cs_set:Npn \__sort_compare:nn ##1 ##2 { #6 }
+ \int_set_eq:NN \l__sort_block_int \c_one
+ \__sort_level:
+ \use:x
+ {
+ \group_end:
+ #1 \exp_not:N #5 {#4}
+ }
+ }
+\cs_new_protected:Npn \seq_sort:Nn
+ {
+ \__sort_main:NNNnNn \tl_set:Nn
+ \seq_map_inline:Nn \seq_map_break:n
+ { \s__seq \__sort_toks:NN \exp_not:N \__seq_item:n }
+ }
+\cs_generate_variant:Nn \seq_sort:Nn { c }
+\cs_new_protected:Npn \seq_gsort:Nn
+ {
+ \__sort_main:NNNnNn \tl_gset:Nn
+ \seq_map_inline:Nn \seq_map_break:n
+ { \s__seq \__sort_toks:NN \exp_not:N \__seq_item:n }
+ }
+\cs_generate_variant:Nn \seq_gsort:Nn { c }
+\cs_new_protected:Npn \tl_sort:Nn
+ {
+ \__sort_main:NNNnNn \tl_set:Nn
+ \tl_map_inline:Nn \tl_map_break:n
+ { \__sort_toks:NN \prg_do_nothing: \prg_do_nothing: }
+ }
+\cs_generate_variant:Nn \tl_sort:Nn { c }
+\cs_new_protected:Npn \tl_gsort:Nn
+ {
+ \__sort_main:NNNnNn \tl_gset:Nn
+ \tl_map_inline:Nn \tl_map_break:n
+ { \__sort_toks:NN \prg_do_nothing: \prg_do_nothing: }
+ }
+\cs_generate_variant:Nn \tl_gsort:Nn { c }
+\cs_new_protected:Npn \clist_sort:Nn
+ { \__sort_clist:NNn \tl_set:Nn }
+\cs_new_protected:Npn \clist_gsort:Nn
+ { \__sort_clist:NNn \tl_gset:Nn }
+\cs_generate_variant:Nn \clist_sort:Nn { c }
+\cs_generate_variant:Nn \clist_gsort:Nn { c }
+\cs_new_protected:Npn \__sort_clist:NNn #1#2#3
+ {
+ \clist_if_empty:NF #2
+ {
+ \__sort_main:NNNnNn #1
+ \clist_map_inline:Nn \clist_map_break:n
+ {
+ \exp_last_unbraced:Nf \use_none:n
+ { \__sort_toks:NN \exp_args:No \__clist_wrap_item:n }
+ }
+ #2 {#3}
+ }
+ }
+\cs_new:Npn \__sort_toks:NN #1#2
+ { \__sort_toks:NNw #1 #2 \l__sort_min_int ; }
+\cs_new:Npn \__sort_toks:NNw #1#2#3 ;
+ {
+ \if_int_compare:w #3 < \l__sort_top_int
+ #1 #2 { \tex_the:D \tex_toks:D #3 }
+ \exp_after:wN \__sort_toks:NNw \exp_after:wN #1 \exp_after:wN #2
+ \__int_value:w \__int_eval:w #3 + \c_one \exp_after:wN ;
+ \fi:
+ }
+\cs_new_protected:Npn \__sort_level:
+ {
+ \if_int_compare:w \l__sort_block_int < \l__sort_length_int
+ \l__sort_end_int \l__sort_min_int
+ \__sort_merge_blocks:
+ \tex_advance:D \l__sort_block_int \l__sort_block_int
+ \exp_after:wN \__sort_level:
+ \fi:
+ }
+\cs_new_protected:Npn \__sort_merge_blocks:
+ {
+ \l__sort_begin_int \l__sort_end_int
+ \tex_advance:D \l__sort_end_int \l__sort_block_int
+ \if_int_compare:w \l__sort_end_int < \l__sort_top_int
+ \l__sort_A_int \l__sort_end_int
+ \tex_advance:D \l__sort_end_int \l__sort_block_int
+ \if_int_compare:w \l__sort_end_int > \l__sort_top_int
+ \l__sort_end_int \l__sort_top_int
+ \fi:
+ \l__sort_B_int \l__sort_A_int
+ \l__sort_C_int \l__sort_top_int
+ \__sort_copy_block:
+ \tex_advance:D \l__sort_A_int - \c_one
+ \tex_advance:D \l__sort_B_int - \c_one
+ \tex_advance:D \l__sort_C_int - \c_one
+ \exp_after:wN \__sort_merge_blocks_aux:
+ \exp_after:wN \__sort_merge_blocks:
+ \fi:
+ }
+\cs_new_protected:Npn \__sort_copy_block:
+ {
+ \tex_toks:D \l__sort_C_int \tex_toks:D \l__sort_B_int
+ \tex_advance:D \l__sort_C_int \c_one
+ \tex_advance:D \l__sort_B_int \c_one
+ \if_int_compare:w \l__sort_B_int = \l__sort_end_int
+ \use_i:nn
+ \fi:
+ \__sort_copy_block:
+ }
+\cs_new_protected:Npn \__sort_merge_blocks_aux:
+ {
+ \exp_after:wN \__sort_compare:nn \exp_after:wN
+ { \tex_the:D \tex_toks:D \exp_after:wN \l__sort_A_int \exp_after:wN }
+ \exp_after:wN { \tex_the:D \tex_toks:D \l__sort_C_int }
+ \prg_do_nothing:
+ \__sort_return_mark:N
+ \__sort_return_mark:N
+ \__sort_return_none_error:
+ }
+\cs_new_protected:Npn \sort_return_same: #1 \__sort_return_mark:N
+ { #1 \__sort_return_mark:N \__sort_return_two_error:w \__sort_return_same: }
+\cs_new_protected:Npn \sort_return_swapped: #1 \__sort_return_mark:N
+ { #1 \__sort_return_mark:N \__sort_return_two_error:w \__sort_return_swapped: }
+\cs_new_protected:Npn \__sort_return_mark:N #1 { }
+\cs_new_protected:Npn \__sort_return_none_error:
+ {
+ \__msg_kernel_error:nnxx { sort } { return-none }
+ { \tex_the:D \tex_toks:D \l__sort_A_int }
+ { \tex_the:D \tex_toks:D \l__sort_C_int }
+ \__sort_return_same:
+ }
+\cs_new_protected:Npn \__sort_return_two_error:w
+ #1 \__sort_return_none_error:
+ { \__msg_kernel_error:nn { sort } { return-two } }
+\cs_new_protected:Npn \__sort_return_same:
+ {
+ \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_C_int
+ \tex_advance:D \l__sort_B_int - \c_one
+ \tex_advance:D \l__sort_C_int - \c_one
+ \if_int_compare:w \l__sort_C_int < \l__sort_top_int
+ \use_i:nn
+ \fi:
+ \__sort_merge_blocks_aux:
+ }
+\cs_new_protected:Npn \__sort_return_swapped:
+ {
+ \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_A_int
+ \tex_advance:D \l__sort_B_int - \c_one
+ \tex_advance:D \l__sort_A_int - \c_one
+ \if_int_compare:w \l__sort_A_int < \l__sort_begin_int
+ \__sort_merge_blocks_end: \use_i:nn
+ \fi:
+ \__sort_merge_blocks_aux:
+ }
+\cs_new_protected:Npn \__sort_merge_blocks_end:
+ {
+ \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_C_int
+ \tex_advance:D \l__sort_B_int - \c_one
+ \tex_advance:D \l__sort_C_int - \c_one
+ \if_int_compare:w \l__sort_B_int < \l__sort_begin_int
+ \use_i:nn
+ \fi:
+ \__sort_merge_blocks_end:
+ }
+\cs_new:Npn \tl_sort:nN #1#2
+ {
+ \exp_not:f
+ {
+ \tl_if_blank:nF {#1}
+ {
+ \__sort_quick_prepare:Nnnn #2 { } { }
+ #1
+ { \__prg_break_point: \__sort_quick_prepare_end:NNNnw }
+ \q_stop
+ }
+ }
+ }
+\cs_new:Npn \__sort_quick_prepare:Nnnn #1#2#3#4
+ {
+ \__prg_break: #4 \__prg_break_point:
+ \__sort_quick_prepare:Nnnn #1 { #2 #3 } { #1 {#4} }
+ }
+\cs_new:Npn \__sort_quick_prepare_end:NNNnw #1#2#3#4#5 \q_stop
+ {
+ \__sort_quick_split:NnNn #4 \__sort_quick_end:nnTFNn { }
+ \q_mark { \__sort_quick_cleanup:w \exp_stop_f: }
+ \s__stop \q_stop
+ }
+\cs_new:Npn \__sort_quick_cleanup:w #1 \s__stop \q_stop {#1}
+\cs_new:Npn \__sort_quick_split:NnNn #1#2#3#4
+ {
+ #3 {#2} {#4} \__sort_quick_only_ii:NnnnnNn \__sort_quick_only_i:NnnnnNn
+ \__sort_quick_single_end:nnnwnw
+ { #3 {#4} } { } { } {#2}
+ }
+\cs_new:Npn \__sort_quick_only_i:NnnnnNn #1#2#3#4#5#6#7
+ {
+ #6 {#5} {#7} \__sort_quick_split_ii:NnnnnNn \__sort_quick_only_i:NnnnnNn
+ \__sort_quick_only_i_end:nnnwnw
+ { #6 {#7} } { #3 #2 } { } {#5}
+ }
+\cs_new:Npn \__sort_quick_only_ii:NnnnnNn #1#2#3#4#5#6#7
+ {
+ #6 {#5} {#7} \__sort_quick_only_ii:NnnnnNn \__sort_quick_split_i:NnnnnNn
+ \__sort_quick_only_ii_end:nnnwnw
+ { #6 {#7} } { } { #4 #2 } {#5}
+ }
+\cs_new:Npn \__sort_quick_split_i:NnnnnNn #1#2#3#4#5#6#7
+ {
+ #6 {#5} {#7} \__sort_quick_split_ii:NnnnnNn \__sort_quick_split_i:NnnnnNn
+ \__sort_quick_split_end:nnnwnw
+ { #6 {#7} } { #3 #2 } {#4} {#5}
+ }
+\cs_new:Npn \__sort_quick_split_ii:NnnnnNn #1#2#3#4#5#6#7
+ {
+ #6 {#5} {#7} \__sort_quick_split_ii:NnnnnNn \__sort_quick_split_i:NnnnnNn
+ \__sort_quick_split_end:nnnwnw
+ { #6 {#7} } {#3} { #4 #2 } {#5}
+ }
+\cs_new:Npn \__sort_quick_end:nnTFNn #1#2#3#4#5#6 {#5}
+\cs_new:Npn \__sort_quick_single_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
+ { #5 {#3} #6 \q_stop }
+\cs_new:Npn \__sort_quick_only_i_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
+ {
+ \__sort_quick_split:NnNn #1
+ \__sort_quick_end:nnTFNn { } \q_mark {#5}
+ {#3}
+ #6 \q_stop
+ }
+\cs_new:Npn \__sort_quick_only_ii_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
+ {
+ \__sort_quick_split:NnNn #2
+ \__sort_quick_end:nnTFNn { } \q_mark { #5 {#3} }
+ #6 \q_stop
+ }
+\cs_new:Npn \__sort_quick_split_end:nnnwnw #1#2#3#4 \q_mark #5#6 \q_stop
+ {
+ \__sort_quick_split:NnNn #2 \__sort_quick_end:nnTFNn { } \q_mark
+ {
+ \__sort_quick_split:NnNn #1
+ \__sort_quick_end:nnTFNn { } \q_mark {#5}
+ {#3}
+ }
+ #6 \q_stop
+ }
+\cs_new_protected:Npn \__sort_error:
+ {
+ \cs_set_eq:NN \__sort_merge_blocks_aux: \prg_do_nothing:
+ \cs_set_eq:NN \__sort_merge_blocks: \prg_do_nothing:
+ \cs_set_protected:Npn \__sort_level: \use:x ##1 { \group_end: }
+ }
+\cs_new_protected:Npn \__sort_disable_toksdef:
+ { \cs_set_eq:NN \toksdef \__sort_disabled_toksdef:n }
+\cs_new_protected:Npn \__sort_disabled_toksdef:n #1
+ {
+ \__msg_kernel_error:nnx { sort } { toksdef }
+ { \token_to_str:N #1 }
+ \__sort_error:
+ \tex_toksdef:D #1
+ }
+\__msg_kernel_new:nnnn { sort } { toksdef }
+ { Allocation~of~\iow_char:N\\toks~registers~impossible~while~sorting. }
+ {
+ The~comparison~code~used~for~sorting~a~list~has~attempted~to~
+ define~#1~as~a~new~\iow_char:N\\toks~register~using~\iow_char:N\\newtoks~
+ or~a~similar~command.~The~list~will~not~be~sorted.
+ }
+\cs_new_protected:Npn \__sort_too_long_error:NNw #1#2 \fi:
+ {
+ \fi:
+ \__msg_kernel_error:nnxxx { sort } { too-large }
+ { \token_to_str:N #2 }
+ { \int_eval:n { \l__sort_true_max_int - \l__sort_min_int } }
+ { \int_eval:n { \l__sort_top_int - \l__sort_min_int } }
+ #1 \__sort_error:
+ }
+\__msg_kernel_new:nnnn { sort } { too-large }
+ { The~list~#1~is~too~long~to~be~sorted~by~TeX. }
+ {
+ TeX~has~#2~toks~registers~still~available:~
+ this~only~allows~to~sort~with~up~to~#3~
+ items.~All~extra~items~will~be~deleted.
+ }
+\__msg_kernel_new:nnnn { sort } { return-none }
+ { The~comparison~code~did~not~return. }
+ {
+ When~sorting~a~list,~the~code~to~compare~items~#1~and~#2~
+ did~not~call~
+ \iow_char:N\\sort_return_same: ~nor~
+ \iow_char:N\\sort_return_swapped: .~
+ Exactly~one~of~these~should~be~called.
+ }
+\__msg_kernel_new:nnnn { sort } { return-two }
+ { The~comparison~code~returned~multiple~times. }
+ {
+ When~sorting~a~list,~the~code~to~compare~items~called~
+ \iow_char:N\\sort_return_same: ~or~
+ \iow_char:N\\sort_return_swapped: ~multiple~times.~
+ Exactly~one~of~these~should~be~called.
+ }
+\cs_new_eq:NN \sort_ordered: \sort_return_same:
+\cs_new_eq:NN \sort_reversed: \sort_return_swapped:
%% File: l3box.dtx Copyright (C) 2005-2016 The LaTeX3 Project
\GetIdInfo$Id: l3box.dtx 6805 2016-12-28 22:15:52Z joseph $
{L3 Experimental boxes}
@@ -16617,7 +17017,7 @@
\str_const:Nn \c_sys_output_str { dvi }
}
%% File: l3candidates.dtx Copyright (C) 2012-2016 The LaTeX3 Project
-\GetIdInfo$Id: l3candidates.dtx 6809 2017-01-01 06:33:13Z bruno $
+\GetIdInfo$Id: l3candidates.dtx 6835 2017-01-30 21:25:17Z bruno $
{L3 Experimental additions to l3kernel}
\cs_new_protected:Npn \cs_log:N
{ \__msg_log_next: \cs_show:N }
@@ -17482,8 +17882,6 @@
\cs_new_protected:Npn \prop_log:N
{ \__msg_log_next: \prop_show:N }
\cs_generate_variant:Nn \prop_log:N { c }
-\cs_new:Npn \prop_rand_key:N { \__prop_rand:NN \use_i:nnn }
-\cs_new:Npn \prop_rand_value:N { \__prop_rand:NN \use_none:n }
\cs_new:Npn \prop_rand_key_value:N { \__prop_rand:NN \__prop_rand:nNn }
\cs_new:Npn \__prop_rand:nNn #1#2#3 { \exp_not:n { {#1} {#3} } }
\cs_new:Npn \__prop_rand:NN #1#2
@@ -17502,8 +17900,6 @@
\exp_after:wN \__prop_rand_item:Nw \exp_after:wN #1
\__int_value:w \int_eval:n { #2 - \c_one } \s__prop
}
-\cs_generate_variant:Nn \prop_rand_key:N { c }
-\cs_generate_variant:Nn \prop_rand_value:N { c }
\cs_generate_variant:Nn \prop_rand_key_value:N { c }
\cs_new:Npn \seq_mapthread_function:NNN #1#2#3
{ \exp_after:wN \__seq_mapthread_function:wNN #2 \q_stop #1 #3 }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index 31aacacb88d..94369c965fd 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -6,7 +6,7 @@
%%
%% expl3.dtx (with options: `generic,loader')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,11 +18,11 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: expl3.dtx Copyright (C) 1990-2016 The LaTeX3 Project
+%% File: expl3.dtx Copyright (C) 1990-2017 The LaTeX3 Project
\def\ExplFileName{expl3}%
\def\ExplFileDescription{L3 programming layer}%
-\def\ExplFileDate{2017/01/28}%
-\def\ExplFileVersion{6834}%
+\def\ExplFileDate{2017/02/07}%
+\def\ExplFileVersion{6846}%
\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 004918b186c..c5fff7cd897 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -6,7 +6,7 @@
%%
%% expl3.dtx (with options: `package,loader')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,11 +18,11 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: expl3.dtx Copyright (C) 1990-2016 The LaTeX3 Project
+%% File: expl3.dtx Copyright (C) 1990-2017 The LaTeX3 Project
\def\ExplFileName{expl3}%
\def\ExplFileDescription{L3 programming layer}%
-\def\ExplFileDate{2017/01/28}%
-\def\ExplFileVersion{6834}%
+\def\ExplFileDate{2017/02/07}%
+\def\ExplFileVersion{6846}%
\let\ExplLoaderFileVersion\ExplFileVersion
\ProvidesPackage{\ExplFileName}
[%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
index a8c2feb562b..29abdfcfb55 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3basics,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
index 753882b885b..5ff90d841fc 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3bootstrap,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
index 52758d5317a..4011addc764 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3box,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
index 13eedc16ec2..acf4c5da2c0 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3candidates,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
index 06a48900a1c..8cffabce673 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3clist,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
index 2d259066156..466aa32ffca 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3coffins,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3color.sty b/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
index 5b291f99720..8b7ddf28323 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3color,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index 7a4d0868b29..0896fd6aa64 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -6,7 +6,7 @@
%%
%% l3doc.dtx (with options: `class')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -24,7 +24,7 @@
\let \fileversionOld \ExplFileVersion
\let \filedescriptionOld \ExplFileDescription
\RequirePackage{expl3,xparse,calc}
-\GetIdInfo$Id: l3doc.dtx 6809 2017-01-01 06:33:13Z bruno $
+\GetIdInfo$Id: l3doc.dtx 6839 2017-02-06 18:52:08Z bruno $
{L3 Experimental documentation class}
\ProvidesExplClass
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -140,12 +140,15 @@
#1 \g__codedoc_module_name_tl
}
}
-\cs_new_protected:Npn \__codedoc_replace_at_at_aux:Nn #1#2
+\cs_new_protected:Npx \__codedoc_replace_at_at_aux:Nn #1#2
{
- \tl_replace_all:Non #1 { \token_to_str:N @ } { @ }
- \tl_replace_all:Non #1 { \token_to_str:N _ } { _ }
- \tl_replace_all:Nnn #1 { _ @ @ } { _ _ #2 }
- \tl_replace_all:Nnn #1 { @ @ } { _ _ #2 }
+ \tl_replace_all:Nnn #1 { \token_to_str:N @ } { @ }
+ \tl_replace_all:Nnn #1 { \token_to_str:N _ } { _ }
+ \tl_replace_all:Nnn #1 { @ @ @ @ } { \token_to_str:N a a }
+ \tl_replace_all:Nnn #1 { _ _ @ @ } { _ _ #2 }
+ \tl_replace_all:Nnn #1 { _ @ @ } { _ _ #2 }
+ \tl_replace_all:Nnn #1 { @ @ } { _ _ #2 }
+ \tl_replace_all:Nnn #1 { \token_to_str:N a a } { @ @ }
}
\cs_new:Npn \__codedoc_signature_base_form:n #1
{ \__codedoc_signature_base_form_aux:n #1 \q_stop }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex b/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
index ec8740d148a..3970ba6d68d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
@@ -6,7 +6,7 @@
%%
%% l3docstrip.dtx (with options: `program')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -47,10 +47,12 @@
\ifx\relax#1\relax
\let\replaceModuleInLine\empty
\else
- \def\replaceModuleInLine{%
- \replaceAllIn\inLine{__@@}{__#1}%
- \replaceAllIn\inLine{_@@}{__#1}%
- \replaceAllIn\inLine{@@}{__#1}%
+ \edef\replaceModuleInLine{%
+ \noexpand\replaceAllIn\noexpand\inLine{@@@@}{\string aa}%
+ \noexpand\replaceAllIn\noexpand\inLine{__@@}{__#1}%
+ \noexpand\replaceAllIn\noexpand\inLine{_@@}{__#1}%
+ \noexpand\replaceAllIn\noexpand\inLine{@@}{__#1}%
+ \noexpand\replaceAllIn\noexpand\inLine{\string aa}{@@}%
}%
\fi
}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
index 4730259262a..7576a3c1f95 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
@@ -6,7 +6,7 @@
%%
%% l3drivers.dtx (with options: `package,dvipdfmx')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
index e5571e4acc4..5c160181f16 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
@@ -6,7 +6,7 @@
%%
%% l3drivers.dtx (with options: `package,dvips')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
index d47ec607807..be5b305817e 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
@@ -6,7 +6,7 @@
%%
%% l3drivers.dtx (with options: `package,dvisvgm')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
index 7abe3952cd4..0e6e7c5f959 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3expan,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
index 600b8f5d0a7..fa0bc64c69f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3file,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
index fef88a5aac2..3a7e7818d6f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3fp,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
index ba483d8a837..ce59b3a2d32 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3int,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
index 35daf44485f..eab886dc1bd 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3keys,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
index e800d405045..2c9ec94f9f3 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3msg,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
index a449e54bfdd..05fdfb08340 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3names,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
index e8ead1b1c4c..b517bd9f7ff 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
@@ -6,7 +6,7 @@
%%
%% l3drivers.dtx (with options: `package,pdfmode')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
index 20eeedf4f2a..8db79d2c5fa 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3prg,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
index b24b3ba1e67..fd6e59584b4 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3prop,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
index 910caadcae2..9457605ab49 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3quark,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
index c15d41151a5..8c95dad6b7f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3seq,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
index 3cfc2bc1853..9d024fbe863 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3skip,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3sort.sty b/Master/texmf-dist/tex/latex/l3kernel/l3sort.sty
new file mode 100644
index 00000000000..1568827f997
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3sort.sty
@@ -0,0 +1,50 @@
+%%
+%% This is file `l3sort.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% l3oldmodules.dtx (with options: `l3sort,oldmodules')
+%%
+%% Copyright (C) 1990-2017 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 license or (at your option) any later version. The latest
+%% version of this license is in the file:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
+%% and all files in that bundle must be distributed together.
+%%
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
+\def\ExplFileDate{2014/09/06}
+
+\def\old@liii@module@name
+{l3sort}
+\ProvidesPackage\old@liii@module@name
+ [%
+ \ExplFileDate\space v-no-info
+ Obsolete L3 package
+ ]
+\typeout{*****************************************************************}
+\typeout{** }
+\typeout{** Package \old@liii@module@name\space is obsolete and has been removed!}
+\typeout{** }
+\typeout{** Its functionality is now only provided as part of in the expl3 package}
+\typeout{** }
+\typeout{** After showing you an error message you can hit <return> we will continue}
+\typeout{** for now by loading expl3 for you. However, at some point in the future}
+\typeout{** the old packages will be removed.}
+\typeout{** }
+\typeout{** Therefore, please replace '\string\usepackage{\old@liii@module@name}'}
+\typeout{** with '\string\usepackage{expl3}' in your documents as soon as possible.}
+\typeout{** }
+\typeout{*******************************************************************}
+\PackageError\old@liii@module@name{This package is obsolete ---
+ use 'expl3' instead}\@ehc
+\RequirePackage{expl3}
+%%
+%%
+%% End of file `l3sort.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str.sty b/Master/texmf-dist/tex/latex/l3kernel/l3str.sty
index 70f0bb1fe30..84cc1066e77 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3str,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
index 8c8ab9af8b3..74825ec8b1c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3tl,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
index 64669857cfa..e450b07f6a5 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
@@ -6,7 +6,7 @@
%%
%% l3oldmodules.dtx (with options: `l3token,oldmodules')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
@@ -18,7 +18,7 @@
%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
-%% File: l3oldmodules.dtx Copyright (C) 2014,2016 The LaTeX3 Project
+%% File: l3oldmodules.dtx Copyright (C) 2014,2016,2017 The LaTeX3 Project
\def\ExplFileDate{2014/09/06}
\def\old@liii@module@name
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
index 73c8733d7ed..af8468476db 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
@@ -6,7 +6,7 @@
%%
%% l3drivers.dtx (with options: `package,xdvipdfmx')
%%
-%% Copyright (C) 1990-2016 The LaTeX3 Project
+%% Copyright (C) 1990-2017 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
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 6eb092371e3..41a1b17b6d9 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -19,8 +19,8 @@
%% and all files in that bundle must be distributed together.
%%
%% File: l3keys2e.dtx (C) Copyright 2009,2011-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/01/28]
-\@ifpackagelater{expl3}{2017/01/28}
+\RequirePackage{expl3}[2017/02/07]
+\@ifpackagelater{expl3}{2017/02/07}
{}
{%
\PackageError{l3keys2e}{Support package l3kernel too old}
@@ -34,8 +34,8 @@
}
\def\ExplFileName{l3keys2e}
\def\ExplFileDescription{LaTeX2e option processing using LaTeX3 keys}
-\def\ExplFileDate{2017/01/28}
-\def\ExplFileVersion{6834}
+\def\ExplFileDate{2017/02/07}
+\def\ExplFileVersion{6846}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\cs_generate_variant:Nn \clist_put_right:Nn { Nv }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
index 680d07699b0..c4db0d2403a 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -20,8 +20,8 @@
%%
%% File: xfrac.dtx Copyright (C) 2004, 2008-2010 Morten Hoegholm
%% (C) 2011,2012,2014-2017 The LaTeX3 Project
-\RequirePackage{expl3}[2017/01/28]
-\@ifpackagelater{expl3}{2017/01/28}
+\RequirePackage{expl3}[2017/02/07]
+\@ifpackagelater{expl3}{2017/02/07}
{}
{%
\PackageError{xfrac}{Support package l3kernel too old}
@@ -36,8 +36,8 @@
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
\def\ExplFileName{xfrac}
\def\ExplFileDescription{L3 Experimental split-level fractions}
-\def\ExplFileDate{2017/01/28}
-\def\ExplFileVersion{6834}
+\def\ExplFileDate{2017/02/07}
+\def\ExplFileVersion{6846}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\keys_define:nn { xfrac }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index edf66edb76a..8ac9148a45c 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -23,8 +23,8 @@
%% (C) Copyright 2004-2008 Frank Mittelbach,
%% The LaTeX3 Project
%% (C) Copyright 2009-2016 The LaTeX3 Project
-\RequirePackage{expl3}[2017/01/28]
-\@ifpackagelater{expl3}{2017/01/28}
+\RequirePackage{expl3}[2017/02/07]
+\@ifpackagelater{expl3}{2017/02/07}
{}
{%
\PackageError{xparse}{Support package l3kernel too old}
@@ -38,8 +38,8 @@
}
\def\ExplFileName{xparse}
\def\ExplFileDescription{L3 Experimental document command parser}
-\def\ExplFileDate{2017/01/28}
-\def\ExplFileVersion{6834}
+\def\ExplFileDate{2017/02/07}
+\def\ExplFileVersion{6846}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\tl_const:Nx \c__xparse_no_value_tl
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 0301373e064..c26b9507975 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -23,8 +23,8 @@
%% (C) Copyright 2004-2010 Frank Mittelbach,
%% The LaTeX3 Project
%% (C) Copyright 2011-2016 The LaTeX3 Project
-\RequirePackage{expl3}[2017/01/28]
-\@ifpackagelater{expl3}{2017/01/28}
+\RequirePackage{expl3}[2017/02/07]
+\@ifpackagelater{expl3}{2017/02/07}
{}
{%
\PackageError{xtemplate}{Support package l3kernel too old}
@@ -38,8 +38,8 @@
}
\def\ExplFileName{xtemplate}
\def\ExplFileDescription{L3 Experimental prototype document functions}
-\def\ExplFileDate{2017/01/28}
-\def\ExplFileVersion{6834}
+\def\ExplFileDate{2017/02/07}
+\def\ExplFileVersion{6846}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\tl_const:Nn \c__xtemplate_code_root_tl { template~code~>~ }