expl3 2047 (26sep10)

git-svn-id: svn://tug.org/texlive/trunk@19904 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 31 insertions, 27 deletions

diff --git a/Master/texmf-dist/tex/latex/expl3/l3names.sty b/Master/texmf-dist/tex/latex/expl3/l3names.sty
index dce13baccdb..e3fbe730eae 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3names.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3names.sty
@@ -15,7 +15,7 @@
 %% Do not distribute a modified version of this file.
 %% 
 %% 
-%% File: l3names.dtx Copyright (C) 1990-2006,2009 LaTeX3 project
+%% File: l3names.dtx Copyright (C) 1990-2006,2009-2010 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
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \begingroup
-\protected\def\GetIdInfo$#1${%
+\def\GetIdInfo$#1${%
   \begingroup
     \def\GetIdInfoString{#1}%
     \def\IdInfoStringUnexp{Id}%
@@ -59,53 +59,37 @@
     \fi
     \next
 }
-\protected\def\GetIdInfoFull$#1 #2.#3 #4 #5 #6 #7${%
+\def\GetIdInfoFull$#1 #2.#3 #4 #5 #6 #7${%
   \GetIdInfoAux #5\relax{#2}#5\relax{#4}%
 }
-\protected\def\GetIdInfoAux #1#2#3#4#5#6\relax{%
+\def\GetIdInfoAux #1#2#3#4#5#6\relax{%
   \ifx#5/%
     \expandafter\GetIdInfoAuxCVS
   \else
     \expandafter\GetIdInfoAuxSVN
   \fi
 }
-\protected\def\GetIdInfoAuxCVS #1#2\relax#3#4{%
+\def\GetIdInfoAuxCVS #1#2\relax#3#4{%
   \gdef\fileversion{#3}%
   \gdef\filedate{#2}%
   \gdef\filedescription{#4}%
   \ProvidesPackage{#1}[#2 v#3 #4]%
 }
-\protected\def\GetIdInfoAuxSVN #1#2-#3-#4\relax#5#6{%
+\def\GetIdInfoAuxSVN #1#2-#3-#4\relax#5#6{%
   \gdef\fileversion{#5}%
   \gdef\filedate{#2/#3/#4}%
   \gdef\filedescription{#6}%
   \ProvidesPackage{#1}[#2/#3/#4 v#5 #6]
 }
-\protected\def\GetIdInfoMissing#1{%
+\def\GetIdInfoMissing#1{%
   \gdef\fileversion{000}%
   \gdef\filedate{0000/00/00}%
   \gdef\filedescription{#1}%
   \ProvidesPackage{[unknown package]}[0000/00/00 v0.0 #1]
 }
-\GetIdInfo$Id: l3names.dtx 1987 2010-07-25 14:55:46Z joseph $
+\GetIdInfo$Id: l3names.dtx 2034 2010-09-20 20:17:43Z joseph $
      {L3 Experimental Naming Scheme for TeX Primitives}
 \endgroup
-\begingroup
-\def\firstoftwo#1#2{#1}
-\def\secondoftwo#1#2{#2}
-\def\etexmissingerror{Not running under e-TeX}
-\def\etexmissinghelp{%
-  This package requires e-TeX.^^J%
-  Try compiling the document with `elatex' instead of `latex'.^^J%
-  When using pdfTeX, try `pdfelatex' instead of `pdflatex'%
-}%
-\expandafter\ifx\csname eTeXversion\endcsname\relax
-  \expandafter\secondoftwo\else\expandafter\firstoftwo\fi
-    {\endgroup}{%
-      \PackageError{l3names}{\etexmissingerror}{\etexmissinghelp}%
-      \endgroup
-      \endinput
-    }
 \def\@tempa{%
   \def\@tempa{}%
   \RequirePackage{luatex}%
@@ -117,6 +101,26 @@
 \else
   \expandafter\@tempa
 \fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+  \ifx\csname pdfstrcmp\endcsname\relax
+  \let\pdfstrcmp\strcmp
+\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\ifx\csname pdfstrcmp\endcsname\relax
+  \PackageError{l3names}{Required primitives not found}
+    {%
+      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 l3names will abort!
+    }
+  \expandafter\endinput
+\fi
 \protected\edef\ExplSyntaxOff{
   \unexpanded{\ifodd \ExplSyntaxStatus\relax
   \def\ExplSyntaxStatus{0}
@@ -685,7 +689,7 @@
     \tex_endlinechar:D =32 \tex_relax:D % endline is space
     \tex_catcode:D   95=11 \tex_relax:D % underscore letter
     \tex_catcode:D   58=11 \tex_relax:D % colon letter
-    \tex_catcode:D  124=11 \tex_relax:D % vertical bar, other
+    \tex_catcode:D  124=12 \tex_relax:D % vertical bar, other
     \tex_catcode:D   38=4  \tex_relax:D % ampersand, alignment token
     \tex_catcode:D   94=7  \tex_relax:D % caret, math superscript
     \tex_catcode:D   34=12 \tex_relax:D % doublequote, other
@@ -776,11 +780,11 @@
     \tex_if:D 2\ExplSyntaxStack 2
       \ExplSyntaxOff
     \tex_else:D
-      \tex_expandafter:D\ExplSyntaxPopStack\ExplSyntaxStack\q_nil
+      \tex_expandafter:D\ExplSyntaxPopStack\ExplSyntaxStack\q_stop
     \tex_fi:D
   }
 }
-\etex_protected:D\tex_def:D\ExplSyntaxPopStack#1#2\q_nil{
+\etex_protected:D\tex_def:D\ExplSyntaxPopStack#1#2\q_stop{
   \tex_def:D\ExplSyntaxStack{#2}
   \tex_ifodd:D#1\tex_relax:D
     \ExplSyntaxOn