diff options
author | Karl Berry <karl@freefriends.org> | 2016-04-21 20:56:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-04-21 20:56:35 +0000 |
commit | a25cbbbb685bf98f9df75cb08131ea8f4e0f7e79 (patch) | |
tree | 0258b6ea1aeda5aefacec1cfc5fc040a1d7cfe8b /Master/texmf-dist/tex/latex/l3kernel | |
parent | 60c97fceef9abdc952329cd66318bbde2cfbc6de (diff) |
l3 (21apr16)
git-svn-id: svn://tug.org/texlive/trunk@40657 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex | 13 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3doc.cls | 21 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3dvips.def | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def | 10 |
8 files changed, 55 insertions, 27 deletions
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 } |