diff options
author | Karl Berry <karl@freefriends.org> | 2012-07-23 17:15:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-07-23 17:15:00 +0000 |
commit | 134349701bddf7cbbacf6030c6b9f9838aff96fa (patch) | |
tree | ec1140c46e1c0347a671a6fa3cf8af5a79e95f93 /Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty | |
parent | f7855c12c18bb97b7b9e49ab685ee558d8c0b47b (diff) |
l3kernel 3990 (17jul12)
git-svn-id: svn://tug.org/texlive/trunk@27108 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty | 167 |
1 files changed, 64 insertions, 103 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty index f5320078a78..8a260b26410 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty @@ -13,7 +13,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: l3bootstrap.dtx Copyright (C) 2011 The LaTeX3 project +%% File: l3bootstrap.dtx Copyright (C) 2011-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 @@ -46,20 +46,20 @@ %% %% ----------------------------------------------------------------------- \protected\def\GetIdInfo - { + {% \begingroup - \catcode 32 = 10 \relax - \GetIdInfoAuxI + \catcode 32 = 10 % + \GetIdInfoAuxI } \protected\def\GetIdInfoAuxI$#1$#2% - { + {% \def\tempa{#1}% \def\tempb{Id}% \ifx\tempa\tempb \def\tempa {% \endgroup - \def\ExplFileDate{9999/99/99}% + \def\ExplFileDate{9999/12/31}% \def\ExplFileDescription{#2}% \def\ExplFileName{[unknown name]}% \def\ExplFileExtension{[unknown extension]}% @@ -69,33 +69,41 @@ \def\tempa {% \endgroup - \GetIdInfoAuxII$#1${#2}% + \def\ExplFileDescription{#2}% + \GetIdInfoAuxII$#1 $% }% \fi \tempa } -\protected\def\GetIdInfoAuxII$#1 #2.#3 #4 #5 #6 #7 #8$#9% +\protected\def\GetIdInfoAuxII$#1 #2.#3 #4 #5 #6$% {% \def\ExplFileName{#2}% \def\ExplFileExtension{#3}% \def\ExplFileVersion{#4}% - \def\ExplFileDescription{#9}% - \GetIdInfoAuxIII#5\relax#3\relax#5\relax#6\relax + \begingroup + \def\tempa{#4}% + \def\tempb{-1}% + \ifx\tempa\tempb + \def\tempa + {% + \endgroup + \def\ExplFileDate{0000/00/00}% + }% + \else + \def\tempa + {% + \endgroup + \GetIdInfoAuxIII$#5$% + }% + \fi + \tempa } -\protected\def\GetIdInfoAuxIII#1#2#3#4#5#6\relax +\protected\def\GetIdInfoAuxIII$#1-#2-#3$% {% - \ifx#5/% - \expandafter\GetIdInfoAuxCVS - \else - \expandafter\GetIdInfoAuxSVN - \fi + \def\ExplFileDate{#1/#2/#3}% } -\protected\def\GetIdInfoAuxCVS#1,v\relax#2\relax#3\relax - {\def\ExplFileDate{#2}} -\protected\def\GetIdInfoAuxSVN#1\relax#2-#3-#4\relax#5Z\relax - {\def\ExplFileDate{#2/#3/#4}} -\GetIdInfo$Id: l3bootstrap.dtx 3110 2011-12-29 14:23:48Z joseph $ - {L3 experimental bootstrap code} +\GetIdInfo$Id: l3bootstrap.dtx 3986 2012-07-15 19:23:51Z joseph $ + {L3 Bootstrap code} \ProvidesPackage{l3bootstrap} [% \ExplFileDate\space v\ExplFileVersion\space @@ -113,6 +121,26 @@ \else \expandafter\@tempa \fi +\begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfstrcmp\endcsname\relax + \let\pdfstrcmp\strcmp +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfstrcmp\endcsname\relax + \PackageError{expl3}{Required primitives not found} + {% + LaTeX3 requires the e-TeX primitives and \string\pdfstrcmp.\MessageBreak + \MessageBreak + These are available in engine versions:\MessageBreak + - pdfTeX 1.30\MessageBreak + - XeTeX 0.9994\MessageBreak + - LuaTeX 0.40\MessageBreak + or later.\MessageBreak + \MessageBreak + Loading of expl3 will abort!% + } + \expandafter\endinput +\fi \protected\edef\ExplSyntaxOff {% \catcode 9 = \the\catcode 9\relax @@ -125,7 +153,7 @@ \catcode 124 = \the\catcode 124\relax \catcode 126 = \the\catcode 126\relax \endlinechar = \the\endlinechar\relax - \chardef\csname\detokenize{l_expl_status_bool}\endcsname = 0 \relax + \chardef\csname\detokenize{l__kernel_expl_bool}\endcsname = 0 \relax } \protected\edef\ExplSyntaxOn { @@ -138,56 +166,9 @@ \catcode 124 = 12 \relax \catcode 126 = 10 \relax \endlinechar = 32 \relax - \chardef\csname\detokenize{l_expl_status_bool}\endcsname = 1 \relax + \chardef\csname\detokenize{l__kernel_expl_bool}\endcsname = 1 \relax } -\expandafter\chardef\csname\detokenize{l_expl_status_bool}\endcsname = 0 \relax -\protected\def\GetIdInfo - { - \begingroup - \catcode 32 = 10 \relax - \GetIdInfoAuxI - } -\protected\def\GetIdInfoAuxI$#1$#2% - { - \def\tempa{#1}% - \def\tempb{Id}% - \ifx\tempa\tempb - \def\tempa - {% - \endgroup - \def\ExplFileDate{9999/99/99}% - \def\ExplFileDescription{#2}% - \def\ExplFileName{[unknown name]}% - \def\ExplFileVersion{999}% - }% - \else - \def\tempa - {% - \endgroup - \GetIdInfoAuxII$#1${#2}% - }% - \fi - \tempa - } -\protected\def\GetIdInfoAuxII$#1 #2.#3 #4 #5 #6 #7 #8$#9% - {% - \def\ExplFileName{#2}% - \def\ExplFileVersion{#4}% - \def\ExplFileDescription{#9}% - \GetIdInfoAuxIII#5\relax#3\relax#5\relax#6\relax - } -\protected\def\GetIdInfoAuxIII#1#2#3#4#5#6\relax - {% - \ifx#5/% - \expandafter\GetIdInfoAuxCVS - \else - \expandafter\GetIdInfoAuxSVN - \fi - } -\protected\def\GetIdInfoAuxCVS#1,v\relax#2\relax#3\relax - {\def\ExplFileDate{#2}} -\protected\def\GetIdInfoAuxSVN#1\relax#2-#3-#4\relax#5Z\relax - {\def\ExplFileDate{#2/#3/#4}} +\expandafter\chardef\csname\detokenize{l__kernel_expl_bool}\endcsname = 0 \relax \protected\def\ProvidesExplPackage#1#2#3#4% {% \ProvidesPackage{#1}[#2 v#3 #4]% @@ -206,16 +187,16 @@ \edef\@pushfilename {% \edef\expandafter\noexpand - \csname\detokenize{l_expl_status_stack_tl}\endcsname + \csname\detokenize{l__expl_status_stack_tl}\endcsname {% \noexpand\ifodd\expandafter\noexpand - \csname\detokenize{l_expl_status_bool}\endcsname + \csname\detokenize{l__kernel_expl_bool}\endcsname 1% \noexpand\else 0% \noexpand\fi \expandafter\noexpand - \csname\detokenize{l_expl_status_stack_tl}\endcsname + \csname\detokenize{l__expl_status_stack_tl}\endcsname }% \ExplSyntaxOff \unexpanded\expandafter{\@pushfilename}% @@ -224,22 +205,22 @@ {% \unexpanded\expandafter{\@popfilename}% \noexpand\if a\expandafter\noexpand\csname - \detokenize{l_expl_status_stack_tl}\endcsname a% + \detokenize{l__expl_status_stack_tl}\endcsname a% \ExplSyntaxOff \noexpand\else \noexpand\expandafter \expandafter\noexpand\csname - \detokenize{expl_status_pop:w}\endcsname + \detokenize{__expl_status_pop:w}\endcsname \expandafter\noexpand\csname - \detokenize{l_expl_status_stack_tl}\endcsname + \detokenize{l__expl_status_stack_tl}\endcsname \noexpand\@nil \noexpand\fi } -\@namedef{\detokenize{l_expl_status_stack_tl}}{0} -\expandafter\edef\csname\detokenize{expl_status_pop:w}\endcsname#1#2\@nil +\@namedef{\detokenize{l__expl_status_stack_tl}}{0} +\expandafter\edef\csname\detokenize{__expl_status_pop:w}\endcsname#1#2\@nil {% \def\expandafter\noexpand - \csname\detokenize{l_expl_status_stack_tl}\endcsname{#2}% + \csname\detokenize{l__expl_status_stack_tl}\endcsname{#2}% \noexpand\ifodd#1\space \noexpand\expandafter\noexpand\ExplSyntaxOn \noexpand\else @@ -247,7 +228,7 @@ \noexpand\fi } \expandafter\protected\expandafter\def - \csname\detokenize{package_check_loaded_expl:}\endcsname + \csname\detokenize{__expl_package_check:}\endcsname {% \@ifpackageloaded{expl3} {} @@ -256,30 +237,10 @@ {Cannot load the expl3 modules separately} {% The expl3 modules cannot be loaded separately;\MessageBreak - please \string\usepackage\string{expl3\string} instead. + please \string\usepackage\string{expl3\string} instead.% }% }% } -\begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdfstrcmp\endcsname\relax - \let\pdfstrcmp\strcmp -\fi -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfstrcmp\endcsname\relax - \PackageError{l3names}{Required primitive not found: \protect\pdfstrcmp} - {% - LaTeX3 requires the e-TeX primitives and - \string\pdfstrcmp.\MessageBreak - These are available in engine versions: \MessageBreak - - pdfTeX 1.30 \MessageBreak - - XeTeX 0.9994 \MessageBreak - - LuaTeX 0.60 \MessageBreak - or later. \MessageBreak - \MessageBreak - Loading of expl3 will abort! - } - \expandafter\endinput -\fi \protected\edef\ExplSyntaxNamesOn {% \expandafter\noexpand |