summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/expl3.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty90
1 files changed, 76 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 906b5d1fc9f..4c96696adb5 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -13,7 +13,7 @@
%%
%% Do not distribute a modified version of this file.
%%
-%% File: expl3.dtx Copyright (C) 1990-2011 The LaTeX3 Project
+%% File: expl3.dtx Copyright (C) 1990-2012 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
@@ -45,11 +45,22 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{l3names}
+\RequirePackage{l3names}[2011/12/30]
+\@ifpackagelater{l3names}{2011/12/30}
+ {}
+ {
+ \PackageError{expl3}{Mismatched LaTeX3 packages detected.}
+ {
+ Please install an up to date~version of l3kernel
+ using your TeX package manager or from CTAN.\\ \\
+ Loading expl3 will abort!
+ }
+ \endinput
+ }
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 Experimental code bundle wrapper}
-\def\ExplFileDate{2011/12/29}
-\def\ExplFileVersion{3109}
+\def\ExplFileDate{2012/01/19}
+\def\ExplFileVersion{3209}
\RequirePackage{etex}
\reserveinserts{32}
\RequirePackage{calc}
@@ -71,7 +82,7 @@
\fi
\RequirePackage{ l3basics, l3expan, l3tl }
\ifodd \l@expl@check@declarations@bool \relax
- \cs_new_protected:Npn \tl_check_exists:N #1
+ \cs_new_protected:Npn \cs_check_exists:N #1
{
\cs_if_exist:NF #1
{
@@ -81,34 +92,34 @@
}
\cs_set_protected:Npn \tl_set:Nn #1#2
{
- \tl_check_exists:N #1
+ \cs_check_exists:N #1
\cs_set_nopar:Npx #1 { \exp_not:n {#2} }
}
\cs_set_protected:Npn \tl_set:Nx #1#2
{
- \tl_check_exists:N #1
+ \cs_check_exists:N #1
\cs_set_nopar:Npx #1 {#2}
}
\cs_set_protected:Npn \tl_gset:Nn #1#2
{
- \tl_check_exists:N #1
+ \cs_check_exists:N #1
\cs_gset_nopar:Npx #1 { \exp_not:n {#2} }
}
\cs_set_protected:Npn \tl_gset:Nx #1#2
{
- \tl_check_exists:N #1
+ \cs_check_exists:N #1
\cs_gset_nopar:Npx #1 {#2}
}
\cs_set_protected:Npn \tl_set_eq:NN #1#2
{
- \tl_check_exists:N #1
- \tl_check_exists:N #2
+ \cs_check_exists:N #1
+ \cs_check_exists:N #2
\cs_set_eq:NN #1 #2
}
\cs_set_protected:Npn \tl_gset_eq:NN #1#2
{
- \tl_check_exists:N #1
- \tl_check_exists:N #2
+ \cs_check_exists:N #1
+ \cs_check_exists:N #2
\cs_gset_eq:NN #1 #2
}
\fi
@@ -116,7 +127,58 @@
l3seq,
l3int,
l3quark,
- l3prg,
+ l3prg}
+\ifodd \l@expl@check@declarations@bool \relax
+ \cs_set_protected:Npn \bool_set_true:N #1
+ {
+ \cs_check_exists:N #1
+ \cs_set_eq:NN #1 \c_true_bool
+ }
+ \cs_set_protected:Npn \bool_set_false:N #1
+ {
+ \cs_check_exists:N #1
+ \cs_set_eq:NN #1 \c_false_bool
+ }
+ \cs_set_protected:Npn \bool_gset_true:N #1
+ {
+ \cs_check_exists:N #1
+ \cs_gset_eq:NN #1 \c_true_bool
+ }
+ \cs_set_protected:Npn \bool_gset_false:N #1
+ {
+ \cs_check_exists:N #1
+ \cs_gset_eq:NN #1 \c_false_bool
+ }
+ \cs_set_protected:Npn \bool_set_eq:NN #1
+ {
+ \cs_check_exists:N #1
+ \cs_set_eq:NN #1
+ }
+ \cs_undefine:N \bool_set_eq:cN
+ \cs_undefine:N \bool_set_eq:Nc
+ \cs_undefine:N \bool_set_eq:cc
+ \cs_generate_variant:Nn \bool_set_eq:NN { c , Nc , cc }
+ \cs_set_protected:Npn \bool_gset_eq:NN #1
+ {
+ \cs_check_exists:N #1
+ \cs_set_eq:NN #1
+ }
+ \cs_undefine:N \bool_gset_eq:cN
+ \cs_undefine:N \bool_gset_eq:Nc
+ \cs_undefine:N \bool_gset_eq:cc
+ \cs_generate_variant:Nn \bool_gset_eq:NN { c , Nc , cc }
+ \cs_set_protected:Npn \bool_set:Nn #1#2
+ {
+ \cs_check_exists:N #1
+ \tex_chardef:D #1 = \bool_if_p:n {#2}
+ }
+ \cs_set_protected:Npn \bool_gset:Nn #1#2
+ {
+ \cs_check_exists:N #1
+ \tex_global:D \tex_chardef:D #1 = \bool_if_p:n {#2}
+ }
+\fi
+\RequirePackage{
l3clist,
l3token,
l3prop,