summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/expl3/l3names.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/expl3/l3names.dtx')
-rw-r--r--Master/texmf-dist/source/latex/expl3/l3names.dtx24
1 files changed, 14 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/expl3/l3names.dtx b/Master/texmf-dist/source/latex/expl3/l3names.dtx
index 6c0ceea0129..6a36bf148cc 100644
--- a/Master/texmf-dist/source/latex/expl3/l3names.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3names.dtx
@@ -103,7 +103,7 @@
\RequirePackage{l3names}
%</driver>
%\fi
-\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}
%\iffalse
%<package>\endgroup
@@ -333,7 +333,7 @@
% check for that too.
% \begin{macrocode}
\begingroup\expandafter\expandafter\expandafter\endgroup
- \ifx\csname pdfstrcmp\endcsname\relax
+ \expandafter\ifx\csname pdfstrcmp\endcsname\relax
\let\pdfstrcmp\strcmp
\fi
% \end{macrocode}
@@ -346,9 +346,9 @@
% \cs{pdfstrcmp}.
% \begin{macrocode}
\begingroup\expandafter\expandafter\expandafter\endgroup
-\ifx\csname pdfstrcmp\endcsname\relax
+\expandafter\ifx\csname pdfstrcmp\endcsname\relax
%<*package>
- \PackageError{l3names}{Required primitives not found}
+ \PackageError{l3names}{Required primitive not found: \protect\pdfstrcmp}
{%
LaTeX3 requires the e-TeX primitives and
\string\pdfstrcmp.\MessageBreak
@@ -1024,13 +1024,17 @@
% \end{macrocode}
%
% XeTeX adds \cs{strcmp} to the set of primitives, with the same
-% implementation as \cs{pdfstrcmp} but a different name. To avoid
+% implementation as \cs{pdfstrcmp} but a different name. To avoid
% having to worry about this later, the same internal name is used.
+% Note that we want to use the original primitive name here so that
+% |\name_undefine:N| (if used) will remove it.
% \begin{macrocode}
-\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
% \end{macrocode}
%
@@ -1238,7 +1242,7 @@
% as the packages in this distribution do like this:
% \begin{verbatim}
% \RequirePackage{l3names}
-% \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 Box module}
% \ProvidesExplPackage
% {\filename}{\filedate}{\fileversion}{\filedescription}