diff options
author | Karl Berry <karl@freefriends.org> | 2014-08-26 17:33:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-08-26 17:33:09 +0000 |
commit | 6c4cd2ab2f8d1ebe3a051d700c3005d73eefe04c (patch) | |
tree | 16833d474c6532347c42dee6b34fa77aed22eca6 /Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx | |
parent | 097e7dc0afa442be238a967b292237470680626e (diff) |
l3 (26aug14)
git-svn-id: svn://tug.org/texlive/trunk@35045 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx index 4ff6c7dd5cf..38c88835fab 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx @@ -44,12 +44,12 @@ % keyword together! % % At this stage, no test has taken place for the \eTeX{} extensions, and -% so using \cs{protected} could give an error. To avoid that, it is used +% so using \tn{protected} could give an error. To avoid that, it is used % by csname: if it's not available, the bootstrap code will bail out at % the point of testing for the necessary primitives, while if it is available % then \cs{GetIdInfo} and so on will be properly protected. All of this is -% then done in a group to avoid leaving \cs{protected} about as equivalent -% to \cs{relax} if the extensions are unavailable. +% then done in a group to avoid leaving \tn{protected} about as equivalent +% to \tn{relax} if the extensions are unavailable. % \begin{macrocode} \begingroup \csname protected\endcsname\gdef\GetIdInfo @@ -78,7 +78,7 @@ \def\ExplFileDescription{#2}% \def\ExplFileName{[unknown name]}% \def\ExplFileExtension{[unknown extension]}% - \def\ExplFileDate{-1}% + \def\ExplFileVersion{-1}% }% \else \def\tempa @@ -145,7 +145,7 @@ % \end{macro} % \end{macro} % \end{macro} -\GetIdInfo$Id: l3bootstrap.dtx 4889 2014-05-26 19:59:25Z joseph $ +\GetIdInfo$Id: l3bootstrap.dtx 5354 2014-08-23 01:35:39Z bruno $ {L3 Bootstrap code} %</driver|package> %<*driver> @@ -205,9 +205,10 @@ % |\RequirePackage{expl3}| \\ % \cs{ProvidesExplPackage} \Arg{package} \Arg{date} \Arg{version} \Arg{description} % \end{syntax} -% These functions act broadly in the same way as the \LaTeXe{} kernel -% functions \cs{ProvidesPackage}, \cs{ProvidesClass} and -% \cs{ProvidesFile}. However, they also implicitly switch +% These functions act broadly in the same way as the corresponding +% \LaTeXe{} kernel +% functions \tn{ProvidesPackage}, \tn{ProvidesClass} and +% \tn{ProvidesFile}. However, they also implicitly switch % \cs{ExplSyntaxOn} for the remainder of the code with the file. At the % end of the file, \cs{ExplSyntaxOff} will be called to reverse this. % (This is the same concept as \LaTeXe{} provides in turning on @@ -294,7 +295,7 @@ %</initex> % \end{macrocode} % -% \subsection{The \cs{pdfstrcmp} primitive with \XeTeX{} and \LuaTeX{}} +% \subsection{The \tn{pdfstrcmp} primitive with \XeTeX{} and \LuaTeX{}} % % Only \pdfTeX{} has a primitive called \tn{pdfstrcmp}. The \XeTeX{} % version is just \tn{strcmp}, so there is some shuffling to do. As @@ -306,7 +307,7 @@ \fi % \end{macrocode} % -% If \LuaTeX{} is in use then no primitive \cs{(pdf)strcmp} is available. +% If \LuaTeX{} is in use then no primitive \tn{pdfstrcmp} is available. % However, it can be emulated using some Lua code. In earlier versions of % the code, the \pkg{pdftexcmds} package was loaded to do this task. However, % that raises some issues in \enquote{generic} (it fails with Con\TeX{}t @@ -367,7 +368,7 @@ % \subsection{Engine requirements} % % The code currently requires functionality equivalent to \tn{pdfstrcmp} -% in addition to \eTeX{}. This is picked up by testing for the \cs{pdfstrcmp} +% in addition to \eTeX{}. This is picked up by testing for the \tn{pdfstrcmp} % primitive or a version of \LuaTeX{} capable of emulating it. % \begin{macrocode} \begingroup @@ -388,11 +389,11 @@ \expandafter\ifx\csname directlua\endcsname\relax \else \ifnum\luatexversion<36 % + \newlinechar`\^^J\relax %<*initex> \def\LineBreak{^^J}% \edef\next {% - \newlinechar`\noexpand\^^J\relax \errhelp {% \LongText @@ -410,13 +411,11 @@ \def\LineBreak{\noexpand\MessageBreak}% \expandafter\ifx\csname PackageError\endcsname\relax \def\LineBreak{^^J}% - \begingroup - \def\PackageError#1#2#3% - {% - \endgroup - \errhelp{#3}% - \errmessage{#1 Error: #2!} - }% + \def\PackageError#1#2#3% + {% + \errhelp{#3}% + \errmessage{#1 Error: #2!} + }% \fi \edef\next {% @@ -440,19 +439,19 @@ % been around since 1997 in the \pkg{etex} package. % % Loading this support is delayed until here as we are now sure that the -% \eTeX{} extensions and \cs{pdfstrcmp} or equivalent are available. Thus +% \eTeX{} extensions and \tn{pdfstrcmp} or equivalent are available. Thus % there is no danger of an \enquote{uncontrolled} error if the engine % requirements are not met. % % For \LaTeX{} only, load \pkg{etex} as otherwise we are likely to get into % trouble with registers. Some inserts are reserved also as these have to -% be from the standard pool. Note that \cs{reserveinserts} is \cs{outer} +% be from the standard pool. Note that \tn{reserveinserts} is \tn{outer} % and so is accessed here by csname. In earlier versions, loading \pkg{etex} -% was done directly and so \cs{reserveinserts} appeared in the code: this -% then required a \cs{relax} after \cs{RequirePackage} to prevent an error +% was done directly and so \tn{reserveinserts} appeared in the code: this +% then required a \tn{relax} after \tn{RequirePackage} to prevent an error % with \enquote{unsafe} definitions as seen for example with \pkg{capoptions}. -% The optional loading here is done using a group and \cs{ifx} test as we -% are not quite in the position to have a single name for \cs{pdfstrcmp} just +% The optional loading here is done using a group and \tn{ifx} test as we +% are not quite in the position to have a single name for \tn{pdfstrcmp} just % yet. % \begin{macrocode} %<*package> |