summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty22
1 files changed, 18 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
index 8a260b26410..263ab7bf875 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
@@ -102,7 +102,7 @@
{%
\def\ExplFileDate{#1/#2/#3}%
}
-\GetIdInfo$Id: l3bootstrap.dtx 3986 2012-07-15 19:23:51Z joseph $
+\GetIdInfo$Id: l3bootstrap.dtx 3991 2012-07-16 19:00:35Z joseph $
{L3 Bootstrap code}
\ProvidesPackage{l3bootstrap}
[%
@@ -169,10 +169,24 @@
\chardef\csname\detokenize{l__kernel_expl_bool}\endcsname = 1 \relax
}
\expandafter\chardef\csname\detokenize{l__kernel_expl_bool}\endcsname = 0 \relax
-\protected\def\ProvidesExplPackage#1#2#3#4%
+\protected\def\ProvidesExplPackage
{%
- \ProvidesPackage{#1}[#2 v#3 #4]%
- \ExplSyntaxOn
+ \@ifpackageloaded{expl3}
+ {}
+ {%
+ \PackageError{expl3}
+ {Cannot load the expl3 modules separately}
+ {%
+ The expl3 modules cannot be loaded separately;\MessageBreak
+ please \string\usepackage\string{expl3\string} instead.%
+ }%
+ }%
+ \protected\def\ProvidesExplPackage##1##2##3##4%
+ {%
+ \ProvidesPackage{##1}[##2 v##3 ##4]%
+ \ExplSyntaxOn
+ }%
+ \ProvidesExplPackage
}
\protected\def\ProvidesExplClass#1#2#3#4%
{%