summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex74
1 files changed, 38 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 99c00c3f9e3..f0604e11f7c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -58,8 +58,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx Copyright (C) 1990-2017 The LaTeX3 Project
-\def\ExplFileDate{2017/03/18}%
-\def\ExplFileVersion{7019}%
+\def\ExplFileDate{2017/04/01}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -72,7 +71,7 @@
\errmessage{#1 Error: #2!}%
}%
\fi
- \expandafter\ifx\csname ExplLoaderFileVersion\endcsname\relax
+ \expandafter\ifx\csname ExplLoaderFileDate\endcsname\relax
\def\next
{%
\PackageError{expl3}{No expl3 loader detected}
@@ -84,7 +83,7 @@
\endinput
}
\else
- \ifx\ExplLoaderFileVersion\ExplFileVersion
+ \ifx\ExplLoaderFileDate\ExplFileDate
\else
\def\next
{%
@@ -104,7 +103,7 @@
\expandafter\ifx\csname ver@expl3-code.tex\endcsname\relax
\expandafter\edef\csname ver@expl3-code.tex\endcsname
{%
- \ExplFileDate\space v\ExplFileVersion\space
+ \ExplFileDate\space
L3 programming layer
}%
\else
@@ -113,7 +112,7 @@
\immediate\write-1 %
{%
Package: expl3
- \ExplFileDate\space v\ExplFileVersion\space
+ \ExplFileDate\space
L3 programming layer (code)%
}%
%% File: l3bootstrap.dtx Copyright (C) 2011-2017 The LaTeX3 project
@@ -929,6 +928,7 @@
\__kernel_primitive:NN \aligntab \luatex_aligntab:D
\__kernel_primitive:NN \attribute \luatex_attribute:D
\__kernel_primitive:NN \attributedef \luatex_attributedef:D
+ \__kernel_primitive:NN \automatichyphenpenalty \luatex_automatichyphenpenalty:D
\__kernel_primitive:NN \begincsname \luatex_begincsname:D
\__kernel_primitive:NN \catcodetable \luatex_catcodetable:D
\__kernel_primitive:NN \clearmarks \luatex_clearmarks:D
@@ -942,6 +942,7 @@
\__kernel_primitive:NN \dvivariable \luatex_dvivariable:D
\__kernel_primitive:NN \etoksapp \luatex_etoksapp:D
\__kernel_primitive:NN \etokspre \luatex_etokspre:D
+ \__kernel_primitive:NN \explicithyphenpenalty \luatex_explicithyphenpenalty:D
\__kernel_primitive:NN \expanded \luatex_expanded:D
\__kernel_primitive:NN \firstvalidlanguage \luatex_firstvalidlanguage:D
\__kernel_primitive:NN \fontid \luatex_fontid:D
@@ -950,6 +951,7 @@
\__kernel_primitive:NN \hpack \luatex_hpack:D
\__kernel_primitive:NN \hyphenationbounds \luatex_hyphenationbounds:D
\__kernel_primitive:NN \hyphenationmin \luatex_hyphenationmin:D
+ \__kernel_primitive:NN \hyphenpenaltymode \luatex_hyphenpenaltymode:D
\__kernel_primitive:NN \gleaders \luatex_gleaders:D
\__kernel_primitive:NN \initcatcodetable \luatex_initcatcodetable:D
\__kernel_primitive:NN \lastnamedcs \luatex_lastnamedcs:D
@@ -5809,6 +5811,36 @@
{ % (
\__bool_eval_skip_to_end_auxi:Nw #1#3 )
}
+\prg_new_conditional:Npnn \bool_lazy_all:n #1 { p , T , F , TF }
+ { \__bool_lazy_all:n #1 \q_recursion_tail \q_recursion_stop }
+\cs_new:Npn \__bool_lazy_all:n #1
+ {
+ \quark_if_recursion_tail_stop_do:nn {#1} { \prg_return_true: }
+ \bool_if:nF {#1}
+ { \use_i_delimit_by_q_recursion_stop:nw { \prg_return_false: } }
+ \__bool_lazy_all:n
+ }
+\prg_new_conditional:Npnn \bool_lazy_and:nn #1#2 { p , T , F , TF }
+ {
+ \bool_if:nTF {#1}
+ { \bool_if:nTF {#2} { \prg_return_true: } { \prg_return_false: } }
+ { \prg_return_false: }
+ }
+\prg_new_conditional:Npnn \bool_lazy_any:n #1 { p , T , F , TF }
+ { \__bool_lazy_any:n #1 \q_recursion_tail \q_recursion_stop }
+\cs_new:Npn \__bool_lazy_any:n #1
+ {
+ \quark_if_recursion_tail_stop_do:nn {#1} { \prg_return_false: }
+ \bool_if:nT {#1}
+ { \use_i_delimit_by_q_recursion_stop:nw { \prg_return_true: } }
+ \__bool_lazy_any:n
+ }
+\prg_new_conditional:Npnn \bool_lazy_or:nn #1#2 { p , T , F , TF }
+ {
+ \bool_if:nTF {#1}
+ { \prg_return_true: }
+ { \bool_if:nTF {#2} { \prg_return_true: } { \prg_return_false: } }
+ }
\cs_new:Npn \bool_not_p:n #1 { \bool_if_p:n { ! ( #1 ) } }
\cs_new:Npn \bool_xor_p:nn #1#2
{
@@ -18107,36 +18139,6 @@
\exp_after:wN \use_none_delimit_by_q_stop:w
\use:n { \::error ! ~ #2 : ~ #1 } \q_stop
}
-\prg_new_conditional:Npnn \bool_lazy_all:n #1 { p , T , F , TF }
- { \__bool_lazy_all:n #1 \q_recursion_tail \q_recursion_stop }
-\cs_new:Npn \__bool_lazy_all:n #1
- {
- \quark_if_recursion_tail_stop_do:nn {#1} { \prg_return_true: }
- \bool_if:nF {#1}
- { \use_i_delimit_by_q_recursion_stop:nw { \prg_return_false: } }
- \__bool_lazy_all:n
- }
-\prg_new_conditional:Npnn \bool_lazy_and:nn #1#2 { p , T , F , TF }
- {
- \bool_if:nTF {#1}
- { \bool_if:nTF {#2} { \prg_return_true: } { \prg_return_false: } }
- { \prg_return_false: }
- }
-\prg_new_conditional:Npnn \bool_lazy_any:n #1 { p , T , F , TF }
- { \__bool_lazy_any:n #1 \q_recursion_tail \q_recursion_stop }
-\cs_new:Npn \__bool_lazy_any:n #1
- {
- \quark_if_recursion_tail_stop_do:nn {#1} { \prg_return_false: }
- \bool_if:nT {#1}
- { \use_i_delimit_by_q_recursion_stop:nw { \prg_return_true: } }
- \__bool_lazy_any:n
- }
-\prg_new_conditional:Npnn \bool_lazy_or:nn #1#2 { p , T , F , TF }
- {
- \bool_if:nTF {#1}
- { \prg_return_true: }
- { \bool_if:nTF {#2} { \prg_return_true: } { \prg_return_false: } }
- }
\cs_new:Npn \prop_count:N #1
{
\int_eval:n