l3kernel (31jul15)

git-svn-id: svn://tug.org/texlive/trunk@38014 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 95 insertions, 14 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
index dc7a203660f..b66626c6e91 100644
--- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
@@ -36,11 +36,12 @@
 %<*driver|generic|package>
 \def\ExplFileName{expl3}
 \def\ExplFileDescription{L3 programming layer}
-\def\ExplFileDate{2015/07/28}
-\def\ExplFileVersion{5700}
+\def\ExplFileDate{2015/07/30}
+\def\ExplFileVersion{5724}
 %</driver|generic|package>
 %<*driver>
 \documentclass[full]{l3doc}
+\usepackage{graphicx}
 \begin{document}
   \DocInput{\jobname.dtx}
 \end{document}
@@ -978,6 +979,35 @@
 % be loadable: package loading is dependent on the \LaTeXe{} package-management
 % mechanism.
 %
+% \section{Engine/primitive requirements}
+%
+% To use \pkg{expl3} and the higher level packages provided by the
+% team, the minimal set of primitive requirements is currently
+% \begin{itemize}
+%    \item All of those from \TeX90.
+%    \item All of those from \eTeX{} \emph{excluding} |\TeXXeTstate|,
+%      |\beginL|, |\beginR|, |\endL| and |\endR| (\emph{i.e.}~excluding
+%      \TeX{}-\kern0pt-\reflectbox{\TeX{}}).
+%    \item Functionality equivalent to the \pdfTeX{} primitive
+%      |\pdfstrcmp|.
+% \end{itemize}
+% Any engine which defines |\pdfoutput| (\emph{i.e.}~allows direct production
+% of a PDF file without a DVI intermediate) must also provide |\pdfliteral|.
+% 
+% Practically, these requirements are met by the engines
+% \begin{itemize}
+%    \item \pdfTeX{} v1.30 or later.
+%    \item \XeTeX{} v0.9994 or later.
+%    \item \LuaTeX{} v0.40 or later.
+%    \item e(u)p\TeX{} v110825 or later.
+% \end{itemize}
+% of which the first three engines are currently officially supported by
+% the team.
+% 
+% Additional modules beyond the core of \pkg{expl3} may require additional
+% primitives. In particular, third-party authors may significantly
+% extend the primitive coverage requirements.
+%
 % \section{The \LaTeX3 Project}
 %
 % Development of \LaTeX3 is carried out by The \LaTeX3 Project. Over time,
@@ -1389,8 +1419,8 @@
 %
 % \begin{variable}[int]{\c__expl_def_ext_tl}
 %   Set up to load Unicode data for various string/text manipulations.
-%   AS the full mechanisms are still be constructed, this requires some
-%   fiddling about with the \cs{\ProvidesExplFile} command. A similar
+%   As the full mechanisms are still be constructed, this requires some
+%   fiddling about with the \cs{ProvidesExplFile} command. A similar
 %   requirement applies a little later to loading the native drivers, but
 %   as that may not happen depending on options the same trick has to be
 %   repeated!
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
index 66f51af2d2a..cf0903d6dec 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
@@ -145,7 +145,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-\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}
 %</driver|package>
 %<*driver>
@@ -492,7 +492,7 @@
   \def\@tempa{LaTeX2e}
   \def\next{}
   \ifx\fmtname\@tempa
-    \unless\ifdefined\extrafloats
+    \expandafter\ifx\csname extrafloats\endcsname\relax
       \def\next
         {%
           \RequirePackage{etex}%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
index 0b6a3b58842..8a5ab688d68 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
@@ -37,7 +37,7 @@
 \documentclass[full]{l3doc}
 %</driver>
 %<*driver|package>
-\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}
 %</driver|package>
 %<*driver>
@@ -1056,8 +1056,8 @@
 %   being \tn{outer}.
 %    \begin{macrocode}
 %<*package>
-\exp_args:NNNo \exp_args:NNo \cs_new_protected_nopar:Npn \@@_new:N
-  { \cs:w newread \cs_end: }
+\exp_args:NNf \cs_new_protected_nopar:Npn \@@_new:N
+  { \exp_args:NNc \exp_after:wN \exp_stop_f: { newread } }
 %</package>
 %    \end{macrocode}
 % \end{macro}
@@ -1288,8 +1288,8 @@
 %   that it is not \tn{outer}.
 %    \begin{macrocode}
 %<*package>
-\exp_args:NNNo \exp_args:NNo \cs_new_protected_nopar:Npn \@@_new:N
-  { \cs:w newwrite \cs_end: }
+\exp_args:NNf \cs_new_protected_nopar:Npn \@@_new:N
+  { \exp_args:NNc \exp_after:wN \exp_stop_f: { newwrite } }
 %</package>
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
index f8ae4de880f..0f942069d30 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>
 %<*driver|package>
-\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}
 %</driver|package>
 %<*driver>
@@ -960,6 +960,54 @@
   \__kernel_primitive:NN \Usuperscript              \utex_superscript:D
   \__kernel_primitive:NN \Uunderdelimiter           \utex_underdelimiter:D
 %    \end{macrocode}
+% Primitives from p\TeX{}.
+%    \begin{macrocode}
+  \__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
+%    \end{macrocode}
+% Primitives from up\TeX{}.
+%    \begin{macrocode}
+  \__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
+%    \end{macrocode}
 % End of the \enquote{just the names} part of the source.
 %    \begin{macrocode}
 %</initex|names|package>
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
index eee48348057..278950c0205 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
@@ -37,7 +37,7 @@
 \documentclass[full]{l3doc}
 %</driver>
 %<*driver|package>
-\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}
 %</driver|package>
 %<*driver>
@@ -901,7 +901,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 }