summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/expl3/l3basics.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/expl3/l3basics.dtx')
-rw-r--r--Master/texmf-dist/source/latex/expl3/l3basics.dtx52
1 files changed, 31 insertions, 21 deletions
diff --git a/Master/texmf-dist/source/latex/expl3/l3basics.dtx b/Master/texmf-dist/source/latex/expl3/l3basics.dtx
index 4181fad3182..e34e42f2732 100644
--- a/Master/texmf-dist/source/latex/expl3/l3basics.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3basics.dtx
@@ -31,29 +31,26 @@
%% prior consultation with the LaTeX Project Team.
%%
%% -----------------------------------------------------------------------
-%<package>\RequirePackage{l3names}
-%<*dtx>
+%<*driver|package>
+\RequirePackage{l3names}
+%</driver|package>
%\fi
-\def\GetIdInfo$Id: #1.dtx #2 #3-#4-#5 #6 #7$#8{%
- \def\fileversion{#2}%
- \def\filedate{#3/#4/#5}%
- \ProvidesFile{#1.dtx}[#3/#4/#5 v#2 #8]%
-}
-%\iffalse
-%</dtx>
-%\fi
-\GetIdInfo$Id: l3basics.dtx 583 2006-12-12 17:26:44Z morten $
+\GetIdInfo$Id: l3basics.dtx 702 2007-11-27 14:21:49Z morten $
{L3 Experimental basic definitions}
-% \iffalse
+%\iffalse
%<*driver>
+%\fi
+\ProvidesFile{\filename.\filenameext}
+ [\filedate\space v\fileversion\space\filedescription]
+%\iffalse
\documentclass{l3doc}
-
\begin{document}
-\DocInput{l3basics.dtx}
+\DocInput{\filename.\filenameext}
\end{document}
%</driver>
% \fi
%
+%
% \title{The \textsf{l3basics} package\thanks{This file
% has version number \fileversion, last
% revised \filedate.}\\
@@ -429,14 +426,18 @@
% \begin{function}{%
% \use_arg_i_after_fi:nw |
% \use_arg_i_after_else:nw |
-% \use_arg_i_after_or:nw
+% \use_arg_i_after_or:nw |
+% \use_arg_i_after_orelse:nw
% }
% \begin{syntax}
% "\use_arg_i_after_fi:nw" "{"<arg>"}" "\fi:"
% "\use_arg_i_after_else:nw" "{"<arg>"}" "\else:" <balanced text> "\fi:"
% "\use_arg_i_after_or:nw" "{"<arg>"}" "\or:" <balanced text> "\fi:"
+% "\use_arg_i_after_orelse:nw" "{"<arg>"}" "\or:/\else:" <balanced text> "\fi:"
% \end{syntax}
-% Executes <arg> after executing closing out "\fi:".
+% Executes <arg> after executing closing out
+% "\fi:". "\use_arg_i_after_orelse:nw" can be used anywhere where
+% "\use_arg_i_after_else:nw" or "\use_arg_i_after_or:nw" are used.
% \end{function}
%
% \subsection{Internal functions}
@@ -1089,9 +1090,9 @@
%
% \subsection{Engine specific definitions}
%
-% \begin{function}{\engine_aleph:TF}
+% \begin{function}{\engine_if_aleph:TF}
% \begin{syntax}
-% "\engine_aleph:TF" "{"<true code>"}" "{"<false code>"}"
+% "\engine_if_aleph:TF" "{"<true code>"}" "{"<false code>"}"
% \end{syntax}
% This function detects if we're running an Aleph based format. This
% is particularly useful when allocating registers.
@@ -1119,6 +1120,8 @@
% in terms of csname usage, an alternative scheme would be to just use
% the ``tex\ldots D'' name in the cases where no good alternative exists.}
% \begin{macrocode}
+%<package>\ProvidesExplPackage
+%<package> {\filename}{\filedate}{\fileversion}{\filedescription}
%<*initex|package>
\tex_let:D \let:NwN \tex_let:D
% \end{macrocode}
@@ -2264,6 +2267,8 @@
\def_long_new:Npn \def_test_function_aux:Nnnn #1#2#3#4{
#1 {#2TF} #3 {#4
\exp_after:NN\use_arg_i:nn\else:\exp_after:NN\use_arg_ii:nn\fi:}
+ #1 {#2FT} #3 {#4
+ \exp_after:NN\use_arg_ii:nn\else:\exp_after:NN\use_arg_i:nn\fi:}
#1 {#2T} #3 {#4
\else:\exp_after:NN\use_none:nn\fi:\use_arg_i:n}
#1 {#2F} #3 {#4
@@ -2271,6 +2276,8 @@
\def_long_new:Npn \def_test_function_aux:Nnnx #1#2#3#4{
#1 {#2TF} #3 {#4
\exp_not:n{\exp_after:NN\use_arg_i:nn\else:\exp_after:NN\use_arg_ii:nn\fi:}}
+ #1 {#2FT} #3 {#4
+ \exp_not:n{\exp_after:NN\use_arg_ii:nn\else:\exp_after:NN\use_arg_i:nn\fi:}}
#1 {#2T} #3 {#4
\exp_not:n{\else:\exp_after:NN\use_none:nn\fi:\use_arg_i:n}}
#1 {#2F} #3 {#4
@@ -2414,10 +2421,10 @@
%
% \subsubsection{Engine specific definitions}
%
-% \begin{macro}{\engine_aleph:TF}
+% \begin{macro}{\engine_if_aleph:TF}
% In some cases it will be useful to know which engine we're running.
% \begin{macrocode}
-\def_test_function_new:npn {engine_aleph:}{\if_cs_exist:N \aleph_textdir:D}
+\def_test_function_new:npn {engine_if_aleph:}{\if_cs_exist:N \aleph_textdir:D}
% \end{macrocode}
% \end{macro}
%
@@ -2529,15 +2536,18 @@
% \begin{macro}{\use_arg_i_after_fi:nw}
% \begin{macro}{\use_arg_i_after_else:nw}
% \begin{macro}{\use_arg_i_after_or:nw}
+% \begin{macro}{\use_arg_i_after_or:nw}
% Returns the first argument after ending the conditional.
% \begin{macrocode}
\def_long_new:Npn \use_arg_i_after_fi:nw #1\fi:{\fi: #1}
\def_long_new:Npn \use_arg_i_after_else:nw #1\else:#2\fi:{\fi: #1}
-\def_long_new:Npn \use_arg_i_after_or:nw #1\or: #2\fi: {\or:\fi:#1}
+\def_long_new:Npn \use_arg_i_after_or:nw #1\or: #2\fi: {\fi:#1}
+\def_long_new:Npn \use_arg_i_after_orelse:nw #1 #2#3\fi: {\fi:#1}
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \subsubsection{Gobbling tokens from input}
%