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 --- .../source/latex/l3experimental/l3sort/l3sort.dtx | 6 +++--- .../source/latex/l3experimental/l3str/l3flag.dtx | 6 +++--- .../source/latex/l3experimental/l3str/l3regex.dtx | 6 +++--- .../latex/l3experimental/l3str/l3tl-build.dtx | 6 +++--- .../latex/l3experimental/xgalley/l3galley.dtx | 6 +++--- Master/texmf-dist/source/latex/l3kernel/expl3.dtx | 4 ++-- Master/texmf-dist/source/latex/l3kernel/l3doc.dtx | 25 +++++++++++----------- .../texmf-dist/source/latex/l3kernel/l3drivers.dtx | 15 ++++++++++--- .../texmf-dist/source/latex/l3kernel/l3token.dtx | 17 +++++++++++++-- .../source/latex/l3packages/l3keys2e/l3keys2e.dtx | 8 +++---- .../source/latex/l3packages/xfrac/xfrac.dtx | 8 +++---- .../source/latex/l3packages/xparse/xparse.dtx | 25 +++++++++------------- .../latex/l3packages/xtemplate/xtemplate.dtx | 8 +++---- 13 files changed, 78 insertions(+), 62 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx index 6f34d2836ce..2dbc55d8f01 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx @@ -37,8 +37,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\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} @@ -50,7 +50,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} % %<*driver> diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx index 8807c514eb3..016b1191bee 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx @@ -36,8 +36,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\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} @@ -49,7 +49,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} % %<*driver> diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx index 9a80d0e37a1..470ee3ad4e3 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx @@ -36,8 +36,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\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} @@ -49,7 +49,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} % %<*driver> diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx index 02ea7635874..2d87c600ef9 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx @@ -36,8 +36,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\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} @@ -49,7 +49,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} % %<*driver> diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx index 602463015fe..5e8185bd7b2 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx @@ -38,8 +38,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\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} @@ -51,7 +51,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} % %<*driver> diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx index c4bc414c605..27394c1d22e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx @@ -36,8 +36,8 @@ %<*driver|generic|package> \def\ExplFileName{expl3}% \def\ExplFileDescription{L3 programming layer}% -\def\ExplFileDate{2016/03/28}% -\def\ExplFileVersion{6468}% +\def\ExplFileDate{2016/04/20}% +\def\ExplFileVersion{6476}% % %<*driver> \documentclass[full]{l3doc} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx index 0a7199928e0..c7148f54747 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx @@ -75,7 +75,7 @@ Do not distribute a modified version of this file. % %<*driver|class> \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} % % @@ -2252,13 +2252,12 @@ Do not distribute a modified version of this file. % \item Macro/function/whatever name; input has already been % sanitised. % \end{arguments} -% The assignment to \cs{saved@macroname} is used by \pkg{doc}'s -% \cs{changes} mechanism. +% The assignments to \cs{saved@macroname} and \cs{saved@indexname} +% are used by \pkg{doc}'s \cs{changes} mechanism. % \begin{macrocode} \cs_new_protected:Npn \@@_macro_single:n #1 { \tl_set:Nn \saved@macroname {#1} - \@@_macro_typeset_one:n {#1} \exp_args:Nx \@@_macro_index:n { @@ -2270,15 +2269,15 @@ Do not distribute a modified version of this file. { \bool_if:NF \l_@@_macro_aux_bool { \seq_gput_right:Nn \g_doc_macros_seq {#1} } - \hbox_set:Nn \l_@@_macro_index_box - { - % This box only contains targets... it seems inefficient. - \hbox_unpack_clear:N \l_@@_macro_index_box - \int_gincr:N \c@CodelineNo - \@@_special_index:nn {#1} { main } - \DoNotIndex {#1} - \int_gdecr:N \c@CodelineNo - } + \hbox_set:Nw \l_@@_macro_index_box + % This box only contains targets... it seems inefficient. + \hbox_unpack_clear:N \l_@@_macro_index_box + \int_gincr:N \c@CodelineNo + \@@_special_index:nn {#1} { main } + \DoNotIndex {#1} + \int_gdecr:N \c@CodelineNo + \exp_args:NNNo \hbox_set_end: + \tl_set:Nn \saved@indexname { \l_@@_index_key_tl } } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx index a18533f82c7..a3569329cd5 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% 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 @@ -38,7 +38,7 @@ \documentclass[full]{l3doc} % %<*driver|package> -\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} % %<*driver> @@ -498,7 +498,8 @@ % % \begin{variable}{\l_@@_current_color_tl} % The current color is needed by all of the engines, but the way this -% is stored varies. +% is stored varies. In package mode if the \pkg{color} package is loaded +% simply pick up what it is using. % \begin{macrocode} \tl_new:N \l_@@_current_color_tl %<*dvipdfmx|dvips|xdvipdfmx> @@ -507,6 +508,14 @@ %<*pdfmode> \tl_set:Nn \l_@@_current_color_tl { 0~g~0~G } % +%<*package> +\AtBeginDocument + { + \@ifpackageloaded { color } + { \tl_set:Nn \l_@@_current_color_tl { \current@color } } + { } + } +% % \end{macrocode} % \end{variable} % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx index 3485c03c978..ac7ed290c36 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx @@ -37,7 +37,7 @@ \documentclass[full]{l3doc} % %<*driver|package> -\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} % %<*driver> @@ -1411,8 +1411,21 @@ \tl_set:Nx \l_@@_tmp_tl { \l_@@_tmp_tl } \char_set_catcode_math_toggle:n { 0 } \tl_put_right:Nn \l_@@_tmp_tl { \or: ^^@ } +% \end{macrocode} +% As \TeX{} will be very unhappy if if finds an alignment character inside +% a primitive \tn{halign} even when skipping false branches, some precautions +% are required. \TeX{} will be happy if the token is hidden inside +% \tn{unexpanded} (which needs to be the primitive). The expansion chain here +% is required so that the conditional gets cleaned up correctly (other code +% assumes there is exactly one token to skip during the clean-up). +% \begin{macrocode} \char_set_catcode_alignment:n { 0 } - \tl_put_right:Nn \l_@@_tmp_tl { \or: ^^@ } + \tl_put_right:Nn \l_@@_tmp_tl + { + \or: + \etex_unexpanded:D \exp_after:wN + { \exp_after:wN ^^@ \exp_after:wN } + } \tl_put_right:Nn \l_@@_tmp_tl { \or: } \char_set_catcode_parameter:n { 0 } \tl_put_right:Nn \l_@@_tmp_tl { \or: ^^@ } diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx index 6787b1493aa..035c21945e1 100644 --- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx +++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx @@ -37,8 +37,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\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} @@ -52,8 +52,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} % %<*driver> \documentclass[full]{l3doc} diff --git a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx index 6778de2390a..b6330fa6a8d 100644 --- a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx @@ -38,8 +38,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\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} @@ -54,8 +54,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} % %<*driver> \documentclass[full]{l3doc} diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx index 5ebeddb5e5e..343751e6ad1 100644 --- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx @@ -41,8 +41,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\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} @@ -56,8 +56,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} % %<*driver> \documentclass[full]{l3doc} @@ -1088,17 +1088,17 @@ { \@@_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_@@_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_@@_current_arg_int {#4} %<*package> \cs_set_eq:cc {#1} { environment~ #1 } @@ -2008,13 +2008,8 @@ % \begin{macrocode} \token_if_eq_catcode:NNTF + #1 { - \group_begin: - \char_set_lccode:nn { `A } { `#1 } - \tex_lowercase:D - { - \group_end: - \l_@@_fn_tl A - } + \exp_after:wN \exp_after:wN \exp_after:wN + \l_@@_fn_tl \char_generate:nn { `#1 } { 11 } } { \exp_after:wN \l_@@_fn_tl diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx index 307d6bceb43..4a9fc0bd802 100644 --- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx @@ -41,8 +41,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\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} @@ -56,8 +56,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} % %<*driver> \documentclass[full]{l3doc} -- cgit v1.2.3