summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-05 00:01:25 +0000
committerKarl Berry <karl@freefriends.org>2015-11-05 00:01:25 +0000
commite6cb7eab17b3ef76d3f96c8e23782a91190102a8 (patch)
tree1d90b38b9c413bb2fc8c07c9cec8da785b30bb20 /Master/texmf-dist/tex/latex
parentcffa5da405ae09ac7a50a8a46795ac83e5bc18dc (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')
-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
18 files changed, 90 insertions, 106 deletions
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~>~ }