summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/expl3/l3names.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-10-12 00:07:26 +0000
committerKarl Berry <karl@freefriends.org>2010-10-12 00:07:26 +0000
commitbaa7f8e9f03bccf6f383eab72d2945fb6a2e110d (patch)
treee3d8e915a08f103fe169e6bef2c0d62d305cb5d0 /Master/texmf-dist/tex/latex/expl3/l3names.sty
parenta8c915878e3e9b15a28df3a92b0c1ac925d6e28e (diff)
expl3 2072 (10oct10)
git-svn-id: svn://tug.org/texlive/trunk@20059 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3/l3names.sty')
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3names.sty18
1 files changed, 10 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3names.sty b/Master/texmf-dist/tex/latex/expl3/l3names.sty
index d86ea68c3f3..13a2bf23621 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3names.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3names.sty
@@ -87,7 +87,7 @@
\gdef\filedescription{#1}%
\ProvidesPackage{[unknown package]}[0000/00/00 v0.0 #1]
}
-\GetIdInfo$Id: l3names.dtx 2048 2010-09-26 19:13:59Z joseph $
+\GetIdInfo$Id: l3names.dtx 2064 2010-10-03 23:27:33Z will $
{L3 Experimental Naming Scheme for TeX Primitives}
\endgroup
\def\@tempa{%
@@ -102,12 +102,12 @@
\expandafter\@tempa
\fi
\begingroup\expandafter\expandafter\expandafter\endgroup
- \ifx\csname pdfstrcmp\endcsname\relax
+ \expandafter\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}
+\expandafter\ifx\csname pdfstrcmp\endcsname\relax
+ \PackageError{l3names}{Required primitive not found: \protect\pdfstrcmp}
{%
LaTeX3 requires the e-TeX primitives and
\string\pdfstrcmp.\MessageBreak
@@ -657,10 +657,12 @@
\name_primitive:NN \initcatcodetable \luatex_initcatcodetable:D
\name_primitive:NN \latelua \luatex_latelua:D
\name_primitive:NN \savecatcodetable \luatex_savecatcodetable:D
-\etex_ifdefined:D \strcmp
- \etex_ifdefined:D \xetex_version:D
- \name_primitive:NN \strcmp \pdf_strcmp:D
- \tex_fi:D
+\tex_begingroup:D
+ \tex_expandafter:D \tex_expandafter:D \tex_expandafter:D
+\tex_endgroup:D
+\tex_expandafter:D \tex_ifx:D \tex_csname:D xetex_version:D\tex_endcsname:D
+ \tex_relax:D \tex_else:D
+ \name_primitive:NN \strcmp \pdf_strcmp:D
\tex_fi:D
\etex_protected:D \tex_def:D \ExplSyntaxOn {
\tex_ifodd:D \ExplSyntaxStatus \tex_relax:D