From 281228b1b6025a3157d88d7331e5b306160b9462 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 3 Jan 2016 22:15:54 +0000 Subject: l3kernel (3jan16) git-svn-id: svn://tug.org/texlive/trunk@39266 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/l3kernel/README.md | 2 +- Master/texmf-dist/doc/latex/l3kernel/expl3.pdf | Bin 585998 -> 586274 bytes .../texmf-dist/doc/latex/l3kernel/interface3.pdf | Bin 1500789 -> 1501051 bytes .../texmf-dist/doc/latex/l3kernel/l3docstrip.pdf | Bin 268222 -> 268222 bytes .../texmf-dist/doc/latex/l3kernel/l3styleguide.pdf | Bin 276787 -> 276787 bytes .../doc/latex/l3kernel/l3syntax-changes.pdf | Bin 220209 -> 220209 bytes Master/texmf-dist/doc/latex/l3kernel/source3.pdf | Bin 4704105 -> 4705347 bytes Master/texmf-dist/source/latex/l3kernel/expl3.dtx | 4 +-- .../source/latex/l3kernel/l3bootstrap.dtx | 8 ++--- .../texmf-dist/source/latex/l3kernel/l3names.dtx | 10 +++++-- Master/texmf-dist/source/latex/l3kernel/l3str.dtx | 13 ++++---- .../texmf-dist/tex/latex/l3kernel/expl3-code.tex | 33 +++++++++++---------- .../tex/latex/l3kernel/expl3-generic.tex | 4 +-- Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 4 +-- 14 files changed, 42 insertions(+), 36 deletions(-) diff --git a/Master/texmf-dist/doc/latex/l3kernel/README.md b/Master/texmf-dist/doc/latex/l3kernel/README.md index d8a62c55bf1..eb23874c2d1 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/README.md +++ b/Master/texmf-dist/doc/latex/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2015/12/20 (r6326) +Release 2016/01/03 (r6358) Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf index e7bb12843b4..0da2ea514ef 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf and b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf index 4a2cd97fe3b..2b1211b1462 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf and b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf index 78f1a689023..77581e3a203 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf and b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf index 4e3175f88da..6932b4107b6 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf and b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf index 50ea4d9bcd8..43c495ae3b3 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf and b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf index d7fd1ac7f2e..1b580160766 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf and b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf differ diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx index 616b5e07678..cad58a7674c 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{2015/12/20}% -\def\ExplFileVersion{6326}% +\def\ExplFileDate{2016/01/03}% +\def\ExplFileVersion{6358}% % %<*driver> \documentclass[full]{l3doc} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx index 2fddc7e68e3..0f255e13be1 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3bootstrap.dtx Copyright (C) 2011-2015 The LaTeX3 project +%% File: l3bootstrap.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 @@ -76,7 +76,7 @@ \endgroup \def\ExplFileDate{0000/00/00}% \def\ExplFileDescription{#2}% - \def\ExplFileName{[unknown name]}% + \def\ExplFileName{[unknown]}% \def\ExplFileExtension{[unknown extension]}% \def\ExplFileVersion{-1}% }% @@ -145,7 +145,7 @@ % \end{macro} % \end{macro} % \end{macro} -\GetIdInfo$Id: l3bootstrap.dtx 6320 2015-12-15 09:49:47Z joseph $ +\GetIdInfo$Id: l3bootstrap.dtx 6339 2016-01-01 09:30:10Z joseph $ {L3 Bootstrap code}% % %<*driver> @@ -362,7 +362,7 @@ \newcatcodetable\ucharcat@table \directlua{ l3kernel = l3kernel or { } - local charcat_table = \number\ucharcat@table + local charcat_table = \number\ucharcat@table\space l3kernel.charcat_table = charcat_table }% % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx index 5cc1a600b02..e9b77107076 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx @@ -37,7 +37,7 @@ \documentclass[full]{l3doc} % %<*driver|package> -\GetIdInfo$Id: l3names.dtx 6276 2015-11-16 12:04:42Z joseph $ +\GetIdInfo$Id: l3names.dtx 6328 2015-12-21 12:41:32Z joseph $ {L3 Namespace for primitives} % %<*driver> @@ -803,13 +803,15 @@ \__kernel_primitive:NN \expanded \luatex_expanded:D \__kernel_primitive:NN \fontid \luatex_fontid:D \__kernel_primitive:NN \formatname \luatex_formatname:D + \__kernel_primitive:NN \hjcode \luatex_hjcode:D + \__kernel_primitive:NN \hpack \luatex_hpack:D \__kernel_primitive:NN \hyphenationmin \luatex_hypenationmin:D \__kernel_primitive:NN \gleaders \luatex_gleaders:D \__kernel_primitive:NN \initcatcodetable \luatex_initcatcodetable:D \__kernel_primitive:NN \latelua \luatex_latelua:D + \__kernel_primitive:NN \letcharcode \luatex_letcharcode:D \__kernel_primitive:NN \luaescapestring \luatex_luaescapestring:D \__kernel_primitive:NN \luafunction \luatex_luafunction:D - \__kernel_primitive:NN \luastartup \luatex_luastartup:D \__kernel_primitive:NN \luatexdatestamp \luatex_luatexdatestamp:D \__kernel_primitive:NN \luatexrevision \luatex_luatexrevision:D \__kernel_primitive:NN \luatexversion \luatex_luatexversion:D @@ -822,6 +824,7 @@ \__kernel_primitive:NN \nohrule \luatex_nohrule:D \__kernel_primitive:NN \nokerns \luatex_nokerns:D \__kernel_primitive:NN \noligs \luatex_noligs:D + \__kernel_primitive:NN \nospace \luatex_nospace:D \__kernel_primitive:NN \novrule \luatex_novrule:D \__kernel_primitive:NN \outputbox \luatex_outputbox:D \__kernel_primitive:NN \pageleftoffset \luatex_pageleftoffset:D @@ -840,6 +843,8 @@ \__kernel_primitive:NN \suppresslongerror \luatex_suppresslongerror:D \__kernel_primitive:NN \suppressmathparerror \luatex_suppressmathparerror:D \__kernel_primitive:NN \suppressoutererror \luatex_suppressoutererror:D + \__kernel_primitive:NN \tpack \luatex_tpack:D + \__kernel_primitive:NN \vpack \luatex_vpack:D % \end{macrocode} % Slightly more awkward are the directional primitives in \LuaTeX{}. These % come from Omega/Aleph, but we do not support those engines and @@ -1136,7 +1141,6 @@ \tex_let:D \luatex_latelua:D \luatexlatelua \tex_let:D \luatex_luaescapestring:D \luatexluaescapestring \tex_let:D \luatex_luafunction:D \luatexluafunction - \tex_let:D \luatex_luastartup:D \luatexluastartup \tex_let:D \luatex_mathstyle:D \luatexmathstyle \tex_let:D \luatex_nokerns:D \luatexnokerns \tex_let:D \luatex_noligs:D \luatexnoligs diff --git a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx index f7ab1f809a8..7e43436ecd5 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx @@ -37,7 +37,7 @@ \documentclass[full]{l3doc} % %<*driver|package> -\GetIdInfo$Id: l3str.dtx 6325 2015-12-20 18:07:35Z joseph $ +\GetIdInfo$Id: l3str.dtx 6357 2016-01-03 08:42:55Z joseph $ {L3 Strings} % %<*driver> @@ -1400,7 +1400,7 @@ % and everything else. The output is detokenized to allow data sharing % with text-based case changing. % \begin{macrocode} -\cs_new:Npn \str_fold_case:n #1 { \@@_change_case:nn {#1} { fold } } +\cs_new:Npn \str_fold_case:n #1 { \@@_change_case:nn {#1} { fold } } \cs_new:Npn \str_lower_case:n #1 { \@@_change_case:nn {#1} { lower } } \cs_new:Npn \str_upper_case:n #1 { \@@_change_case:nn {#1} { upper } } \cs_generate_variant:Nn \str_fold_case:n { V } @@ -1431,7 +1431,7 @@ \cs_new:Npn \@@_change_case_char:nN #1#2 { \quark_if_recursion_tail_stop:N #2 - \cs_if_exist:cTF { c__unicode_ #1 _ #2 _tl } + \cs_if_exist:cTF { c__unicode_ #1 _ #2 _tl } { \tl_to_str:c { c__unicode_ #1 _ #2 _tl } } { \@@_change_case_char_aux:nN {#1} #2 } \__str_change_case_loop:nw {#1} @@ -1569,7 +1569,7 @@ % Set up to read each file. As they use C-style comments, thre is a need to % deal with |#|. At the same time, spaces are important so they need to be % picked up as they are important. Beyond that, the current category code -% scheme works fine. With no I/O loop available, hard-code one that will work +% scheme works fine. With no I/O loop available, hard-code one that will work % quickly. % \begin{macrocode} \cs_set_protected:Npn \@@_map_inline:n #1 @@ -1610,16 +1610,15 @@ % \begin{macrocode} \cs_set_protected:Npn \@@_parse:w #1#2 \q_stop { - \reverse_if:N \if:w \l_@@_hash_tl #1 + \reverse_if:N \if:w \c_hash_str #1 \@@_parse_auxi:w #1#2 \q_stop \else: \if_int_compare:w \__str_if_eq_x:nn - {#2} { ~Conditional~Mappings~ } = \c_zero + { \exp_not:n {#2} } { ~Conditional~Mappings~ } = \c_zero \cs_set_protected:Npn \@@_parse:w ##1 \q_stop { } \fi: \fi: } - \cs_set_nopar:Npx \l_@@_hash_tl { \token_to_str:N # } % \end{macrocode} % Storing each exception is always done in the same way: create a constant % token list which expands to exactly the mapping. These will have the diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index daf68d1349d..3b89b6f6fd1 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{2015/12/20}% -\def\ExplFileVersion{6326}% +\def\ExplFileDate{2016/01/03}% +\def\ExplFileVersion{6358}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -141,7 +141,7 @@ \ExplFileDate\space v\ExplFileVersion\space \ExplFileDescription\space (code)% }% -%% File: l3bootstrap.dtx Copyright (C) 2011-2015 The LaTeX3 project +%% File: l3bootstrap.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 @@ -190,7 +190,7 @@ \endgroup \def\ExplFileDate{0000/00/00}% \def\ExplFileDescription{#2}% - \def\ExplFileName{[unknown name]}% + \def\ExplFileName{[unknown]}% \def\ExplFileExtension{[unknown extension]}% \def\ExplFileVersion{-1}% }% @@ -242,7 +242,7 @@ }% }% \endgroup -\GetIdInfo$Id: l3bootstrap.dtx 6320 2015-12-15 09:49:47Z joseph $ +\GetIdInfo$Id: l3bootstrap.dtx 6339 2016-01-01 09:30:10Z joseph $ {L3 Bootstrap code}% \begingroup \expandafter\ifx\csname directlua\endcsname\relax @@ -277,7 +277,7 @@ \newcatcodetable\ucharcat@table \directlua{ l3kernel = l3kernel or { } - local charcat_table = \number\ucharcat@table + local charcat_table = \number\ucharcat@table\space l3kernel.charcat_table = charcat_table }% \directlua{require("expl3")}% @@ -449,7 +449,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3names.dtx 6276 2015-11-16 12:04:42Z joseph $ +\GetIdInfo$Id: l3names.dtx 6328 2015-12-21 12:41:32Z joseph $ {L3 Namespace for primitives} \let \tex_global:D \global \let \tex_let:D \let @@ -1041,13 +1041,15 @@ \__kernel_primitive:NN \expanded \luatex_expanded:D \__kernel_primitive:NN \fontid \luatex_fontid:D \__kernel_primitive:NN \formatname \luatex_formatname:D + \__kernel_primitive:NN \hjcode \luatex_hjcode:D + \__kernel_primitive:NN \hpack \luatex_hpack:D \__kernel_primitive:NN \hyphenationmin \luatex_hypenationmin:D \__kernel_primitive:NN \gleaders \luatex_gleaders:D \__kernel_primitive:NN \initcatcodetable \luatex_initcatcodetable:D \__kernel_primitive:NN \latelua \luatex_latelua:D + \__kernel_primitive:NN \letcharcode \luatex_letcharcode:D \__kernel_primitive:NN \luaescapestring \luatex_luaescapestring:D \__kernel_primitive:NN \luafunction \luatex_luafunction:D - \__kernel_primitive:NN \luastartup \luatex_luastartup:D \__kernel_primitive:NN \luatexdatestamp \luatex_luatexdatestamp:D \__kernel_primitive:NN \luatexrevision \luatex_luatexrevision:D \__kernel_primitive:NN \luatexversion \luatex_luatexversion:D @@ -1060,6 +1062,7 @@ \__kernel_primitive:NN \nohrule \luatex_nohrule:D \__kernel_primitive:NN \nokerns \luatex_nokerns:D \__kernel_primitive:NN \noligs \luatex_noligs:D + \__kernel_primitive:NN \nospace \luatex_nospace:D \__kernel_primitive:NN \novrule \luatex_novrule:D \__kernel_primitive:NN \outputbox \luatex_outputbox:D \__kernel_primitive:NN \pageleftoffset \luatex_pageleftoffset:D @@ -1078,6 +1081,8 @@ \__kernel_primitive:NN \suppresslongerror \luatex_suppresslongerror:D \__kernel_primitive:NN \suppressmathparerror \luatex_suppressmathparerror:D \__kernel_primitive:NN \suppressoutererror \luatex_suppressoutererror:D + \__kernel_primitive:NN \tpack \luatex_tpack:D + \__kernel_primitive:NN \vpack \luatex_vpack:D \__kernel_primitive:NN \bodydir \luatex_bodydir:D \__kernel_primitive:NN \boxdir \luatex_boxdir:D \__kernel_primitive:NN \leftghost \luatex_leftghost:D @@ -1330,7 +1335,6 @@ \tex_let:D \luatex_latelua:D \luatexlatelua \tex_let:D \luatex_luaescapestring:D \luatexluaescapestring \tex_let:D \luatex_luafunction:D \luatexluafunction - \tex_let:D \luatex_luastartup:D \luatexluastartup \tex_let:D \luatex_mathstyle:D \luatexmathstyle \tex_let:D \luatex_nokerns:D \luatexnokerns \tex_let:D \luatex_noligs:D \luatexnoligs @@ -3609,7 +3613,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3str.dtx 6325 2015-12-20 18:07:35Z joseph $ +\GetIdInfo$Id: l3str.dtx 6357 2016-01-03 08:42:55Z joseph $ {L3 Strings} \group_begin: \cs_set_protected:Npn \__str_tmp:n #1 @@ -4024,7 +4028,7 @@ \tl_to_str:n {#1} \q_mark \q_mark \q_stop } \cs_new:Npn \__str_tail_auxii:w #1 #2 \q_mark #3 \q_stop { #2 } -\cs_new:Npn \str_fold_case:n #1 { \__str_change_case:nn {#1} { fold } } +\cs_new:Npn \str_fold_case:n #1 { \__str_change_case:nn {#1} { fold } } \cs_new:Npn \str_lower_case:n #1 { \__str_change_case:nn {#1} { lower } } \cs_new:Npn \str_upper_case:n #1 { \__str_change_case:nn {#1} { upper } } \cs_generate_variant:Nn \str_fold_case:n { V } @@ -4055,7 +4059,7 @@ \cs_new:Npn \__str_change_case_char:nN #1#2 { \quark_if_recursion_tail_stop:N #2 - \cs_if_exist:cTF { c__unicode_ #1 _ #2 _tl } + \cs_if_exist:cTF { c__unicode_ #1 _ #2 _tl } { \tl_to_str:c { c__unicode_ #1 _ #2 _tl } } { \__str_change_case_char_aux:nN {#1} #2 } \__str_change_case_loop:nw {#1} @@ -4138,16 +4142,15 @@ \cs_set_nopar:Npn \l__unicode_tmp_tl { } \cs_set_protected:Npn \__unicode_parse:w #1#2 \q_stop { - \reverse_if:N \if:w \l__unicode_hash_tl #1 + \reverse_if:N \if:w \c_hash_str #1 \__unicode_parse_auxi:w #1#2 \q_stop \else: \if_int_compare:w \__str_if_eq_x:nn - {#2} { ~Conditional~Mappings~ } = \c_zero + { \exp_not:n {#2} } { ~Conditional~Mappings~ } = \c_zero \cs_set_protected:Npn \__unicode_parse:w ##1 \q_stop { } \fi: \fi: } - \cs_set_nopar:Npx \l__unicode_hash_tl { \token_to_str:N # } \cs_set_protected:Npn \__unicode_store:nnnnn #1#2#3#4#5 { \tl_const:cx { c__unicode_ #2 _ \utex_char:D "#1 _tl } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 6a4f5145da5..7227ae2dc85 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex @@ -47,8 +47,8 @@ %% ----------------------------------------------------------------------- \def\ExplFileName{expl3}% \def\ExplFileDescription{L3 programming layer}% -\def\ExplFileDate{2015/12/20}% -\def\ExplFileVersion{6326}% +\def\ExplFileDate{2016/01/03}% +\def\ExplFileVersion{6358}% \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 77d2883700c..cb9e99bb02c 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -47,8 +47,8 @@ %% ----------------------------------------------------------------------- \def\ExplFileName{expl3}% \def\ExplFileDescription{L3 programming layer}% -\def\ExplFileDate{2015/12/20}% -\def\ExplFileVersion{6326}% +\def\ExplFileDate{2016/01/03}% +\def\ExplFileVersion{6358}% \let\ExplLoaderFileVersion\ExplFileVersion \ProvidesPackage{\ExplFileName} [% -- cgit v1.2.3