summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-31 22:23:37 +0000
committerKarl Berry <karl@freefriends.org>2015-07-31 22:23:37 +0000
commit4a8c92de2f60b2debb339603c0be279952352d1e (patch)
treed9261c4b4e79a2366875eb9460d1ed0bc1ab77a2 /Master/texmf-dist/tex
parent387c2269e074a98a2cfa129f31bcbfd13e005f75 (diff)
l3kernel (31jul15)
git-svn-id: svn://tug.org/texlive/trunk@38014 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex69
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty4
3 files changed, 61 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 1b601e21869..26b50c35a38 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -81,8 +81,8 @@
%% -----------------------------------------------------------------------
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2015/07/28}
-\def\ExplFileVersion{5700}
+\def\ExplFileDate{2015/07/30}
+\def\ExplFileVersion{5724}
\begingroup
\def\next{\endgroup}
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -241,7 +241,7 @@
}
}
\endgroup
-\GetIdInfo$Id: l3bootstrap.dtx 5634 2015-06-24 14:51:22Z joseph $
+\GetIdInfo$Id: l3bootstrap.dtx 5721 2015-07-30 11:46:45Z bruno $
{L3 Bootstrap code}
\begingroup
\expandafter\ifx\csname directlua\endcsname\relax
@@ -345,7 +345,7 @@
\def\@tempa{LaTeX2e}
\def\next{}
\ifx\fmtname\@tempa
- \unless\ifdefined\extrafloats
+ \expandafter\ifx\csname extrafloats\endcsname\relax
\def\next
{%
\RequirePackage{etex}%
@@ -446,7 +446,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3names.dtx 5691 2015-07-27 19:53:13Z joseph $
+\GetIdInfo$Id: l3names.dtx 5705 2015-07-28 21:31:02Z joseph $
{L3 Namespace for primitives}
\let \tex_global:D \global
\let \tex_let:D \let
@@ -1194,6 +1194,48 @@
\__kernel_primitive:NN \Usubscript \utex_subscript:D
\__kernel_primitive:NN \Usuperscript \utex_superscript:D
\__kernel_primitive:NN \Uunderdelimiter \utex_underdelimiter:D
+ \__kernel_primitive:NN \autospacing \ptex_autospacing:D
+ \__kernel_primitive:NN \autoxspacing \ptex_autoxspacing:D
+ \__kernel_primitive:NN \dtou \ptex_dtou:D
+ \__kernel_primitive:NN \euc \ptex_euc:D
+ \__kernel_primitive:NN \ifdbox \ptex_ifdbox:D
+ \__kernel_primitive:NN \ifddir \ptex_ifddir:D
+ \__kernel_primitive:NN \ifmdir \ptex_ifmdir:D
+ \__kernel_primitive:NN \iftbox \ptex_iftbox:D
+ \__kernel_primitive:NN \iftdir \ptex_iftdir:D
+ \__kernel_primitive:NN \ifybox \ptex_ifybox:D
+ \__kernel_primitive:NN \ifydir \ptex_ifydir:D
+ \__kernel_primitive:NN \inhibitglue \ptex_inhibitglue:D
+ \__kernel_primitive:NN \inhibitxspcode \ptex_inhibitxspcode:D
+ \__kernel_primitive:NN \jcharwidowpenalty \ptex_jcharwidowpenalty:D
+ \__kernel_primitive:NN \jfam \ptex_jfam:D
+ \__kernel_primitive:NN \jfont \ptex_jfont:D
+ \__kernel_primitive:NN \jis \ptex_jis:D
+ \__kernel_primitive:NN \kanjiskip \ptex_kanjiskip:D
+ \__kernel_primitive:NN \kansuji \ptex_kansuji:D
+ \__kernel_primitive:NN \kansujichar \ptex_kansujichar:D
+ \__kernel_primitive:NN \kcatcode \ptex_kcatcode:D
+ \__kernel_primitive:NN \kuten \ptex_kuten:D
+ \__kernel_primitive:NN \noautospacing \ptex_noautospacing:D
+ \__kernel_primitive:NN \noautoxspacing \ptex_noautoxspacing:D
+ \__kernel_primitive:NN \postbreakpenalty \ptex_postbreakpenalty:D
+ \__kernel_primitive:NN \prebreakpenalty \ptex_prebreakpenalty:D
+ \__kernel_primitive:NN \showmode \ptex_showmode:D
+ \__kernel_primitive:NN \sjis \ptex_sjis:D
+ \__kernel_primitive:NN \tate \ptex_tate:D
+ \__kernel_primitive:NN \tbaselineshift \ptex_tbaselineshift:D
+ \__kernel_primitive:NN \tfont \ptex_tfont:D
+ \__kernel_primitive:NN \xkanjiskip \ptex_xkanjiskip:D
+ \__kernel_primitive:NN \xspcode \ptex_xspcode:D
+ \__kernel_primitive:NN \ybaselineshift \ptex_ybaselineshift:D
+ \__kernel_primitive:NN \yoko \ptex_yoko:D
+ \__kernel_primitive:NN \disablecjktoken \uptex_disablecjktoken:D
+ \__kernel_primitive:NN \enablecjktoken \uptex_enablecjktoken:D
+ \__kernel_primitive:NN \forcecjktoken \uptex_forcecjktoken:D
+ \__kernel_primitive:NN \kchar \uptex_kchar:D
+ \__kernel_primitive:NN \kchardef \uptex_kchardef:D
+ \__kernel_primitive:NN \kuten \uptex_kuten:D
+ \__kernel_primitive:NN \ucs \uptex_ucs:D
\tex_endgroup:D
\etex_ifdefined:D \@@end
\tex_let:D \tex_end:D \@@end
@@ -5191,7 +5233,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3prg.dtx 5653 2015-07-13 08:57:05Z joseph $
+\GetIdInfo$Id: l3prg.dtx 5722 2015-07-30 12:54:33Z bruno $
{L3 Control structures}
%%
\tex_let:D \if_bool:N \tex_ifodd:D
@@ -5281,7 +5323,10 @@
\cs_new_protected:Npn \bool_show:N #1
{
\bool_if_exist:NTF #1
- { \bool_show:n {#1} }
+ {
+ \__msg_show_variable:n
+ { > \token_to_str:N #1 = \bool_if:NTF #1 { true } { false } }
+ }
{
\__msg_kernel_error:nnx { kernel } { variable-not-defined }
{ \token_to_str:N #1 }
@@ -7929,7 +7974,7 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\GetIdInfo$Id: l3file.dtx 5688 2015-07-27 16:57:49Z bruno $
+\GetIdInfo$Id: l3file.dtx 5714 2015-07-30 00:51:47Z bruno $
{L3 File and I/O operations}
\tl_new:N \g_file_current_name_tl
\cs_if_exist:NT \@currname
@@ -8137,8 +8182,8 @@
\prg_return_true:
}
}
-\exp_args:NNNo \exp_args:NNo \cs_new_protected_nopar:Npn \__ior_new:N
- { \cs:w newread \cs_end: }
+\exp_args:NNf \cs_new_protected_nopar:Npn \__ior_new:N
+ { \exp_args:NNc \exp_after:wN \exp_stop_f: { newread } }
\cs_new_protected:Npn \__ior_open:Nn #1#2
{
\ior_close:N #1
@@ -8229,8 +8274,8 @@
}
\cs_new_protected:Npn \iow_new:N #1 { \cs_new_eq:NN #1 \c_term_iow }
\cs_generate_variant:Nn \iow_new:N { c }
-\exp_args:NNNo \exp_args:NNo \cs_new_protected_nopar:Npn \__iow_new:N
- { \cs:w newwrite \cs_end: }
+\exp_args:NNf \cs_new_protected_nopar:Npn \__iow_new:N
+ { \exp_args:NNc \exp_after:wN \exp_stop_f: { newwrite } }
\cs_new_protected:Npn \iow_open:Nn #1#2
{ \__file_name_sanitize:nn {#2} { \__iow_open:Nn #1 } }
\cs_generate_variant:Nn \iow_open:Nn { c }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index e9a3144afc8..3a6395c5ce5 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/07/28}
-\def\ExplFileVersion{5700}
+\def\ExplFileDate{2015/07/30}
+\def\ExplFileVersion{5724}
\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 5e8ed84d543..a05051c3119 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/07/28}
-\def\ExplFileVersion{5700}
+\def\ExplFileDate{2015/07/30}
+\def\ExplFileVersion{5724}
\let\ExplLoaderFileVersion\ExplFileVersion
\ProvidesPackage{\ExplFileName}
[%