summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/l3build/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3build/l3build.pdfbin602851 -> 602841 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3experimental/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdfbin377002 -> 376990 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdfbin319824 -> 319811 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdfbin455760 -> 455747 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-convert.pdfbin448528 -> 448518 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdfbin380172 -> 380159 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdfbin352811 -> 352797 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdfbin384850 -> 384837 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdfbin395302 -> 395288 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdfbin397030 -> 397018 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdfbin291817 -> 291801 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/README.md12
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/expl3.pdfbin586212 -> 586219 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/interface3.pdfbin1500889 -> 1501227 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdfbin268241 -> 268228 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdfbin276808 -> 276795 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdfbin220227 -> 220216 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/source3.pdfbin4674495 -> 4674160 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdfbin333344 -> 333332 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdfbin478208 -> 478195 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdfbin459315 -> 459301 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdfbin422389 -> 422377 bytes
-rw-r--r--Master/texmf-dist/source/latex/l3build/l3build.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx6
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx6
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx6
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx6
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx8
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/expl3.dtx11
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx17
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx47
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx82
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3final.dtx39
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3names.dtx6
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3prg.dtx44
-rw-r--r--Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx8
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx8
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx8
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx8
-rw-r--r--Master/texmf-dist/tex/latex/l3build/l3build.lua10
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex42
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvips.def4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def54
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def4
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty8
60 files changed, 261 insertions, 267 deletions
diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md
index 333e9c814ca..fe5a8688317 100644
--- a/Master/texmf-dist/doc/latex/l3build/README.md
+++ b/Master/texmf-dist/doc/latex/l3build/README.md
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX3
=================================================
-Release 2015/10/14 (r6210)
+Release 2015/11/04 (r6224)
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
index 797d2f5cdf8..edf2d199663 100644
--- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf
+++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3experimental/README.md b/Master/texmf-dist/doc/latex/l3experimental/README.md
index b37a9bd9e74..7128a8b6492 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/README.md
+++ b/Master/texmf-dist/doc/latex/l3experimental/README.md
@@ -1,7 +1,7 @@
Experimental LaTeX3 Concepts
============================
-Release 2015/10/14 (r6210)
+Release 2015/11/04 (r6224)
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf
index 907ec214e54..194bcfa2ec0 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3sort/l3sort.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf
index d34c5bd67d2..a1bbee49df4 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3flag.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf
index aec8bbce79a..0627965ff27 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3regex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-convert.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-convert.pdf
index 42aab8d0be7..7dbfc36fef3 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-convert.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-convert.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf
index c3a878bbc85..505cec25188 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3str-format.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf
index d84e0aea396..b673ab145c6 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-analysis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf
index dbbc87e41a4..d2f58ea9652 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/l3str/l3tl-build.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf b/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf
index 3e46af736f0..1cd600d6af1 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/xcoffins/xcoffins.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf b/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf
index b0780904d68..1fdfa43116e 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/xgalley/l3galley.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf b/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf
index ec887a1de43..4e5161538b0 100644
--- a/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf
+++ b/Master/texmf-dist/doc/latex/l3experimental/xgalley/xgalley.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/README.md b/Master/texmf-dist/doc/latex/l3kernel/README.md
index 5247e20adfd..13b29cf5178 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/10/14 (r6210)
+Release 2015/11/04 (r6224)
Overview
--------
@@ -28,15 +28,17 @@ Requirements
------------
The `l3kernel` bundle requires the e-TeX extensions and the functionality
-of the `\pdfstrcmp` primitive. As a result, the bundle will only work
-with the following engines:
+of the `\pdfstrcmp` primitive. Any engine which defines `\pdfoutput`
+(_i.e._ allows direct production of a PDF file without a DVI intermediate) must
+also provide `\pdfcolorstack`, `\pdfliteral`, `\pdfmatrix`, `\pdfrestore` and
+`\pdfsave`. As a result, the bundle will only work with the following engines:
-* pdfTeX v1.30 or later
+* pdfTeX v1.40 or later
* XeTeX v0.9994 or later
* LuaTeX v0.40 or later
* e-(u)pTeX from mid-2012 onward
-pdfTeX v1.30 was released in 2005, and so any recent TeX distribution
+pdfTeX v1.40 was released in 2007, and so any recent TeX distribution
will support `l3kernel`. Both XeTeX and LuaTeX have developed more
actively over the past few years, and for this reason only recent
releases of these engines are supported.
diff --git a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
index 78912dda8da..9cd9fc12f01 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
index f4264231be7..8bbfd3d58fa 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
index f386c4c5516..29760d93b3a 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
index 303119ff6dd..1fad5448fa0 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
index 8ba3fe20514..a72d809476c 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
index 88184d02e87..df401631478 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3packages/README.md b/Master/texmf-dist/doc/latex/l3packages/README.md
index 313b5b3a9bd..d8e9dbbc82e 100644
--- a/Master/texmf-dist/doc/latex/l3packages/README.md
+++ b/Master/texmf-dist/doc/latex/l3packages/README.md
@@ -1,7 +1,7 @@
LaTeX3 High-Level Concepts
==========================
-Release 2015/10/14 (r6210)
+Release 2015/11/04 (r6224)
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf
index 175c06afec0..01a7a6ca1cb 100644
--- a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf
index 8f3ef609ef4..25652d95b68 100644
--- a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf
index 9a691203bcf..ad17a4bab82 100644
--- a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf
index a55faf9c102..6d9035c1595 100644
--- a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx
index e05215fd42f..f3f480c09d1 100644
--- a/Master/texmf-dist/source/latex/l3build/l3build.dtx
+++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx
@@ -39,8 +39,8 @@
\RequirePackage{expl3}
\def\ExplFileName{l3build}
\def\ExplFileDescription{L3 Regression test suite}
-\def\ExplFileDate{2015/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
\documentclass[full]{l3doc}
\renewcommand\partname{Part}
\usepackage{multicol,needspace}
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx
index b44b9ed7d2a..bdadbc90d88 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx
@@ -37,8 +37,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/10/14]
-%<package>\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+%<package>\@ifpackagelater{expl3}{2015/11/04}
%<package> {}
%<package> {%
%<package> \PackageError{l3sort}{Support package l3kernel too old}
@@ -50,7 +50,7 @@
%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: l3sort.dtx 6210 2015-10-14 07:22:42Z joseph $
+\GetIdInfo$Id: l3sort.dtx 6224 2015-11-04 08:38:08Z joseph $
{L3 Experimental sorting functions}
%</driver|package>
%<*driver>
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx
index 2d1758df661..0b24181815d 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3flag.dtx
@@ -36,8 +36,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/10/14]
-%<package>\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+%<package>\@ifpackagelater{expl3}{2015/11/04}
%<package> {}
%<package> {%
%<package> \PackageError{l3flag}{Support package l3kernel too old}
@@ -49,7 +49,7 @@
%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: l3flag.dtx 6210 2015-10-14 07:22:42Z joseph $
+\GetIdInfo$Id: l3flag.dtx 6224 2015-11-04 08:38:08Z joseph $
{L3 Experimental flags}
%</driver|package>
%<*driver>
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
index a80c510a834..0cd706da66d 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
@@ -36,8 +36,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/10/14]
-%<package>\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+%<package>\@ifpackagelater{expl3}{2015/11/04}
%<package> {}
%<package> {%
%<package> \PackageError{l3regex}{Support package l3kernel too old}
@@ -49,7 +49,7 @@
%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: l3regex.dtx 6210 2015-10-14 07:22:42Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6224 2015-11-04 08:38:08Z joseph $
{L3 Experimental regular expressions}
%</driver|package>
%<*driver>
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx
index 99a47783a06..303d73e1863 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-build.dtx
@@ -36,8 +36,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/10/14]
-%<package>\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+%<package>\@ifpackagelater{expl3}{2015/11/04}
%<package> {}
%<package> {%
%<package> \PackageError{l3tl-build}{Support package l3kernel too old}
@@ -49,7 +49,7 @@
%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: l3tl-build.dtx 6210 2015-10-14 07:22:42Z joseph $
+\GetIdInfo$Id: l3tl-build.dtx 6224 2015-11-04 08:38:08Z joseph $
{L3 Experimental token list construction}
%</driver|package>
%<*driver>
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
index 7109c715ad8..4ba40fccdce 100644
--- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx
@@ -38,8 +38,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/10/14]
-%<package>\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+%<package>\@ifpackagelater{expl3}{2015/11/04}
%<package> {}
%<package> {%
%<package> \PackageError{l3galley}{Support package l3kernel too old}
@@ -51,7 +51,7 @@
%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: l3galley.dtx 6210 2015-10-14 07:22:42Z joseph $
+\GetIdInfo$Id: l3galley.dtx 6224 2015-11-04 08:38:08Z joseph $
{L3 Experimental galley code}
%</driver|package>
%<*driver>
@@ -1146,7 +1146,7 @@
\cs_new_protected_nopar:Npn \galley_par:
{
\s__par_omit
- \exp_after:wN \@@_par_auxi: \exp:w \exp_continue_f:w
+ \exp_after:wN \@@_par_auxi: \exp:w \exp_end_continue_f:w
}
\cs_new_protected:Npn \@@_par_auxi:
{
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
index 42ff1e3e4f4..dc8c1a1a777 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/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
%</driver|generic|package>
%<*driver>
\documentclass[full]{l3doc}
@@ -997,17 +997,16 @@
% |\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|.
+% of a PDF file without a DVI intermediate) must also provide |\pdfcolorstack|,
+% |\pdfliteral|, |\pdfmatrix|, |\pdfrestore| and |\pdfsave|.
%
% Practically, these requirements are met by the engines
% \begin{itemize}
-% \item \pdfTeX{} v1.30 or later.
+% \item \pdfTeX{} v1.40 or later.
% \item \XeTeX{} v0.9994 or later.
% \item \LuaTeX{} v0.40 or later.
% \item e-(u)p\TeX{} mid-2012 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
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
index 69556596190..b510b1036ce 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 6139 2015-09-30 14:02:38Z bruno $
+\GetIdInfo$Id: l3bootstrap.dtx 6213 2015-10-18 09:48:17Z joseph $
{L3 Bootstrap code}
%</driver|package>
%<*driver>
@@ -473,9 +473,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
@@ -483,10 +485,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 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
index d9a3202c949..7e752aadf43 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
@@ -38,7 +38,7 @@
\documentclass[full]{l3doc}
%</driver>
%<*driver|package>
-\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}
%</driver|package>
%<*driver>
@@ -637,14 +637,6 @@
% when there are only two \meta{boolean expressions}.
% \end{function}
%
-% \begin{function}[EXP, updated = 2012-07-08]{\bool_not_p:n}
-% \begin{syntax}
-% \cs{bool_not_p:n} \Arg{boolean expression}
-% \end{syntax}
-% Function version of |!(|\meta{boolean expression}|)| within a boolean
-% expression.
-% \end{function}
-%
% \begin{function}[EXP, added = 2015-09-28]{\bool_or_p:nn}
% \begin{syntax}
% \cs{bool_or_p:nn} \Arg{boolexpr_1} \Arg{boolexpr_2}
@@ -657,17 +649,6 @@
% than two \meta{boolean expressions}.
% \end{function}
%
-% \begin{function}[EXP, updated = 2012-07-08]{\bool_xor_p:nn}
-% \begin{syntax}
-% \cs{bool_xor_p:nn} \Arg{boolexpr_1} \Arg{boolexpr_2}
-% \end{syntax}
-% Implements an \enquote{exclusive or} operation between two boolean
-% expressions. There is no infix operation for this logical
-% operator.
-% \end{function}
-%
-
-%
% \begin{function}[added = 2014-08-22, updated = 2015-08-03]{\bool_log:N, \bool_log:c}
% \begin{syntax}
% \cs{bool_log:N} \meta{boolean}
@@ -2622,17 +2603,6 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\bool_not_p:n}
-% \UnitTested
-% The Not variant just reverses the outcome of \cs{bool_if_p:n}. Can
-% be optimized but this is nice and simple and according to the
-% implementation plan. Not even particularly useful to have it when
-% the infix notation is easier to use.
-% \begin{macrocode}
-\cs_new:Npn \bool_not_p:n #1 { \bool_if_p:n { ! ( #1 ) } }
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}{\bool_or_p:nn}
% Only evaluate the second expression if the first is \texttt{false}.
% \begin{macrocode}
@@ -2641,21 +2611,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\bool_xor_p:nn}
-% \UnitTested
-% Exclusive or. If the boolean expressions have same truth value,
-% return false, otherwise return true.
-% \begin{macrocode}
-\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
- }
-% \end{macrocode}
-% \end{macro}
-%
-%
% \begin{macro}{\bool_log:N, \bool_log:c, \bool_log:n}
% Redirect output of \cs{bool_show:N} to the log.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
index 747d2c33cb4..2d508e31a05 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3drivers.dtx Copyright(C) 2011-2014 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2015 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
@@ -38,7 +38,7 @@
\documentclass[full]{l3doc}
%</driver>
%<*driver|package>
-\GetIdInfo$Id: l3drivers.dtx 5435 2014-10-16 21:27:50Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 6213 2015-10-18 09:48:17Z joseph $
{L3 Experimental drivers}
%</driver|package>
%<*driver>
@@ -225,9 +225,9 @@
% \texttt{(x)dvipdfmx} this is done using an appropriate special. Note
% that here and later, the \texttt{dvipdfmx} documentation does not cover
% the |literal| key word but that this appears to behave in the same way as
-% \pdfTeX{}'s \tn{pdfliteral} (making life easier all-round).
+% \pdfTeX{}'s \tn{pdfliteral} (making life easier all-round). For \pdfTeX{}
+% and \LuaTeX{} giving direct PDF output there is a dedicated primitive.
% \begin{macrocode}
-%<*!pdfmode>
\cs_new_protected_nopar:Npn \@@_state_save:
%<*dvips>
{ \tex_special:D { ps:gsave } }
@@ -235,6 +235,9 @@
%<*dvipdfmx|xdvipdfmx>
{ \tex_special:D { pdf:literal~q } }
%</dvipdfmx|xdvipdfmx>
+%<*pdfmode>
+ { \pdftex_pdfsave:D }
+%</pdfmode>
\cs_new_protected_nopar:Npn \@@_state_restore:
%<*dvips>
{ \tex_special:D { ps:grestore } }
@@ -242,24 +245,8 @@
%<*dvipdfmx|xdvipdfmx>
{ \tex_special:D { pdf:literal~Q } }
%</dvipdfmx|xdvipdfmx>
-%</!pdfmode>
-% \end{macrocode}
-% For direct PDF output there is also a need to worry about the version
-% of \pdfTeX{} in use: the \tn{pdfsave} primitive was only introduced
-% in version~1.40.0.
-% \begin{macrocode}
%<*pdfmode>
-\cs_if_exist:NTF \pdftex_pdfsave:D
- {
- \cs_new_eq:NN \@@_state_save: \pdftex_pdfsave:D
- \cs_new_eq:NN \@@_state_restore: \pdftex_pdfrestore:D
- }
- {
- \cs_new_protected_nopar:Npn \@@_state_save:
- { \pdftex_pdfliteral:D { q } }
- \cs_new_protected_nopar:Npn \@@_state_restore:
- { \pdftex_pdfliteral:D { Q } }
- }
+ { \pdftex_pdfrestore:D }
%</pdfmode>
% \end{macrocode}
% \end{macro}
@@ -341,27 +328,20 @@
%
% \begin{macro}[int]{\@@_matrix:n}
% Here the appropriate function is set up to insert an affine matrix
-% into the PDF. With a new enough \pdfTeX{} (version~1.40.0 or later)
-% there is a primitive for this, which only needs the rotation/scaling/skew
-% part. With an older \pdfTeX{} or with \texttt{(x)dvipdfmx} the matrix
-% also has to include a translation part: that is always zero and so is
-% built in here.
+% into the PDF. With \pdfTeX{} and \LuaTeX{} in direct PDF output mode there
+% is a primitive for this, which only needs the rotation/scaling/skew part.
+% With \texttt{(x)dvipdfmx} the matrix also has to include a translation
+% part: that is always zero and so is built in here.
% \begin{macrocode}
+%<*!dvips>
+\cs_new_protected:Npn \@@_matrix:n #1
%<*pdfmode>
-\cs_if_exist:NTF \pdftex_pdfsetmatrix:D
- {
- \cs_new_protected:Npn \@@_matrix:n #1
- { \pdftex_pdfsetmatrix:D {#1} }
- }
- {
- \cs_new_protected:Npn \@@_matrix:n #1
- { \@@_literal:n { #1 \c_space_tl 0~0~cm } }
- }
+ { \pdftex_pdfsetmatrix:D {#1} }
%</pdfmode>
%<*dvipdfmx|xdvipdfmx>
-\cs_new_protected:Npn \@@_matrix:n #1
{ \@@_literal:n { #1 \c_space_tl 0~0~cm } }
%</dvipdfmx|xdvipdfmx>
+%</!dvips>
% \end{macrocode}
% \end{macro}
%
@@ -521,7 +501,7 @@
% \end{variable}
%
% \begin{variable}{\l_@@_color_stack_int}
-% \pdfTeX{} (version~1.40.0 or later) and \LuaTeX{} have multiple stacks
+% \pdfTeX{} and \LuaTeX{} have multiple stacks
% available, and the color stack therefore needs a number when in PDF mode.
% \begin{macrocode}
%<*pdfmode>
@@ -545,31 +525,15 @@
\cs_new_protected_nopar:Npn \@@_color_reset:
{ \tex_special:D { color~pop } }
%</dvipdfmx|dvips|xdvipdfmx>
-% \end{macrocode}
-% Once again there is a version switch for \pdfTeX{}, as the
-% \tn{pdfcolorstack} primitive was introduced in version~1.40.0.
-% \begin{macrocode}
%<*pdfmode>
-\cs_if_exist:NTF \pdftex_pdfcolorstack:D
- {
- \cs_new_protected_nopar:Npn \@@_color_ensure_current:
- {
- \pdftex_pdfcolorstack:D \l_@@_color_stack_int push
- { \l_@@_current_color_tl }
- \group_insert_after:N \@@_color_reset:
- }
- \cs_new_protected_nopar:Npn \@@_color_reset:
- { \pdftex_pdfcolorstack:D \l_@@_color_stack_int pop \scan_stop: }
- }
+\cs_new_protected_nopar:Npn \@@_color_ensure_current:
{
- \cs_new_protected_nopar:Npn \@@_color_ensure_current:
- {
- \@@_literal:n { \l_@@_current_color_tl }
- \group_insert_after:N \@@_color_reset:
- }
- \cs_new_protected_nopar:Npn \@@_color_reset:
- { \@@_literal:n { \l_@@_current_color_tl } }
+ \pdftex_pdfcolorstack:D \l_@@_color_stack_int push
+ { \l_@@_current_color_tl }
+ \group_insert_after:N \@@_color_reset:
}
+\cs_new_protected_nopar:Npn \@@_color_reset:
+ { \pdftex_pdfcolorstack:D \l_@@_color_stack_int pop \scan_stop: }
%</pdfmode>
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3final.dtx b/Master/texmf-dist/source/latex/l3kernel/l3final.dtx
index 93bf9a5f987..e080da8a5bd 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3final.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3final.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3final.dtx Copyright (C) 1990-2014 The LaTeX3 Project
+%% File: l3final.dtx Copyright (C) 1990-2015 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
@@ -35,7 +35,7 @@
%
%<*driver>
\documentclass[full]{l3doc}
-\GetIdInfo$Id: l3final.dtx 4712 2014-04-30 08:17:49Z joseph $
+\GetIdInfo$Id: l3final.dtx 6223 2015-11-03 14:50:28Z joseph $
{L3 Experimental format finalisation}
\begin{document}
\DocInput{\jobname.dtx}
@@ -77,6 +77,41 @@
%<*initex>
% \end{macrocode}
%
+% \subsection{Temporary hacks}
+%
+% \begin{macro}{\T1/lmr/m/n/10}
+% For \emph{testing only} provide some kind of output: for that we
+% need a font. At present, select Latin Modern Roman at 10\,pt:
+% entirely arbitrary but at least usable.
+% \begin{macrocode}
+\tex_everypar:D \exp_after:wN
+ {
+ \exp_after:wN \tex_font:D \cs:w T1/lmr/m/n/10 \cs_end:
+ = ec-lmr10 \scan_stop:
+ \use:c { T1/lmr/m/n/10 }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% Produce PDF output if possible (easier testing) and set some kind of
+% horizontal width: the one here is the \LaTeXe{} default. A parfill is
+% also useful so we get some kind of sensible paragraphs.
+% \begin{macrocode}
+\dim_set:Nn \tex_hsize:D { 345pt }
+\skip_set:Nn \tex_parfillskip:D { 0pt plus 1fil }
+\cs_if_exist:NT \pdftex_pdfoutput:D
+ { \int_set:Nn \pdftex_pdfoutput:D { 1 } }
+% \end{macrocode}
+%
+% \begin{macro}{\stop}
+% A way out of the run without needing to switch to the code environment.
+% \begin{macrocode}
+\cs_set_eq:NN \stop \tex_end:D
+% \end{macrocode}
+% \end{macro}
+%
+% \subsection{Final tasks}
+%
% \begin{macro}{\par}
% \TeX{} has a nasty habit of inserting a command with the name \cs{par}
% so we had better make sure that \cs{par} has a definition.
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
index f7d7ed4e2ee..44b019828bb 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 6209 2015-10-10 19:51:42Z joseph $
+\GetIdInfo$Id: l3names.dtx 6220 2015-11-03 11:53:30Z joseph $
{L3 Namespace for primitives}
%</driver|package>
%<*driver>
@@ -1095,11 +1095,13 @@
\tex_let:D \luatex_rightghost:D \luatexrightghost
\tex_let:D \luatex_textdir:D \luatextextdir
\tex_fi:D
+%</package>
% \end{macrocode}
% Tidy up some \XeTeX{} renames and the fact that some
% format-building processes leave a couple of questionable decisions about.
% (There may at some stage be \LuaTeX{} renames of the same sort to address.)
% \begin{macrocode}
+%<*initex|package>
\etex_unless:D \etex_ifdefined:D \pdftex_ifprimitive:D
\tex_expandafter:D \tex_let:D
\tex_csname:D pdftex_ifprimitive:D \tex_expandafter:D \tex_endcsname:D
@@ -1158,6 +1160,7 @@
\tex_let:D \pdftex_savepos:D \savepos
\tex_let:D \pdftex_uniformdeviate:D \uniformdeviate
\tex_fi:D
+%</initex|package>
% \end{macrocode}
%
% For Con\TeX{}t, two tests are needed. Both Mark~II and Mark~IV move several
@@ -1165,6 +1168,7 @@
% as a marker. For Mark~IV, a few more primitives are moved: they are
% implemented using some Lua code in the current Con\TeX{}t.
% \begin{macrocode}
+%<*package>
\etex_ifdefined:D \normalend
\tex_let:D \tex_end:D \normalend
\tex_let:D \tex_everyjob:D \normaleveryjob
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
index 1fc47d225b9..08cd5acc89d 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 6208 2015-10-09 20:01:54Z joseph $
+\GetIdInfo$Id: l3prg.dtx 6216 2015-11-01 23:32:43Z bruno $
{L3 Control structures}
%</driver|package>
%<*driver>
@@ -391,6 +391,23 @@
% the next predicate or group.
% \end{function}
%
+% \begin{function}[EXP, updated = 2012-07-08]{\bool_not_p:n}
+% \begin{syntax}
+% \cs{bool_not_p:n} \Arg{boolean expression}
+% \end{syntax}
+% Function version of |!(|\meta{boolean expression}|)| within a boolean
+% expression.
+% \end{function}
+%
+% \begin{function}[EXP, updated = 2012-07-08]{\bool_xor_p:nn}
+% \begin{syntax}
+% \cs{bool_xor_p:nn} \Arg{boolexpr_1} \Arg{boolexpr_2}
+% \end{syntax}
+% Implements an \enquote{exclusive or} operation between two boolean
+% expressions. There is no infix operation for this logical
+% operator.
+% \end{function}
+%
% \section{Logical loops}
%
% Loops using either boolean expressions or stored boolean values.
@@ -1205,6 +1222,31 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\bool_not_p:n}
+% \UnitTested
+% The Not variant just reverses the outcome of \cs{bool_if_p:n}. Can
+% be optimized but this is nice and simple and according to the
+% implementation plan. Not even particularly useful to have it when
+% the infix notation is easier to use.
+% \begin{macrocode}
+\cs_new:Npn \bool_not_p:n #1 { \bool_if_p:n { ! ( #1 ) } }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\bool_xor_p:nn}
+% \UnitTested
+% Exclusive or. If the boolean expressions have same truth value,
+% return false, otherwise return true.
+% \begin{macrocode}
+\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
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Logical loops}
%
% \begin{macro}{\bool_while_do:Nn, \bool_while_do:cn}
diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
index 564453aa23b..79d549806b8 100644
--- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
@@ -37,8 +37,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/10/14]
-%<package>\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+%<package>\@ifpackagelater{expl3}{2015/11/04}
%<package> {}
%<package> {%
%<package> \PackageError{l3keys2e}{Support package l3kernel too old}
@@ -52,8 +52,8 @@
%<package> }
\def\ExplFileName{l3keys2e}
\def\ExplFileDescription{LaTeX2e option processing using LaTeX3 keys}
-\def\ExplFileDate{2015/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
%</driver|package>
%<*driver>
\documentclass[full]{l3doc}
diff --git a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
index 084b7537288..d6f77268574 100644
--- a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
@@ -38,8 +38,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/10/14]
-%<package>\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+%<package>\@ifpackagelater{expl3}{2015/11/04}
%<package> {}
%<package> {%
%<package> \PackageError{xfrac}{Support package l3kernel too old}
@@ -54,8 +54,8 @@
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
\def\ExplFileName{xfrac}
\def\ExplFileDescription{L3 Experimental split-level fractions}
-\def\ExplFileDate{2015/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
%</driver|package>
%<*driver>
\documentclass[full]{l3doc}
diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
index eb1446b199d..acb89c006d8 100644
--- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
@@ -41,8 +41,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/10/14]
-%<package>\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+%<package>\@ifpackagelater{expl3}{2015/11/04}
%<package> {}
%<package> {%
%<package> \PackageError{xparse}{Support package l3kernel too old}
@@ -56,8 +56,8 @@
%<package> }
\def\ExplFileName{xparse}
\def\ExplFileDescription{L3 Experimental document command parser}
-\def\ExplFileDate{2015/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
%</driver|package>
%<*driver>
\documentclass[full]{l3doc}
diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
index 2d831ef719a..d08e257b053 100644
--- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
@@ -41,8 +41,8 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2015/10/14]
-%<package>\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+%<package>\@ifpackagelater{expl3}{2015/11/04}
%<package> {}
%<package> {%
%<package> \PackageError{xtemplate}{Support package l3kernel too old}
@@ -56,8 +56,8 @@
%<package> }
\def\ExplFileName{xtemplate}
\def\ExplFileDescription{L3 Experimental prototype document functions}
-\def\ExplFileDate{2015/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
%</driver|package>
%<*driver>
\documentclass[full]{l3doc}
diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua
index 7238c9a2167..a3f6a1662c6 100644
--- a/Master/texmf-dist/tex/latex/l3build/l3build.lua
+++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua
@@ -1511,8 +1511,10 @@ function ctan(standalone)
end
if errorlevel == 0 then
for _,i in ipairs(textfiles) do
- cp(i, ".", ctandir .. "/" .. ctanpkg)
- cp(i, ".", tdsdir .. "/doc/" .. tdsroot .. "/" .. bundle)
+ for _,j in pairs({unpackdir, "."}) do
+ cp(i, j, ctandir .. "/" .. ctanpkg)
+ cp(i, j, tdsdir .. "/doc/" .. tdsroot .. "/" .. bundle)
+ end
end
dirzip(tdsdir, ctanpkg .. ".tds")
if packtdszip then
@@ -1676,7 +1678,7 @@ if versionform ~= "" and not setversion_update_line then
for _,i in pairs({"Class", "File", "Package"}) do
if string.match(
line,
- "^\\Provides" .. i .. "{[a-zA-Z0-9%-]+}%[[^%]]*%]$"
+ "^\\Provides" .. i .. "{[a-zA-Z0-9%-%.]+}%[[^%]]*%]$"
) then
line = string.gsub(line, "%[%d%d%d%d/%d%d/%d%d", "["
.. string.gsub(date, "%-", "/"))
@@ -1695,7 +1697,7 @@ if versionform ~= "" and not setversion_update_line then
for _,i in pairs({"Class", "File", "Package"}) do
if string.match(
line,
- "^\\ProvidesExpl" .. i .. " *{[a-zA-Z0-9%-]+}"
+ "^\\ProvidesExpl" .. i .. " *{[a-zA-Z0-9%-%.]+}"
) then
line = string.gsub(
line,
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
index 4c1629d90e0..3ee6f2e63c1 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty
@@ -46,8 +46,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/10/14]
-\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+\@ifpackagelater{expl3}{2015/11/04}
{}
{%
\PackageError{l3sort}{Support package l3kernel too old}
@@ -59,7 +59,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3sort.dtx 6210 2015-10-14 07:22:42Z joseph $
+\GetIdInfo$Id: l3sort.dtx 6224 2015-11-04 08:38:08Z joseph $
{L3 Experimental sorting functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
index 0e296bf1b1b..b5ac4c9b2cb 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3flag.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/10/14]
-\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+\@ifpackagelater{expl3}{2015/11/04}
{}
{%
\PackageError{l3flag}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3flag.dtx 6210 2015-10-14 07:22:42Z joseph $
+\GetIdInfo$Id: l3flag.dtx 6224 2015-11-04 08:38:08Z joseph $
{L3 Experimental flags}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
index df11537977c..fef1274ed3a 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/10/14]
-\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+\@ifpackagelater{expl3}{2015/11/04}
{}
{%
\PackageError{l3regex}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3regex.dtx 6210 2015-10-14 07:22:42Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6224 2015-11-04 08:38:08Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
index b307ce19193..9ea18098e46 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/10/14]
-\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+\@ifpackagelater{expl3}{2015/11/04}
{}
{%
\PackageError{l3regex}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3regex.dtx 6210 2015-10-14 07:22:42Z joseph $
+\GetIdInfo$Id: l3regex.dtx 6224 2015-11-04 08:38:08Z joseph $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
index 94d64c2e4d9..73f0cadb652 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-build.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/10/14]
-\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+\@ifpackagelater{expl3}{2015/11/04}
{}
{%
\PackageError{l3tl-build}{Support package l3kernel too old}
@@ -58,7 +58,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3tl-build.dtx 6210 2015-10-14 07:22:42Z joseph $
+\GetIdInfo$Id: l3tl-build.dtx 6224 2015-11-04 08:38:08Z joseph $
{L3 Experimental token list construction}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index 0f49b08630b..394acb36211 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -47,8 +47,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/10/14]
-\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+\@ifpackagelater{expl3}{2015/11/04}
{}
{%
\PackageError{l3galley}{Support package l3kernel too old}
@@ -60,7 +60,7 @@
}%
\endinput
}
-\GetIdInfo$Id: l3galley.dtx 6210 2015-10-14 07:22:42Z joseph $
+\GetIdInfo$Id: l3galley.dtx 6224 2015-11-04 08:38:08Z joseph $
{L3 Experimental galley code}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -222,7 +222,7 @@
\cs_new_protected_nopar:Npn \galley_par:
{
\s__par_omit
- \exp_after:wN \__galley_par_auxi: \exp:w \exp_continue_f:w
+ \exp_after:wN \__galley_par_auxi: \exp:w \exp_end_continue_f:w
}
\cs_new_protected:Npn \__galley_par_auxi:
{
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
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index 13f9a8da9ea..eed43ce107f 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/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
\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 ac51131c577..9757a20e523 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/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
\let\ExplLoaderFileVersion\ExplFileVersion
\ProvidesPackage{\ExplFileName}
[%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
index 253e30db82a..9937016235d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
@@ -13,7 +13,7 @@
%%
%% Do not distribute a modified version of this file.
%%
-%% File: l3drivers.dtx Copyright(C) 2011-2014 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2015 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
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3drivers.dtx 5435 2014-10-16 21:27:50Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 6213 2015-10-18 09:48:17Z joseph $
{L3 Experimental drivers}
\ProvidesExplFile
{l3dvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
index 95221dc53f6..b262fdd5832 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
@@ -13,7 +13,7 @@
%%
%% Do not distribute a modified version of this file.
%%
-%% File: l3drivers.dtx Copyright(C) 2011-2014 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2015 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
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3drivers.dtx 5435 2014-10-16 21:27:50Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 6213 2015-10-18 09:48:17Z joseph $
{L3 Experimental drivers}
\ProvidesExplFile
{l3dvips.def}{\ExplFileDate}{\ExplFileVersion}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
index be740d35d28..07ba441e09e 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
@@ -13,7 +13,7 @@
%%
%% Do not distribute a modified version of this file.
%%
-%% File: l3drivers.dtx Copyright(C) 2011-2014 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2015 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
@@ -46,35 +46,21 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3drivers.dtx 5435 2014-10-16 21:27:50Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 6213 2015-10-18 09:48:17Z joseph $
{L3 Experimental drivers}
\ProvidesExplFile
{l3pdfmode.def}{\ExplFileDate}{\ExplFileVersion}
{L3 Experimental driver: PDF mode}
-\cs_if_exist:NTF \pdftex_pdfsave:D
- {
- \cs_new_eq:NN \__driver_state_save: \pdftex_pdfsave:D
- \cs_new_eq:NN \__driver_state_restore: \pdftex_pdfrestore:D
- }
- {
- \cs_new_protected_nopar:Npn \__driver_state_save:
- { \pdftex_pdfliteral:D { q } }
- \cs_new_protected_nopar:Npn \__driver_state_restore:
- { \pdftex_pdfliteral:D { Q } }
- }
+\cs_new_protected_nopar:Npn \__driver_state_save:
+ { \pdftex_pdfsave:D }
+\cs_new_protected_nopar:Npn \__driver_state_restore:
+ { \pdftex_pdfrestore:D }
\cs_new_protected:Npn \__driver_literal:n #1
{ \pdftex_pdfliteral:D {#1} }
\cs_new_protected:Npn \__driver_literal_direct:n #1
{ \pdftex_pdfliteral:D direct {#1} }
-\cs_if_exist:NTF \pdftex_pdfsetmatrix:D
- {
- \cs_new_protected:Npn \__driver_matrix:n #1
- { \pdftex_pdfsetmatrix:D {#1} }
- }
- {
- \cs_new_protected:Npn \__driver_matrix:n #1
- { \__driver_literal:n { #1 \c_space_tl 0~0~cm } }
- }
+\cs_new_protected:Npn \__driver_matrix:n #1
+ { \pdftex_pdfsetmatrix:D {#1} }
\cs_new_protected:Npn \__driver_box_use_clip:N #1
{
\__driver_state_save:
@@ -129,26 +115,14 @@
\tl_new:N \l__driver_current_color_tl
\tl_set:Nn \l__driver_current_color_tl { 0~g~0~G }
\int_new:N \l__driver_color_stack_int
-\cs_if_exist:NTF \pdftex_pdfcolorstack:D
+\cs_new_protected_nopar:Npn \__driver_color_ensure_current:
{
- \cs_new_protected_nopar:Npn \__driver_color_ensure_current:
- {
- \pdftex_pdfcolorstack:D \l__driver_color_stack_int push
- { \l__driver_current_color_tl }
- \group_insert_after:N \__driver_color_reset:
- }
- \cs_new_protected_nopar:Npn \__driver_color_reset:
- { \pdftex_pdfcolorstack:D \l__driver_color_stack_int pop \scan_stop: }
- }
- {
- \cs_new_protected_nopar:Npn \__driver_color_ensure_current:
- {
- \__driver_literal:n { \l__driver_current_color_tl }
- \group_insert_after:N \__driver_color_reset:
- }
- \cs_new_protected_nopar:Npn \__driver_color_reset:
- { \__driver_literal:n { \l__driver_current_color_tl } }
+ \pdftex_pdfcolorstack:D \l__driver_color_stack_int push
+ { \l__driver_current_color_tl }
+ \group_insert_after:N \__driver_color_reset:
}
+\cs_new_protected_nopar:Npn \__driver_color_reset:
+ { \pdftex_pdfcolorstack:D \l__driver_color_stack_int pop \scan_stop: }
%%
%%
%% End of file `l3pdfmode.def'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
index de4dafd6375..e7beae6b58d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
@@ -13,7 +13,7 @@
%%
%% Do not distribute a modified version of this file.
%%
-%% File: l3drivers.dtx Copyright(C) 2011-2014 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2015 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
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
%%
-\GetIdInfo$Id: l3drivers.dtx 5435 2014-10-16 21:27:50Z joseph $
+\GetIdInfo$Id: l3drivers.dtx 6213 2015-10-18 09:48:17Z joseph $
{L3 Experimental drivers}
\ProvidesExplFile
{l3xdvidpfmx.def}{\ExplFileDate}{\ExplFileVersion}
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 2fede3199bf..c9a3f80bc4a 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -46,8 +46,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/10/14]
-\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+\@ifpackagelater{expl3}{2015/11/04}
{}
{%
\PackageError{l3keys2e}{Support package l3kernel too old}
@@ -61,8 +61,8 @@
}
\def\ExplFileName{l3keys2e}
\def\ExplFileDescription{LaTeX2e option processing using LaTeX3 keys}
-\def\ExplFileDate{2015/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\cs_generate_variant:Nn \clist_put_right:Nn { Nv }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
index 202d3a764e6..2c0b6b615e5 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -47,8 +47,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/10/14]
-\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+\@ifpackagelater{expl3}{2015/11/04}
{}
{%
\PackageError{xfrac}{Support package l3kernel too old}
@@ -63,8 +63,8 @@
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
\def\ExplFileName{xfrac}
\def\ExplFileDescription{L3 Experimental split-level fractions}
-\def\ExplFileDate{2015/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\keys_define:nn { xfrac }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 170f182d2cd..983e184e387 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/10/14]
-\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+\@ifpackagelater{expl3}{2015/11/04}
{}
{%
\PackageError{xparse}{Support package l3kernel too old}
@@ -65,8 +65,8 @@
}
\def\ExplFileName{xparse}
\def\ExplFileDescription{L3 Experimental document command parser}
-\def\ExplFileDate{2015/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\tl_const:Nx \c__xparse_no_value_tl
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 42a205af782..e02925f37f2 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/10/14]
-\@ifpackagelater{expl3}{2015/10/14}
+\RequirePackage{expl3}[2015/11/04]
+\@ifpackagelater{expl3}{2015/11/04}
{}
{%
\PackageError{xtemplate}{Support package l3kernel too old}
@@ -65,8 +65,8 @@
}
\def\ExplFileName{xtemplate}
\def\ExplFileDescription{L3 Experimental prototype document functions}
-\def\ExplFileDate{2015/10/14}
-\def\ExplFileVersion{6210}
+\def\ExplFileDate{2015/11/04}
+\def\ExplFileVersion{6224}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\tl_const:Nn \c__xtemplate_code_root_tl { template~code~>~ }