From a25cbbbb685bf98f9df75cb08131ea8f4e0f7e79 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 21 Apr 2016 20:56:35 +0000 Subject: l3 (21apr16) git-svn-id: svn://tug.org/texlive/trunk@40657 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/l3experimental/l3sort/l3sort.sty | 6 +++--- .../tex/latex/l3experimental/l3str/l3flag.sty | 6 +++--- .../latex/l3experimental/l3str/l3regex-trace.sty | 6 +++--- .../tex/latex/l3experimental/l3str/l3regex.sty | 6 +++--- .../tex/latex/l3experimental/l3str/l3tl-build.sty | 6 +++--- .../tex/latex/l3experimental/xgalley/l3galley.sty | 6 +++--- .../texmf-dist/tex/latex/l3kernel/expl3-code.tex | 13 +++++++---- .../tex/latex/l3kernel/expl3-generic.tex | 4 ++-- Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 4 ++-- Master/texmf-dist/tex/latex/l3kernel/l3doc.cls | 21 +++++++++--------- .../texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def | 10 +++++++-- Master/texmf-dist/tex/latex/l3kernel/l3dvips.def | 10 +++++++-- Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def | 10 +++++++-- .../texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def | 10 +++++++-- .../tex/latex/l3packages/l3keys2e/l3keys2e.sty | 8 +++---- .../tex/latex/l3packages/xfrac/xfrac.sty | 8 +++---- .../tex/latex/l3packages/xparse/xparse.sty | 25 +++++++++------------- .../tex/latex/l3packages/xtemplate/xtemplate.sty | 8 +++---- 18 files changed, 95 insertions(+), 72 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty index 4cfee22198c..eb02643481b 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty @@ -46,8 +46,8 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2016/03/26] -\@ifpackagelater{expl3}{2016/03/26} +\RequirePackage{expl3}[2016/04/20] +\@ifpackagelater{expl3}{2016/04/20} {} {% \PackageError{l3sort}{Support package l3kernel too old} @@ -59,7 +59,7 @@ }% \endinput } -\GetIdInfo$Id: l3sort.dtx 6466 2016-03-26 16:23:41Z joseph $ +\GetIdInfo$Id: l3sort.dtx 6476 2016-04-20 19:46:45Z joseph $ {L3 Experimental sorting functions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty index 9ff38bdc7c0..02954e8b14f 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty @@ -45,8 +45,8 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\RequirePackage{expl3}[2016/03/26] -\@ifpackagelater{expl3}{2016/03/26} +\RequirePackage{expl3}[2016/04/20] +\@ifpackagelater{expl3}{2016/04/20} {} {% \PackageError{l3flag}{Support package l3kernel too old} @@ -58,7 +58,7 @@ }% \endinput } -\GetIdInfo$Id: l3flag.dtx 6466 2016-03-26 16:23:41Z joseph $ +\GetIdInfo$Id: l3flag.dtx 6476 2016-04-20 19:46:45Z 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 60ed114345a..79195e0f1d5 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty @@ -45,8 +45,8 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\RequirePackage{expl3}[2016/03/26] -\@ifpackagelater{expl3}{2016/03/26} +\RequirePackage{expl3}[2016/04/20] +\@ifpackagelater{expl3}{2016/04/20} {} {% \PackageError{l3regex}{Support package l3kernel too old} @@ -58,7 +58,7 @@ }% \endinput } -\GetIdInfo$Id: l3regex.dtx 6466 2016-03-26 16:23:41Z joseph $ +\GetIdInfo$Id: l3regex.dtx 6476 2016-04-20 19:46:45Z 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 37286265b16..2ae92c23ac8 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty @@ -45,8 +45,8 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\RequirePackage{expl3}[2016/03/26] -\@ifpackagelater{expl3}{2016/03/26} +\RequirePackage{expl3}[2016/04/20] +\@ifpackagelater{expl3}{2016/04/20} {} {% \PackageError{l3regex}{Support package l3kernel too old} @@ -58,7 +58,7 @@ }% \endinput } -\GetIdInfo$Id: l3regex.dtx 6466 2016-03-26 16:23:41Z joseph $ +\GetIdInfo$Id: l3regex.dtx 6476 2016-04-20 19:46:45Z 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 c9c22b3fd38..bf081c6925f 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty @@ -45,8 +45,8 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\RequirePackage{expl3}[2016/03/26] -\@ifpackagelater{expl3}{2016/03/26} +\RequirePackage{expl3}[2016/04/20] +\@ifpackagelater{expl3}{2016/04/20} {} {% \PackageError{l3tl-build}{Support package l3kernel too old} @@ -58,7 +58,7 @@ }% \endinput } -\GetIdInfo$Id: l3tl-build.dtx 6466 2016-03-26 16:23:41Z joseph $ +\GetIdInfo$Id: l3tl-build.dtx 6476 2016-04-20 19:46:45Z 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 6f37ce57337..5776af0598a 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty @@ -47,8 +47,8 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2016/03/26] -\@ifpackagelater{expl3}{2016/03/26} +\RequirePackage{expl3}[2016/04/20] +\@ifpackagelater{expl3}{2016/04/20} {} {% \PackageError{l3galley}{Support package l3kernel too old} @@ -60,7 +60,7 @@ }% \endinput } -\GetIdInfo$Id: l3galley.dtx 6466 2016-03-26 16:23:41Z joseph $ +\GetIdInfo$Id: l3galley.dtx 6476 2016-04-20 19:46:45Z joseph $ {L3 Experimental galley code} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 95ae314b97f..795323b757e 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -82,8 +82,8 @@ %% ----------------------------------------------------------------------- \def\ExplFileName{expl3}% \def\ExplFileDescription{L3 programming layer}% -\def\ExplFileDate{2016/03/28}% -\def\ExplFileVersion{6468}% +\def\ExplFileDate{2016/04/20}% +\def\ExplFileVersion{6476}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -6712,7 +6712,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3token.dtx 6465 2016-03-26 16:15:09Z joseph $ +\GetIdInfo$Id: l3token.dtx 6470 2016-04-03 11:29:18Z joseph $ {L3 Experimental token manipulation} \cs_new_protected:Npn \char_set_catcode:nn #1#2 { @@ -6933,7 +6933,12 @@ \char_set_catcode_math_toggle:n { 0 } \tl_put_right:Nn \l__char_tmp_tl { \or: ^^@ } \char_set_catcode_alignment:n { 0 } - \tl_put_right:Nn \l__char_tmp_tl { \or: ^^@ } + \tl_put_right:Nn \l__char_tmp_tl + { + \or: + \etex_unexpanded:D \exp_after:wN + { \exp_after:wN ^^@ \exp_after:wN } + } \tl_put_right:Nn \l__char_tmp_tl { \or: } \char_set_catcode_parameter:n { 0 } \tl_put_right:Nn \l__char_tmp_tl { \or: ^^@ } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index b2b90a338de..5e355680c6b 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{2016/03/28}% -\def\ExplFileVersion{6468}% +\def\ExplFileDate{2016/04/20}% +\def\ExplFileVersion{6476}% \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 c6217c69805..6b11a05f308 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{2016/03/28}% -\def\ExplFileVersion{6468}% +\def\ExplFileDate{2016/04/20}% +\def\ExplFileVersion{6476}% \let\ExplLoaderFileVersion\ExplFileVersion \ProvidesPackage{\ExplFileName} [% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls index 05d51452e27..aa9ac162b60 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls +++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls @@ -50,7 +50,7 @@ \let \fileversionOld \ExplFileVersion \let \filedescriptionOld \ExplFileDescription \RequirePackage{expl3,xparse,calc} -\GetIdInfo$Id: l3doc.dtx 6448 2016-03-25 12:27:53Z bruno $ +\GetIdInfo$Id: l3doc.dtx 6474 2016-04-11 18:09:21Z qinglee $ {L3 Experimental documentation class} \ProvidesExplClass {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -934,7 +934,6 @@ \cs_new_protected:Npn \__codedoc_macro_single:n #1 { \tl_set:Nn \saved@macroname {#1} - \__codedoc_macro_typeset_one:n {#1} \exp_args:Nx \__codedoc_macro_index:n { @@ -946,15 +945,15 @@ { \bool_if:NF \l__codedoc_macro_aux_bool { \seq_gput_right:Nn \g_doc_macros_seq {#1} } - \hbox_set:Nn \l__codedoc_macro_index_box - { - % This box only contains targets... it seems inefficient. - \hbox_unpack_clear:N \l__codedoc_macro_index_box - \int_gincr:N \c@CodelineNo - \__codedoc_special_index:nn {#1} { main } - \DoNotIndex {#1} - \int_gdecr:N \c@CodelineNo - } + \hbox_set:Nw \l__codedoc_macro_index_box + % This box only contains targets... it seems inefficient. + \hbox_unpack_clear:N \l__codedoc_macro_index_box + \int_gincr:N \c@CodelineNo + \__codedoc_special_index:nn {#1} { main } + \DoNotIndex {#1} + \int_gdecr:N \c@CodelineNo + \exp_args:NNNo \hbox_set_end: + \tl_set:Nn \saved@indexname { \l__codedoc_index_key_tl } } \cs_new_protected:Npn \__codedoc_macro_typeset_one:n #1 { diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def index d153e3515c9..0c905c2845a 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def @@ -13,7 +13,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: l3drivers.dtx Copyright(C) 2011-2015 The LaTeX3 Project +%% File: l3drivers.dtx Copyright(C) 2011-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 @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- %% -\GetIdInfo$Id: l3drivers.dtx 6281 2015-11-17 07:11:52Z joseph $ +\GetIdInfo$Id: l3drivers.dtx 6472 2016-04-05 13:26:17Z joseph $ {L3 Experimental drivers} \ProvidesExplFile {l3dvidpfmx.def}{\ExplFileDate}{\ExplFileVersion} @@ -112,6 +112,12 @@ \cs_new_eq:NN \__driver_box_scale_end: \__driver_state_restore: \tl_new:N \l__driver_current_color_tl \tl_set:Nn \l__driver_current_color_tl { gray~0 } +\AtBeginDocument + { + \@ifpackageloaded { color } + { \tl_set:Nn \l__driver_current_color_tl { \current@color } } + { } + } \cs_new_protected_nopar:Npx \__driver_color_ensure_current: { \tex_special:D { color~push~\exp_not:N \l__driver_current_color_tl } diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def index aaf20c5d37d..367bdaf2526 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def @@ -13,7 +13,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: l3drivers.dtx Copyright(C) 2011-2015 The LaTeX3 Project +%% File: l3drivers.dtx Copyright(C) 2011-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 @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- %% -\GetIdInfo$Id: l3drivers.dtx 6281 2015-11-17 07:11:52Z joseph $ +\GetIdInfo$Id: l3drivers.dtx 6472 2016-04-05 13:26:17Z joseph $ {L3 Experimental drivers} \ProvidesExplFile {l3dvips.def}{\ExplFileDate}{\ExplFileVersion} @@ -121,6 +121,12 @@ \cs_new_eq:NN \__driver_box_scale_end: \__driver_state_restore: \tl_new:N \l__driver_current_color_tl \tl_set:Nn \l__driver_current_color_tl { gray~0 } +\AtBeginDocument + { + \@ifpackageloaded { color } + { \tl_set:Nn \l__driver_current_color_tl { \current@color } } + { } + } \cs_new_protected_nopar:Npx \__driver_color_ensure_current: { \tex_special:D { color~push~\exp_not:N \l__driver_current_color_tl } diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def index fd28cee79c9..045ebf399e7 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def @@ -13,7 +13,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: l3drivers.dtx Copyright(C) 2011-2015 The LaTeX3 Project +%% File: l3drivers.dtx Copyright(C) 2011-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 @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- %% -\GetIdInfo$Id: l3drivers.dtx 6281 2015-11-17 07:11:52Z joseph $ +\GetIdInfo$Id: l3drivers.dtx 6472 2016-04-05 13:26:17Z joseph $ {L3 Experimental drivers} \ProvidesExplFile {l3pdfmode.def}{\ExplFileDate}{\ExplFileVersion} @@ -130,6 +130,12 @@ \cs_new_eq:NN \__driver_box_scale_end: \__driver_state_restore: \tl_new:N \l__driver_current_color_tl \tl_set:Nn \l__driver_current_color_tl { 0~g~0~G } +\AtBeginDocument + { + \@ifpackageloaded { color } + { \tl_set:Nn \l__driver_current_color_tl { \current@color } } + { } + } \int_new:N \l__driver_color_stack_int \cs_new_protected_nopar:Npx \__driver_color_ensure_current: { diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def index dbbc07d369c..50fa2f3fca0 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def @@ -13,7 +13,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: l3drivers.dtx Copyright(C) 2011-2015 The LaTeX3 Project +%% File: l3drivers.dtx Copyright(C) 2011-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 @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- %% -\GetIdInfo$Id: l3drivers.dtx 6281 2015-11-17 07:11:52Z joseph $ +\GetIdInfo$Id: l3drivers.dtx 6472 2016-04-05 13:26:17Z joseph $ {L3 Experimental drivers} \ProvidesExplFile {l3xdvidpfmx.def}{\ExplFileDate}{\ExplFileVersion} @@ -112,6 +112,12 @@ \cs_new_eq:NN \__driver_box_scale_end: \__driver_state_restore: \tl_new:N \l__driver_current_color_tl \tl_set:Nn \l__driver_current_color_tl { gray~0 } +\AtBeginDocument + { + \@ifpackageloaded { color } + { \tl_set:Nn \l__driver_current_color_tl { \current@color } } + { } + } \cs_new_protected_nopar:Npx \__driver_color_ensure_current: { \tex_special:D { color~push~\exp_not:N \l__driver_current_color_tl } diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty index e1ba2631b5d..b3641934596 100644 --- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty +++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty @@ -46,8 +46,8 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2016/03/28] -\@ifpackagelater{expl3}{2016/03/28} +\RequirePackage{expl3}[2016/04/20] +\@ifpackagelater{expl3}{2016/04/20} {} {% \PackageError{l3keys2e}{Support package l3kernel too old} @@ -61,8 +61,8 @@ } \def\ExplFileName{l3keys2e} \def\ExplFileDescription{LaTeX2e option processing using LaTeX3 keys} -\def\ExplFileDate{2016/03/28} -\def\ExplFileVersion{6468} +\def\ExplFileDate{2016/04/20} +\def\ExplFileVersion{6476} \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 26c802d6d84..74818d1b55a 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty @@ -47,8 +47,8 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2016/03/28] -\@ifpackagelater{expl3}{2016/03/28} +\RequirePackage{expl3}[2016/04/20] +\@ifpackagelater{expl3}{2016/04/20} {} {% \PackageError{xfrac}{Support package l3kernel too old} @@ -63,8 +63,8 @@ \RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate} \def\ExplFileName{xfrac} \def\ExplFileDescription{L3 Experimental split-level fractions} -\def\ExplFileDate{2016/03/28} -\def\ExplFileVersion{6468} +\def\ExplFileDate{2016/04/20} +\def\ExplFileVersion{6476} \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 bea7493670d..05f8d8910be 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty @@ -50,8 +50,8 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2016/03/28] -\@ifpackagelater{expl3}{2016/03/28} +\RequirePackage{expl3}[2016/04/20] +\@ifpackagelater{expl3}{2016/04/20} {} {% \PackageError{xparse}{Support package l3kernel too old} @@ -65,8 +65,8 @@ } \def\ExplFileName{xparse} \def\ExplFileDescription{L3 Experimental document command parser} -\def\ExplFileDate{2016/03/28} -\def\ExplFileVersion{6468} +\def\ExplFileDate{2016/04/20} +\def\ExplFileVersion{6476} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \tl_const:Nx \c__xparse_no_value_tl @@ -210,17 +210,17 @@ { \__xparse_declare_cmd_internal:cnx { environment~ #1 } {#2} { - \cs_set_protected_nopar:Npx \exp_not:c { environment~ #1 ~end~aux } + \cs_set_nopar:Npx \exp_not:c { environment~ #1 ~end~aux } { - \exp_not:c { environment~ #1~end~aux~ } + \exp_not:N \exp_not:N \exp_not:c { environment~ #1~end~aux~ } \exp_not:n { \tl_tail:N \l__xparse_args_tl } } \exp_not:n {#3} } - \cs_set_protected_nopar:cpx { environment~ #1 ~end } + \cs_set_nopar:cpx { environment~ #1 ~end } { \exp_not:c { environment~ #1 ~end~aux } } \cs_generate_from_arg_count:cNnn - { environment~ #1 ~end~aux~ } \cs_set_protected:Npn + { environment~ #1 ~end~aux~ } \cs_set:Npn \l__xparse_current_arg_int {#4} \cs_set_eq:cc {#1} { environment~ #1 } \cs_set_eq:cc { end #1 } { environment~ #1 ~end } @@ -723,13 +723,8 @@ } \token_if_eq_catcode:NNTF + #1 { - \group_begin: - \char_set_lccode:nn { `A } { `#1 } - \tex_lowercase:D - { - \group_end: - \l__xparse_fn_tl A - } + \exp_after:wN \exp_after:wN \exp_after:wN + \l__xparse_fn_tl \char_generate:nn { `#1 } { 11 } } { \exp_after:wN \l__xparse_fn_tl diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty index ad5d893bfb9..b54dc121a6d 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty @@ -50,8 +50,8 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2016/03/28] -\@ifpackagelater{expl3}{2016/03/28} +\RequirePackage{expl3}[2016/04/20] +\@ifpackagelater{expl3}{2016/04/20} {} {% \PackageError{xtemplate}{Support package l3kernel too old} @@ -65,8 +65,8 @@ } \def\ExplFileName{xtemplate} \def\ExplFileDescription{L3 Experimental prototype document functions} -\def\ExplFileDate{2016/03/28} -\def\ExplFileVersion{6468} +\def\ExplFileDate{2016/04/20} +\def\ExplFileVersion{6476} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \tl_const:Nn \c__xtemplate_code_root_tl { template~code~>~ } -- cgit v1.2.3