diff options
author | Karl Berry <karl@freefriends.org> | 2010-10-12 00:07:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-10-12 00:07:26 +0000 |
commit | baa7f8e9f03bccf6f383eab72d2945fb6a2e110d (patch) | |
tree | e3d8e915a08f103fe169e6bef2c0d62d305cb5d0 /Master/texmf-dist/source/latex/expl3/l3names.dtx | |
parent | a8c915878e3e9b15a28df3a92b0c1ac925d6e28e (diff) |
expl3 2072 (10oct10)
git-svn-id: svn://tug.org/texlive/trunk@20059 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/expl3/l3names.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/expl3/l3names.dtx | 24 |
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} |