summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3basics.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3basics.dtx39
1 files changed, 32 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
index 733beefe452..98fe66d8b35 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3basics.dtx Copyright (C) 1990-2012 The LaTeX3 project
+%% File: l3basics.dtx Copyright (C) 1990-2013 The LaTeX3 project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3basics.dtx 4339 2012-11-24 19:16:43Z joseph $
+\GetIdInfo$Id: l3basics.dtx 4428 2013-01-10 13:23:29Z bruno $
{L3 Basic definitions}
%</driver|package>
%<*driver>
@@ -183,8 +183,28 @@
% \cs{par} tokens but the function will not expand within an
% \texttt{x}-type expansion.
% \end{description}
+%
+% Finally, the functions in
+% Subsections~\ref{sec:defining-new-function-1}~and
+% \ref{sec:defining-new-function-2} are primarily meant to define
+% \emph{base functions} only. Base functions can only have the following
+% argument specifiers:
+% \begin{description}
+% \item[|N| and |n|] No manipulation.
+% \item[|T| and |F|] Functionally equivalent to |n| (you are actually
+% encouraged to use the family of |\prg_new_conditional:| functions
+% described in Section~\ref{sec:new-conditional-functions}).
+% \item[|p| and |w|] These are special cases.
+% \end{description}
+%
+% The |\cs_new:| functions below (and friends) do not stop you from using
+% other argument specifiers in your function names, but they do not handle
+% expansion for you. You should define the base function and then use
+% \cs{cs_generate_variant:Nn} to generate custom variants as described in
+% Section~\ref{sec:defining-variants}.
%
% \subsection{Defining new functions using parameter text}
+% \label{sec:defining-new-function-1}
%
% \begin{function}{\cs_new:Npn, \cs_new:cpn, \cs_new:Npx, \cs_new:cpx}
% \begin{syntax}
@@ -373,6 +393,7 @@
% \end{function}
%
% \subsection{Defining new functions using the signature}
+% \label{sec:defining-new-function-2}
%
% \begin{function}
% {
@@ -777,7 +798,7 @@
%
% \begin{function}[EXP]{\cs_to_str:N}
% \begin{syntax}
-% \cs{cs_to_str:N} \Arg{control sequence}
+% \cs{cs_to_str:N} \meta{control sequence}
% \end{syntax}
% Converts the given \meta{control sequence} into a series of
% characters with category code $12$ (other), except spaces,
@@ -1131,7 +1152,7 @@
% ~~|}| \\
% ~~\Arg{else code}
% \end{syntax}
-% This function comapres the full expansion of the \meta{test string}
+% This function compares the full expansion of the \meta{test string}
% in turn with the full expansion of the \meta{string cases}. If the two
% full expansions are equal (as described for \cs{str_if_eq:nnTF} then the
% associated \meta{code} is left in the input stream. If none of the tests
@@ -1145,7 +1166,7 @@
%
% \begin{function}[updated = 2011-09-06,EXP,pTF]{\luatex_if_engine:}
% \begin{syntax}
-% \cs{luatex_if_luatex:TF} \Arg{true code} \Arg{false code}
+% \cs{luatex_if_engine:TF} \Arg{true code} \Arg{false code}
% \end{syntax}
% Detects is the document is being compiled using \LuaTeX{}.
% \end{function}
@@ -2608,7 +2629,7 @@
% \TeX{} conditionals in case |#1| is unbalanced in this matter.
% \begin{macrocode}
\cs_new_protected:Npn \cs_undefine:N #1
- { \cs_gset_eq:NN #1 \c_undefined:D }
+ { \cs_gset_eq:NN #1 \tex_undefined:D }
\cs_new_protected:Npn \cs_undefine:c #1
{
\if_cs_exist:w #1 \cs_end:
@@ -2616,7 +2637,7 @@
\else:
\exp_after:wN \use_none:n
\fi:
- { \cs_gset_eq:cN {#1} \c_undefined:D }
+ { \cs_gset_eq:cN {#1} \tex_undefined:D }
}
% \end{macrocode}
% \end{macro}
@@ -3226,16 +3247,20 @@
% \begin{macro}[pTF, EXP]{\str_if_eq:xx}
% Not really true \texttt{x}-type expansion
% \begin{macrocode}
+%<*deprecated>
\cs_new_eq:NN \str_if_eq_p:xx \str_if_eq_x_p:nn
\cs_new_eq:NN \str_if_eq:xxT \str_if_eq_x:nnT
\cs_new_eq:NN \str_if_eq:xxF \str_if_eq_x:nnF
\cs_new_eq:NN \str_if_eq:xxTF \str_if_eq_x:nnTF
+%</deprecated>
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\chk_if_free_cs:N}
% \begin{macrocode}
+%<*deprecated>
\cs_new_eq:NN \chk_if_free_cs:N \__chk_if_free_cs:N
+%</deprecated>
% \end{macrocode}
% \end{macro}
%