diff options
author | Karl Berry <karl@freefriends.org> | 2015-11-05 00:01:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-11-05 00:01:25 +0000 |
commit | e6cb7eab17b3ef76d3f96c8e23782a91190102a8 (patch) | |
tree | 1d90b38b9c413bb2fc8c07c9cec8da785b30bb20 /Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex | |
parent | cffa5da405ae09ac7a50a8a46795ac83e5bc18dc (diff) |
latex3 (4nov15)
git-svn-id: svn://tug.org/texlive/trunk@38776 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 4eb591e374d..f0ca8c432fc 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/10/14} -\def\ExplFileVersion{6210} +\def\ExplFileDate{2015/11/04} +\def\ExplFileVersion{6224} \begingroup \def\next{\endgroup} \expandafter\ifx\csname PackageError\endcsname\relax @@ -242,7 +242,7 @@ } } \endgroup -\GetIdInfo$Id: l3bootstrap.dtx 6139 2015-09-30 14:02:38Z bruno $ +\GetIdInfo$Id: l3bootstrap.dtx 6213 2015-10-18 09:48:17Z joseph $ {L3 Bootstrap code} \begingroup \expandafter\ifx\csname directlua\endcsname\relax @@ -349,9 +349,11 @@ \def\LongText% {% LaTeX3 requires the e-TeX primitives and \string\pdfstrcmp.\LineBreak + Direct PDF production also requires additional primitives listed in the + README.\LineBreak \LineBreak These are available in the engines\LineBreak - - pdfTeX v1.30\LineBreak + - pdfTeX v1.40\LineBreak - XeTeX v0.9994\LineBreak - LuaTeX v0.40\LineBreak - e-(u)pTeX mid-2012\LineBreak @@ -359,10 +361,17 @@ \LineBreak }% \ifnum0% - \expandafter\ifx\csname pdfstrcmp\endcsname\relax\else 1\fi + \expandafter\ifx\csname pdfstrcmp\endcsname\relax + \else + \expandafter\ifx\csname pdftexversion\endcsname\relax + 1% + \else + \ifnum\pdftexversion<140 \else 1\fi + \fi + \fi \expandafter\ifx\csname directlua\endcsname\relax \else - \ifnum\luatexversion<36 \else 1\fi + \ifnum\luatexversion<40 \else 1\fi \fi =0 % \newlinechar`\^^J % @@ -490,7 +499,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3names.dtx 6209 2015-10-10 19:51:42Z joseph $ +\GetIdInfo$Id: l3names.dtx 6220 2015-11-03 11:53:30Z joseph $ {L3 Namespace for primitives} \let \tex_global:D \global \let \tex_let:D \let @@ -5646,7 +5655,7 @@ %% prior consultation with the LaTeX3 Project. %% %% ----------------------------------------------------------------------- -\GetIdInfo$Id: l3prg.dtx 6208 2015-10-09 20:01:54Z joseph $ +\GetIdInfo$Id: l3prg.dtx 6216 2015-11-01 23:32:43Z bruno $ {L3 Control structures} \cs_new_eq:NN \if_bool:N \tex_ifodd:D \cs_new_eq:NN \if_predicate:w \tex_ifodd:D @@ -5833,6 +5842,13 @@ { % ( \__bool_eval_skip_to_end_auxi:Nw #1#3 ) } +\cs_new:Npn \bool_not_p:n #1 { \bool_if_p:n { ! ( #1 ) } } +\cs_new:Npn \bool_xor_p:nn #1#2 + { + \int_compare:nNnTF { \bool_if_p:n {#1} } = { \bool_if_p:n {#2} } + \c_false_bool + \c_true_bool + } \cs_new:Npn \bool_while_do:Nn #1#2 { \bool_if:NT #1 { #2 \bool_while_do:Nn #1 {#2} } } \cs_new:Npn \bool_until_do:Nn #1#2 @@ -16927,9 +16943,8 @@ %% %% ----------------------------------------------------------------------- %% -\GetIdInfo$Id: l3candidates.dtx 6208 2015-10-09 20:01:54Z joseph $ +\GetIdInfo$Id: l3candidates.dtx 6216 2015-11-01 23:32:43Z bruno $ {L3 Experimental additions to l3kernel} - \cs_new_protected_nopar:Npn \cs_log:N { \__msg_log_next: \cs_show:N } \cs_new_protected_nopar:Npn \cs_log:c @@ -17680,15 +17695,8 @@ { \use_i_delimit_by_q_recursion_stop:nw { \c_true_bool } } \__bool_any_aux:n } -\cs_new:Npn \bool_not_p:n #1 { \bool_if_p:n { ! ( #1 ) } } \cs_new:Npn \bool_or_p:nn #1#2 { \bool_if:nTF {#1} { \c_true_bool } { \bool_if_p:n {#2} } } -\cs_new:Npn \bool_xor_p:nn #1#2 - { - \int_compare:nNnTF { \bool_if_p:n {#1} } = { \bool_if_p:n {#2} } - \c_false_bool - \c_true_bool - } \cs_new_protected_nopar:Npn \bool_log:N { \__msg_log_next: \bool_show:N } \cs_new_protected_nopar:Npn \bool_log:n |