summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-07 23:33:27 +0000
committerKarl Berry <karl@freefriends.org>2011-09-07 23:33:27 +0000
commitf1cddb2ae051713a3d0b9efa1251d8f85d8131fc (patch)
tree47b6a38de15329b2ffd3a196e7d85e7ad1e93032 /Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
parentea06cd2704b8ed1c5278b20798ab9e3811e0ca4e (diff)
l3kernel 2729 (5sep11)
git-svn-id: svn://tug.org/texlive/trunk@23865 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3prop.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3prop.dtx35
1 files changed, 25 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
index 0923121015d..d7409586cac 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3prop.dtx 2665 2011-08-25 22:15:27Z joseph $
+\GetIdInfo$Id: l3prop.dtx 2725 2011-09-05 18:53:03Z bruno $
{L3 Experimental property lists}
%</driver|package>
%<*driver>
@@ -78,6 +78,10 @@
% added to a property list which already contains the \meta{key} then the new
% entry will overwrite the existing one. The \meta{keys} are compared on a
% string basis, using the same method as \cs{str_if_eq:nn}.
+%
+% Property lists are intended for storing key-based information for use within
+% code. This is in contrast to key--value lists, which are a form of
+% \emph{input} parsed by the \pkg{keys} module.
%
% \section{Creating and initialising property lists}
%
@@ -322,7 +326,11 @@
% or absence of a key in a property list. They offer increased readability
% and performance over separate testing and recovery phases.
%
-% \begin{function}[TF]{\prop_get:NnN, \prop_get:cnN}
+% \begin{function}[TF]
+% {
+% \prop_get:NnN, \prop_get:NVN, \prop_get:NoN,
+% \prop_get:cnN, \prop_get:cVN, \prop_get:coN
+% }
% \begin{syntax}
% \cs{prop_get:NnNTF} \meta{property list} \Arg{key}
% ~~\meta{token list variable} \Arg{true code} \Arg{false code}
@@ -352,7 +360,7 @@
%
% \section{Mapping to property lists}
%
-% \begin{function}[EXP]{\prop_map_function:NN, \prop_map_function:cN}
+% \begin{function}[rEXP]{\prop_map_function:NN, \prop_map_function:cN}
% \begin{syntax}
% \cs{prop_map_function:NN} \meta{property list} \meta{function}
% \end{syntax}
@@ -375,7 +383,7 @@
% should not be relied upon.
% \end{function}
%
-% \begin{function}[EXP]{\prop_map_break:}
+% \begin{function}[rEXP]{\prop_map_break:}
% \begin{syntax}
% \cs{prop_map_break:}
% \end{syntax}
@@ -925,7 +933,11 @@
%
% \subsection{Recovering values from property lists with branching}
%
-% \begin{macro}[TF]{\prop_get:NnN, \prop_get:cnN}
+% \begin{macro}[TF]
+% {
+% \prop_get:NnN, \prop_get:NVN, \prop_get:NoN,
+% \prop_get:cnN, \prop_get:cVN, \prop_get:coN
+% }
% \begin{macro}[aux]{\prop_get_aux_true:Nnnn}
% Getting the value corresponding to a key, keeping track of whether
% the key was present or not, is implemented as a conditional (with
@@ -942,9 +954,12 @@
\tl_set:Nn #1 {#3}
\prg_return_true:
}
-\cs_generate_variant:Nn \prop_get:NnNT { c }
-\cs_generate_variant:Nn \prop_get:NnNF { c }
-\cs_generate_variant:Nn \prop_get:NnNTF { c }
+\cs_generate_variant:Nn \prop_get:NnNT { NV , No }
+\cs_generate_variant:Nn \prop_get:NnNF { NV , No }
+\cs_generate_variant:Nn \prop_get:NnNTF { NV , No }
+\cs_generate_variant:Nn \prop_get:NnNT { c , cV , co }
+\cs_generate_variant:Nn \prop_get:NnNF { c , cV , co }
+\cs_generate_variant:Nn \prop_get:NnNTF { c , cV , co }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1040,13 +1055,13 @@
{
\prop_if_empty:NTF #1
{
- \iow_term:x { Property~list~\token_to_str:N #1 \c_space_tl is~empty }
+ \iow_term:x { Property~list~\token_to_str:N #1~is~empty }
\tl_show:n { }
}
{
\iow_term:x
{
- Property~list~\token_to_str:N #1 \c_space_tl
+ Property~list~\token_to_str:N #1~
contains~the~pairs~(without~outer~braces):
}
\tl_set:Nx \l_prop_show_tl