summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-07 22:42:14 +0000
committerKarl Berry <karl@freefriends.org>2012-02-07 22:42:14 +0000
commit8b88d8570ac83e33a29938f8799ab728a94a6b70 (patch)
tree2389ca3bc088a4fe26c26bd2c0b01fa2d1b87600 /Master/texmf-dist/source/latex
parent7dd80542eb368ed18c1298c24250b409350a2059 (diff)
l3kernel 3331 (7feb12)
git-svn-id: svn://tug.org/texlive/trunk@25329 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/expl3.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3.ins71
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3basics.dtx199
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3format.ins77
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3int.dtx8
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3msg.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3prg.dtx242
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3skip.dtx32
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3tl.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3token.dtx4
11 files changed, 360 insertions, 289 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
index c8f4fedeb38..dbd073eaa21 100644
--- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
@@ -48,8 +48,8 @@
%<package> }
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 Experimental code bundle wrapper}
-\def\ExplFileDate{2012/01/31}
-\def\ExplFileVersion{3287}
+\def\ExplFileDate{2012/02/07}
+\def\ExplFileVersion{3331}
%</driver|package>
%<*driver>
\documentclass[full]{l3doc}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3.ins b/Master/texmf-dist/source/latex/l3kernel/l3.ins
new file mode 100644
index 00000000000..b4048d009e5
--- /dev/null
+++ b/Master/texmf-dist/source/latex/l3kernel/l3.ins
@@ -0,0 +1,71 @@
+\iffalse meta-comment
+
+File l3.ins Copyright (C) 2011 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
+license or (at your option) any later version. The latest version
+of this license is in the file
+
+ http://www.latex-project.org/lppl.txt
+
+This file is part of the "l3kernel bundle" (The Work in LPPL)
+and all files in that bundle must be distributed together.
+
+The released version of this bundle is available from CTAN.
+
+\fi
+
+\input docstrip.tex
+\askforoverwritefalse
+
+\preamble
+
+EXPERIMENTAL CODE
+
+Do not distribute this file without also distributing the
+source files specified above.
+
+Do not distribute a modified version of this file.
+
+\endpreamble
+% stop docstrip adding \endinput
+\postamble
+\endpostamble
+
+\keepsilent
+
+% ===== PACKAGE ONLY ======
+\generate{\file{expl3.sty} {\from{expl3.dtx} {package}}}
+% ========================
+\generate{\file{l3bootstrap.sty}{\from{l3bootstrap.dtx}{package}}}
+\generate{\file{l3names.sty} {\from{l3names.dtx} {package}}}
+\generate{\file{l3basics.sty} {\from{l3basics.dtx} {package}}}
+\generate{\file{l3expan.sty} {\from{l3expan.dtx} {package}}}
+\generate{\file{l3tl.sty} {\from{l3tl.dtx} {package}}}
+\generate{\file{l3seq.sty} {\from{l3seq.dtx} {package}}}
+\generate{\file{l3int.sty} {\from{l3int.dtx} {package}}}
+\generate{\file{l3quark.sty} {\from{l3quark.dtx} {package}}}
+\generate{\file{l3prg.sty} {\from{l3prg.dtx} {package}}}
+\generate{\file{l3clist.sty} {\from{l3clist.dtx} {package}}}
+\generate{\file{l3token.sty} {\from{l3token.dtx} {package}}}
+\generate{\file{l3prop.sty} {\from{l3prop.dtx} {package}}}
+\generate{\file{l3msg.sty} {\from{l3msg.dtx} {package}}}
+\generate{\file{l3io.sty} {\from{l3io.dtx} {package}}}
+\generate{\file{l3file.sty} {\from{l3file.dtx} {package}}}
+\generate{\file{l3skip.sty} {\from{l3skip.dtx} {package}}}
+\generate{\file{l3keys.sty} {\from{l3keys.dtx} {package}}}
+\generate{\file{l3fp.sty} {\from{l3fp.dtx} {package}}}
+\generate{\file{l3box.sty} {\from{l3box.dtx} {package}}}
+\generate{\file{l3coffins.sty} {\from{l3coffins.dtx} {package}}}
+\generate{\file{l3color.sty} {\from{l3color.dtx} {package}}}
+\generate{\file{l3luatex.sty} {\from{l3luatex.dtx} {package}}}
+
+\generate{\file{l3doc.cls} {\from{l3doc.dtx} {class}}}
+\generate{\file{l3doc.ist} {\from{l3doc.dtx} {docist}}}
+
+\generate{\file{l3dvips.def} {\from{l3drivers.dtx}{package,dvips} }}
+\generate{\file{l3pdfmode.def} {\from{l3drivers.dtx}{package,pdfmode} }}
+\generate{\file{l3xdvipdfmx.def}{\from{l3drivers.dtx}{package,xdvipdfmx}}}
+
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
index 9a2b94c4a3e..d16781461b0 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3basics.dtx 3196 2012-01-15 09:44:05Z joseph $
+\GetIdInfo$Id: l3basics.dtx 3317 2012-02-06 12:26:40Z bruno $
{L3 Experimental basic definitions}
%</driver|package>
%<*driver>
@@ -253,7 +253,7 @@
% Sets \meta{function} to expand to \meta{code} as replacement text.
% Within the \meta{code}, the \meta{parameters} (|#1|, |#2|,
% \emph{etc.}) will be replaced by those absorbed by the function.
-% The assignment of a meaning to \meta{function} is restricted to
+% The assignment of a meaning to the \meta{function} is restricted to
% the current \TeX{} group level.
% \end{function}
%
@@ -270,7 +270,7 @@
% \emph{etc.}) will be replaced by those absorbed by the function.
% When the \meta{function} is used the \meta{parameters} absorbed
% cannot contain \cs{par} tokens. The assignment of a meaning
-% to \meta{function} is restricted to the current \TeX{} group
+% to the \meta{function} is restricted to the current \TeX{} group
% level.
% \end{function}
%
@@ -285,7 +285,7 @@
% Sets \meta{function} to expand to \meta{code} as replacement text.
% Within the \meta{code}, the \meta{parameters} (|#1|, |#2|,
% \emph{etc.}) will be replaced by those absorbed by the function.
-% The assignment of a meaning to \meta{function} is restricted to
+% The assignment of a meaning to the \meta{function} is restricted to
% the current \TeX{} group level. The \meta{function} will
% not expand within an \texttt{x}-type argument.
% \end{function}
@@ -303,7 +303,7 @@
% \emph{etc.}) will be replaced by those absorbed by the function.
% When the \meta{function} is used the \meta{parameters} absorbed
% cannot contain \cs{par} tokens. The assignment of a meaning
-% to \meta{function} is restricted to the current \TeX{} group
+% to the \meta{function} is restricted to the current \TeX{} group
% level. The \meta{function} will not expand within an
% \texttt{x}-type argument.
% \end{function}
@@ -315,7 +315,7 @@
% Globally sets \meta{function} to expand to \meta{code} as replacement
% text. Within the \meta{code}, the \meta{parameters} (|#1|, |#2|,
% \emph{etc.}) will be replaced by those absorbed by the function.
-% The assignment of a meaning to \meta{function} is \emph{not}
+% The assignment of a meaning to the \meta{function} is \emph{not}
% restricted to the current \TeX{} group level: the assignment is
% global.
% \end{function}
@@ -332,7 +332,7 @@
% text. Within the \meta{code}, the \meta{parameters} (|#1|, |#2|,
% \emph{etc.}) will be replaced by those absorbed by the function.
% When the \meta{function} is used the \meta{parameters} absorbed
-% cannot contain \cs{par} tokens. The assignment of a meaning to
+% cannot contain \cs{par} tokens. The assignment of a meaning to the
% \meta{function} is \emph{not} restricted to the current \TeX{}
% group level: the assignment is global.
% \end{function}
@@ -348,7 +348,7 @@
% Globally sets \meta{function} to expand to \meta{code} as replacement
% text. Within the \meta{code}, the \meta{parameters} (|#1|, |#2|,
% \emph{etc.}) will be replaced by those absorbed by the function.
-% The assignment of a meaning to \meta{function} is \emph{not}
+% The assignment of a meaning to the \meta{function} is \emph{not}
% restricted to the current \TeX{} group level: the assignment is
% global. The \meta{function} will not expand within an
% \texttt{x}-type argument.
@@ -366,7 +366,7 @@
% text. Within the \meta{code}, the \meta{parameters} (|#1|, |#2|,
% \emph{etc.}) will be replaced by those absorbed by the function.
% When the \meta{function} is used the \meta{parameters} absorbed
-% cannot contain \cs{par} tokens. The assignment of a meaning to
+% cannot contain \cs{par} tokens. The assignment of a meaning to the
% \meta{function} is \emph{not} restricted to the current \TeX{}
% group level: the assignment is global. The \meta{function} will
% not expand within an \texttt{x}-type argument.
@@ -455,7 +455,7 @@
% automatically from the function signature. These \meta{parameters}
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function.
-% The assignment of a meaning to \meta{function} is restricted to
+% The assignment of a meaning to the \meta{function} is restricted to
% the current \TeX{} group level.
% \end{function}
%
@@ -473,7 +473,7 @@
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. When the \meta{function} is used the \meta{parameters}
% absorbed cannot contain \cs{par} tokens.
-% The assignment of a meaning to \meta{function} is restricted to
+% The assignment of a meaning to the \meta{function} is restricted to
% the current \TeX{} group level.
% \end{function}
%
@@ -491,7 +491,7 @@
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. The \meta{function} will not expand within an \texttt{x}-type
% argument.
-% The assignment of a meaning to \meta{function} is restricted to
+% The assignment of a meaning to the \meta{function} is restricted to
% the current \TeX{} group level.
% \end{function}
%
@@ -510,7 +510,7 @@
% function. When the \meta{function} is used the \meta{parameters}
% absorbed cannot contain \cs{par} tokens. The \meta{function} will not
% expand within an \texttt{x}-type argument.
-% The assignment of a meaning to \meta{function} is restricted to
+% The assignment of a meaning to the \meta{function} is restricted to
% the current \TeX{} group level.
% \end{function}
%
@@ -527,7 +527,7 @@
% automatically from the function signature. These \meta{parameters}
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function.
-% The assignment of a meaning to \meta{function} is global.
+% The assignment of a meaning to the \meta{function} is global.
% \end{function}
%
% \begin{function}
@@ -544,7 +544,7 @@
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. When the \meta{function} is used the \meta{parameters}
% absorbed cannot contain \cs{par} tokens.
-% The assignment of a meaning to \meta{function} is global.
+% The assignment of a meaning to the \meta{function} is global.
% \end{function}
%
% \begin{function}
@@ -561,7 +561,7 @@
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. The \meta{function} will not expand within an \texttt{x}-type
% argument.
-% The assignment of a meaning to \meta{function} is global.
+% The assignment of a meaning to the \meta{function} is global.
% \end{function}
%
% \begin{function}
@@ -579,7 +579,7 @@
% function. When the \meta{function} is used the \meta{parameters}
% absorbed cannot contain \cs{par} tokens. The \meta{function} will not
% expand within an \texttt{x}-type argument.
-% The assignment of a meaning to \meta{function} is global.
+% The assignment of a meaning to the \meta{function} is global.
% \end{function}
%
% \begin{function}[updated = 2012-01-14]
@@ -632,7 +632,7 @@
% \meta{control sequence 2} (or <token>).
% The second control sequence may subsequently be
% altered without affecting the copy. The assignment of a meaning
-% to \meta{control sequence 1} is restricted to the current
+% to the \meta{control sequence 1} is restricted to the current
% \TeX{} group level.
% \end{function}
%
@@ -646,7 +646,7 @@
% \meta{control sequence 2} (or <token>).
% The second control sequence may subsequently be
% altered without affecting the copy. The assignment of a meaning to
-% \meta{control sequence 1} is \emph{not} restricted to the current
+% the \meta{control sequence 1} is \emph{not} restricted to the current
% \TeX{} group level: the assignment is global.
% \end{function}
%
@@ -1768,92 +1768,78 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\prg_set_conditional:Npnn,\prg_new_conditional:Npnn,
-% \prg_set_protected_conditional:Npnn,\prg_new_protected_conditional:Npnn}
+% \begin{macro}
+% {
+% \prg_set_conditional:Npnn ,
+% \prg_new_conditional:Npnn ,
+% \prg_set_protected_conditional:Npnn ,
+% \prg_new_protected_conditional:Npnn ,
+% }
+% \begin{macro}[aux]{\prg_generate_conditional_parm_aux:NNpnn}
% The user functions for the types using parameter text from the
-% programmer. Call aux function to grab parameters, split the base
-% function into name and signature and then use, \emph{e.g.}, |\cs_set:Npn|
-% to define it with.
-% \begin{macrocode}
-\cs_set_protected:Npn \prg_set_conditional:Npnn #1
- {
- \prg_get_parm_aux:nw
- {
- \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn
- \cs_set:Npn { parm }
- }
- }
-\cs_set_protected:Npn \prg_new_conditional:Npnn #1
- {
- \prg_get_parm_aux:nw
- {
- \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn
- \cs_new:Npn { parm }
- }
- }
-\cs_set_protected:Npn \prg_set_protected_conditional:Npnn #1
- {
- \prg_get_parm_aux:nw{
- \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn
- \cs_set_protected:Npn { parm }
- }
- }
-\cs_set_protected:Npn \prg_new_protected_conditional:Npnn #1
+% programmer. The various functions only differ by which function is
+% used for the assignment. For those |Npnn| type functions, we must
+% grab the parameter text, reading everything up to a left brace
+% before continuing. Then split the base function into name and
+% signature, and feed \Arg{name} \Arg{signature} \meta{boolean}
+% \meta{defining~function} |{parm}| \Arg{parameters} |{TF,...}|
+% \Arg{code} to the auxiliary function responsible for defining all
+% conditionals.
+% \begin{macrocode}
+\cs_set_protected_nopar:Npn \prg_set_conditional:Npnn
+ { \prg_generate_conditional_parm_aux:NNpnn \cs_set:Npn }
+\cs_set_protected_nopar:Npn \prg_new_conditional:Npnn
+ { \prg_generate_conditional_parm_aux:NNpnn \cs_new:Npn }
+\cs_set_protected_nopar:Npn \prg_set_protected_conditional:Npnn
+ { \prg_generate_conditional_parm_aux:NNpnn \cs_set_protected:Npn }
+\cs_set_protected_nopar:Npn \prg_new_protected_conditional:Npnn
+ { \prg_generate_conditional_parm_aux:NNpnn \cs_new_protected:Npn }
+\cs_set_protected:Npn \prg_generate_conditional_parm_aux:NNpnn #1#2#3#
{
- \prg_get_parm_aux:nw
- {
- \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn
- \cs_new_protected:Npn { parm }
- }
+ \cs_split_function:NN #2 \prg_generate_conditional_aux:nnNNnnnn
+ #1 { parm } {#3}
}
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
-% \begin{macro}{\prg_set_conditional:Nnn,\prg_new_conditional:Nnn,
-% \prg_set_protected_conditional:Nnn,\prg_new_protected_conditional:Nnn}
-% The user functions for the types automatically inserting the
-% correct parameter text based on the signature. Call aux function
-% after calculating number of arguments, split the base function
-% into name and signature and then use, \emph{e.g.}, |\cs_set:Npn| to
-% define it with.
-% \begin{macrocode}
-\cs_set_protected:Npn \prg_set_conditional:Nnn #1
- {
- \exp_args:Nnf \prg_get_count_aux:nn
- {
- \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn
- \cs_set:Npn { count }
- }
- { \cs_get_arg_count_from_signature:N #1 }
- }
-\cs_set_protected:Npn \prg_new_conditional:Nnn #1
- {
- \exp_args:Nnf \prg_get_count_aux:nn
- {
- \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn
- \cs_new:Npn { count}
- }
- { \cs_get_arg_count_from_signature:N #1 }
- }
-
-\cs_set_protected:Npn \prg_set_protected_conditional:Nnn #1{
- \exp_args:Nnf \prg_get_count_aux:nn{
- \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn
- \cs_set_protected:Npn {count}
- }{\cs_get_arg_count_from_signature:N #1}
-}
-
-\cs_set_protected:Npn \prg_new_protected_conditional:Nnn #1
+% \begin{macro}
+% {
+% \prg_set_conditional:Nnn ,
+% \prg_new_conditional:Nnn ,
+% \prg_set_protected_conditional:Nnn ,
+% \prg_new_protected_conditional:Nnn ,
+% }
+% \begin{macro}[aux]{\prg_generate_conditional_count_aux:NNnn}
+% The user functions for the types automatically inserting the correct
+% parameter text based on the signature. The various functions only
+% differ by which function is used for the assignment. For those |Nnn|
+% type functions, we calculate the number of arguments. Then split the
+% base function into name and signature, and feed \Arg{name}
+% \Arg{signature} \meta{boolean} \meta{defining~function} |{count}|
+% \Arg{arg~count} |{TF,...}| \Arg{code} to the auxiliary function
+% responsible for defining all conditionals.
+% \begin{macrocode}
+\cs_set_protected_nopar:Npn \prg_set_conditional:Nnn
+ { \prg_generate_conditional_count_aux:NNnn \cs_set:Npn }
+\cs_set_protected_nopar:Npn \prg_new_conditional:Nnn
+ { \prg_generate_conditional_count_aux:NNnn \cs_new:Npn }
+\cs_set_protected_nopar:Npn \prg_set_protected_conditional:Nnn
+ { \prg_generate_conditional_count_aux:NNnn \cs_set_protected:Npn }
+\cs_set_protected_nopar:Npn \prg_new_protected_conditional:Nnn
+ { \prg_generate_conditional_count_aux:NNnn \cs_new_protected:Npn }
+\cs_set_protected:Npn \prg_generate_conditional_count_aux:NNnn #1#2
{
- \exp_args:Nnf \prg_get_count_aux:nn
+ \exp_args:Nnf \use:n
{
- \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn
- \cs_new_protected:Npn {count}
+ \cs_split_function:NN #2 \prg_generate_conditional_aux:nnNNnnnn
+ #1 { count }
}
- { \cs_get_arg_count_from_signature:N #1 }
+ { \cs_get_arg_count_from_signature:N #2 }
}
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\prg_set_eq_conditional:NNn,\prg_new_eq_conditional:NNn}
% The obvious setting-equal functions.
@@ -1863,21 +1849,10 @@
\cs_set_protected:Npn \prg_new_eq_conditional:NNn #1#2#3
{ \prg_set_eq_conditional_aux:NNNn \cs_new_eq:cc #1#2 {#3} }
% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}[aux]{\prg_get_parm_aux:nw,\prg_get_count_aux:nn}
-% For the |Npnn| type we must grab the parameter text before
-% continuing. We make this a very generic function that takes one
-% argument before reading everything up to a left brace. Something
-% similar for the |Nnn| type.
-% \begin{macrocode}
-\cs_set:Npn \prg_get_count_aux:nn #1#2 { #1 {#2} }
-\cs_set:Npn \prg_get_parm_aux:nw #1#2# { #1 {#2} }
-% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[aux]{\prg_generate_conditional_parm_aux:nnNNnnnn,
-% \prg_generate_conditional_parm_aux:nw}
+% \begin{macro}[aux]{\prg_generate_conditional_aux:nnNNnnnn,
+% \prg_generate_conditional_aux:nnw}
% The workhorse here is going through a list of desired forms, \emph{i.e.},
% |p|, |TF|, |T| and |F|. The first three arguments come from splitting up
% the base form of the conditional, which gives the name, signature
@@ -2003,14 +1978,12 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[aux]{\prg_set_eq_conditional_aux:NNNn,
-% \prg_set_eq_conditional_aux:NNNw}
+% \begin{macro}[aux]
+% {\prg_set_eq_conditional_aux:NNNn, \prg_set_eq_conditional_aux:NNNw}
+% Manual clist loop over argument |#4|.
% \begin{macrocode}
\cs_set_protected:Npn \prg_set_eq_conditional_aux:NNNn #1#2#3#4
- { \prg_set_eq_conditional_aux:NNNw #1#2#3#4 , ? , \q_recursion_stop }
-% \end{macrocode}
-% Manual clist loop over argument |#4|.
-% \begin{macrocode}
+ { \prg_set_eq_conditional_aux:NNNw #1#2#3#4 , ? , \q_recursion_stop }
\cs_set_protected:Npn \prg_set_eq_conditional_aux:NNNw #1#2#3#4 ,
{
\if:w ? #4 \scan_stop:
@@ -2021,8 +1994,6 @@
{ \exp_args:NNc \cs_split_function:NN #3 { prg_conditional_form_#4:nnn } }
\prg_set_eq_conditional_aux:NNNw #1 {#2} {#3}
}
-% \end{macrocode}
-% \begin{macrocode}
\cs_set:Npn \prg_conditional_form_p:nnn #1#2#3 { #1 _p : #2 }
\cs_set:Npn \prg_conditional_form_TF:nnn #1#2#3 { #1 : #2 TF }
\cs_set:Npn \prg_conditional_form_T:nnn #1#2#3 { #1 : #2 T }
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3format.ins b/Master/texmf-dist/source/latex/l3kernel/l3format.ins
new file mode 100644
index 00000000000..ef01ceff9c7
--- /dev/null
+++ b/Master/texmf-dist/source/latex/l3kernel/l3format.ins
@@ -0,0 +1,77 @@
+\iffalse meta-comment
+
+File l3format.ins Copyright (C) 2011 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
+license or (at your option) any later version. The latest version
+of this license is in the file
+
+ http://www.latex-project.org/lppl.txt
+
+This file is part of the "l3kernel bundle" (The Work in LPPL)
+and all files in that bundle must be distributed together.
+
+The released version of this bundle is available from CTAN.
+
+\fi
+
+\input docstrip.tex
+\askforoverwritefalse
+
+\preamble
+
+EXPERIMENTAL CODE
+
+Do not distribute this file without also distributing the
+source files specified above.
+
+Do not distribute a modified version of this file.
+
+\endpreamble
+% stop docstrip adding \endinput
+\postamble
+\endpostamble
+
+\keepsilent
+
+\generate
+ {
+ \file{l3format.ltx}
+ {
+ \from{l3bootstrap.dtx}{initex}
+ \from{l3names.dtx} {initex}
+ \from{l3basics.dtx} {initex}
+ \from{l3expan.dtx} {initex}
+ \from{l3tl.dtx} {initex}
+ \from{l3seq.dtx} {initex}
+ % ===== FORMAT ONLY ======
+ \from{l3alloc.dtx} {initex}
+ % ========================
+ \from{l3int.dtx} {initex}
+ \from{l3quark.dtx} {initex}
+ \from{l3prg.dtx} {initex}
+ \from{l3clist.dtx} {initex}
+ \from{l3token.dtx} {initex}
+ \from{l3prop.dtx} {initex}
+ \from{l3msg.dtx} {initex}
+ \from{l3io.dtx} {initex}
+ \from{l3file.dtx} {initex}
+ \from{l3skip.dtx} {initex}
+ \from{l3keys.dtx} {initex}
+ \from{l3fp.dtx} {initex}
+ \from{l3box.dtx} {initex}
+ \from{l3coffins.dtx} {initex}
+ \from{l3color.dtx} {initex}
+ \from{l3luatex.dtx} {initex}
+ % ===== FORMAT ONLY ======
+ \from{l3final.dtx} {initex}
+ % ========================
+ }
+ }
+
+\generate{\file{l3dvips.ltx} {\from{l3drivers.dtx}{initex,dvips} }}
+\generate{\file{l3pdfmode.ltx} {\from{l3drivers.dtx}{initex,pdfmode} }}
+\generate{\file{l3xdvipdfmx.ltx}{\from{l3drivers.dtx}{initex,xdvipdfmx}}}
+
+\endbatchfile \ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
index 35213537c69..ea947680f43 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3fp.dtx 3154 2012-01-08 22:46:28Z bruno $
+\GetIdInfo$Id: l3fp.dtx 3315 2012-02-06 11:17:04Z bruno $
{L3 Experimental floating-point operations}
%</driver|package>
%<*driver>
@@ -110,7 +110,7 @@
% \cs{fp_new:N} \meta{floating point variable}
% \end{syntax}
% Creates a new \meta{floating point variable} or raises an error if
-% the name is already taken. The declaration global. The
+% the name is already taken. The declaration is global. The
% \meta{floating point} will initially be set to |+0.000000000e0|
% (the zero floating point).
% \end{function}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
index 5b94e7ccef7..f977f49c9f8 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3int.dtx 3216 2012-01-21 04:03:53Z bruno $
+\GetIdInfo$Id: l3int.dtx 3315 2012-02-06 11:17:04Z bruno $
{L3 Experimental integers}
%</driver|package>
%<*driver>
@@ -379,7 +379,7 @@
%
% \begin{function}[rEXP]{\int_do_while:nn}
% \begin{syntax}
-% \cs{int_do_while:nNnn}
+% \cs{int_do_while:nn}
% ~~\{ \meta{intexpr1} \meta{relation} \meta{intexpr2} \} \Arg{code}
% \end{syntax}
% Evaluates the relationship between the two \meta{integer expressions}
@@ -1386,7 +1386,7 @@
{
#2
\int_compare:nT {#1}
- { \int_do_while:nNnn {#1} {#2} }
+ { \int_do_while:nn {#1} {#2} }
}
\cs_new:Npn \int_do_until:nn #1#2
{
@@ -2069,7 +2069,7 @@
%
% \begin{variable}{\l_tmpa_int, \l_tmpb_int, \l_tmpc_int}
% \begin{variable}{\g_tmpa_int, \g_tmpb_int}
-% We provide four local and two global scratch counters, maybe we
+% We provide three local and two global scratch counters, maybe we
% need more or less.
% \begin{macrocode}
\int_new:N \l_tmpa_int
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
index 510747c1068..e0cb6029a79 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3msg.dtx 3153 2012-01-08 22:05:30Z bruno $
+\GetIdInfo$Id: l3msg.dtx 3316 2012-02-06 12:24:43Z bruno $
{L3 Experimental messages}
%</driver|package>
%<*driver>
@@ -1076,7 +1076,7 @@
% A test to see if any more text is available, using a
% permanently-empty text function.
% \begin{macrocode}
-\prg_set_conditional:Npnn \msg_if_more_text:N #1 { p , T , F , TF }
+\prg_new_conditional:Npnn \msg_if_more_text:N #1 { p , T , F , TF }
{
\cs_if_eq:NNTF #1 \msg_no_more_text:xxxx
{ \prg_return_false: }
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
index 6aa802d3ba4..8134b827bda 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3prg.dtx 3250 2012-01-28 04:54:49Z bruno $
+\GetIdInfo$Id: l3prg.dtx 3317 2012-02-06 12:26:40Z bruno $
{L3 Experimental control structures}
%</driver|package>
%<*driver>
@@ -91,128 +91,100 @@
%
% \section{Defining a set of conditional functions}
%
-% \begin{function}
+% \begin{function}[updated = 2012-02-06]
% {
% \prg_new_conditional:Npnn, \prg_set_conditional:Npnn,
% \prg_new_conditional:Nnn, \prg_set_conditional:Nnn
% }
% \begin{syntax}
-% \cs{prg_set_conditional:Npnn} \cs{\meta{name}:\meta{arg spec}} \meta{parameters} \Arg{conditions} \Arg{code} \\
-% \cs{prg_set_conditional:Nnn} \cs{\meta{name}:\meta{arg spec}} \Arg{conditions} \Arg{code}
+% \cs{prg_new_conditional:Npnn} \cs{\meta{name}:\meta{arg spec}} \meta{parameters} \Arg{conditions} \Arg{code} \\
+% \cs{prg_new_conditional:Nnn} \cs{\meta{name}:\meta{arg spec}} \Arg{conditions} \Arg{code}
% \end{syntax}
% These functions create a family of conditionals using the same
-% \Arg{code} to perform the test created. The \texttt{new} version will
-% check for existing definitions (\emph{cf.}~\cs{cs_new:Npn}) whereas
-% the \texttt{set} version will not (\emph{cf.}~\cs{cs_set:Npn}). The
-% conditionals created are dependent on the comma-separated list of
-% \meta{conditions}, which should be one or more of \texttt{p},
+% \Arg{code} to perform the test created. Those conditionals are
+% expandable if \meta{code} is. The \texttt{new} versions will check
+% for existing definitions and perform assignments globally
+% (\emph{cf.}~\cs{cs_new:Npn}) whereas the \texttt{set} versions do no
+% check and perform assignments locally (\emph{cf.}~\cs{cs_set:Npn}).
+% The conditionals created are dependent on the comma-separated list
+% of \meta{conditions}, which should be one or more of \texttt{p},
% \texttt{T}, \texttt{F} and \texttt{TF}.
% \end{function}
%
-% The conditionals are defined by \cs{prg_new_conditional:Npnn} and friends
-% as:
-% \begin{itemize}
-% \item \cs{\meta{name}_p:\meta{arg spec}} --- a predicate function
-% which will supply either a logical \texttt{true} or
-% logical \texttt{false}. This function is intended for use
-% in cases where one or more logical tests are combined to
-% lead to a final outcome.
-% \item \cs{\meta{name}:\meta{arg spec}T} --- a function with one
-% more argument than the original \meta{arg spec} demands. The
-% \meta{true branch} code in this additional argument will be
-% left on the input stream only if the test is \texttt{true}.
-% \item \cs{\meta{name}:\meta{arg spec}F} --- a function with one
-% more argument than the original \meta{arg spec} demands. The
-% \meta{false branch} code in this additional argument will be
-% left on the input stream only if the test is \texttt{false}.
-% \item \cs{\meta{name}:\meta{arg spec}TF} --- a function with two
-% more argument than the original \meta{arg spec} demands. The
-% \meta{true branch} code in the first additional argument will
-% be left on the input stream if the test is \texttt{true}, while
-% the \meta{false branch} code in the second argument will be
-% left on the input stream if the test is \texttt{false}.
-% \end{itemize}
-% The \meta{code} of the test may use \meta{parameters} as specified
-% by the second argument to \cs{prg_set_conditional:Npnn}: this should
-% match the \meta{argument specification} but this is not enforced.
-% The |Nnn| versions infer the number of arguments from the argument
-% specification given (\emph{cf.}~\cs{cs_new:Nn}, \emph{etc.}).
-% Within the \meta{code}, the functions \cs{prg_return_true:} and
-% \cs{prg_return_false:} are used to indicate the logical outcomes of
-% the test. If \meta{code} is expandable then
-% \cs{prg_set_conditional:Npnn} will generate a family of conditionals
-% which are also expandable. All of the functions are created globally.
-%
-% An example can easily clarify matters here:
-% \begin{verbatim}
-% \prg_set_conditional:Nnn \foo_if_bar:NN { p , T , TF }
-% {
-% \if_meaning:w \l_tmpa_tl #1
-% \prg_return_true:
-% \else:
-% \if_meaning:w \l_tmpa_tl #2
-% \prg_return_true:
-% \else:
-% \prg_return_false:
-% \fi:
-% \fi:
-% }
-% \end{verbatim}
-% This defines the function |\foo_if_bar_p:NN|, |\foo_if_bar:NNTF| and
-% |\foo_if_bar:NNT| but not |\foo_if_bar:NNF| (because |F| is missing from
-% the \meta{conds} list). The return statements
-% take care of resolving the remaining |\else:| and |\fi:| before
-% returning the state. There must be a return statement for each
-% branch, failing to do so will result in an error if that branch is
-% executed.
-%
-% \begin{function}
+% \begin{function}[updated = 2012-02-06]
% {
% \prg_new_protected_conditional:Npnn, \prg_set_protected_conditional:Npnn,
% \prg_new_protected_conditional:Nnn, \prg_set_protected_conditional:Nnn
% }
% \begin{syntax}
-% \cs{prg_set_protected_conditional:Npnn} \cs{\meta{name}:\meta{arg spec}} \meta{parameters} \Arg{conditions} \Arg{code} \\
-% \cs{prg_set_protected_conditional:Nnn} \cs{\meta{name}:\meta{arg spec}} \Arg{conditions} \Arg{code}
+% \cs{prg_new_protected_conditional:Npnn} \cs{\meta{name}:\meta{arg spec}} \meta{parameters} \Arg{conditions} \Arg{code} \\
+% \cs{prg_new_protected_conditional:Nnn} \cs{\meta{name}:\meta{arg spec}} \Arg{conditions} \Arg{code}
% \end{syntax}
-% These functions create a family of conditionals using the same
-% \Arg{code} to perform the test created. The \texttt{new} version will
-% check for existing definitions (\emph{cf.}~\cs{cs_new:Npn}) whereas
-% the \texttt{set} version will not (\emph{cf.}~\cs{cs_set:Npn}). The
-% conditionals created are depended on the comma-separated list of
-% \meta{conditions}, which should be one or more of \texttt{T},
-% \texttt{F} and \texttt{TF}.
+% These functions create a family of protected conditionals using the
+% same \Arg{code} to perform the test created. The \meta{code} does
+% not need to be expandable. The \texttt{new} version will check for
+% existing definitions and perform assignments globally
+% (\emph{cf.}~\cs{cs_new:Npn}) whereas the \texttt{set} version will
+% not (\emph{cf.}~\cs{cs_set:Npn}). The conditionals created are
+% depended on the comma-separated list of \meta{conditions}, which
+% should be one or more of \texttt{T}, \texttt{F} and \texttt{TF} (not
+% \texttt{p}).
% \end{function}
%
-% The conditionals are defined by \cs{prg_new_protected_conditional:Npnn}
-% and friends as:
-% \begin{itemize}
-% \item \cs{\meta{name}:\meta{arg spec}T} --- a function with one
-% more argument than the original \meta{arg spec} demands. The
-% \meta{true branch} code in this additional argument will be
-% left on the input stream only if the test is \texttt{true}.
-% \item \cs{\meta{name}:\meta{arg spec}F} --- a function with one
-% more argument than the original \meta{arg spec} demands. The
-% \meta{false branch} code in this additional argument will be
-% left on the input stream only if the test is \texttt{false}.
-% \item \cs{\meta{name}:\meta{arg spec}TF} --- a function with two
-% more argument than the original \meta{arg spec} demands. The
-% \meta{true branch} code in the first additional argument will
-% be left on the input stream if the test is \texttt{true}, while
-% the \meta{false branch} code in the second argument will be
-% left on the input stream if the test is \texttt{false}.
-% \end{itemize}
-% The \meta{code} of the test may use \meta{parameters} as specified
-% by the second argument to \cs{prg_set_conditional:Npn}: this should
-% match the \meta{argument specification} but this is not enforced.
-% The |Nnn| versions infer the number of arguments from the argument
-% specification given (\emph{cf.}~\cs{cs_new:Nn}, \emph{etc.}).
-% Within the \meta{code}, the functions \cs{prg_return_true:} and
-% \cs{prg_return_false:} are used to indicate the logical outcomes of
-% the test. \cs{prg_set_protected_conditional:Npn} will generate
-% a family of protected conditional functions, and so \meta{code}
-% does not need to be expandable. All of the functions are created
-% globally.
+% The conditionals are defined by \cs{prg_new_conditional:Npnn} and
+% friends as:
+% \begin{itemize}
+% \item \cs{\meta{name}_p:\meta{arg spec}} --- a predicate function
+% which will supply either a logical \texttt{true} or logical
+% \texttt{false}. This function is intended for use in cases where
+% one or more logical tests are combined to lead to a final outcome.
+% This function will not work properly for \texttt{protected}
+% conditionals.
+% \item \cs{\meta{name}:\meta{arg spec}T} --- a function with one more
+% argument than the original \meta{arg spec} demands. The \meta{true
+% branch} code in this additional argument will be left on the
+% input stream only if the test is \texttt{true}.
+% \item \cs{\meta{name}:\meta{arg spec}F} --- a function with one more
+% argument than the original \meta{arg spec} demands. The
+% \meta{false branch} code in this additional argument will be left
+% on the input stream only if the test is \texttt{false}.
+% \item \cs{\meta{name}:\meta{arg spec}TF} --- a function with two
+% more argument than the original \meta{arg spec} demands. The
+% \meta{true branch} code in the first additional argument will be
+% left on the input stream if the test is \texttt{true}, while the
+% \meta{false branch} code in the second argument will be left on
+% the input stream if the test is \texttt{false}.
+% \end{itemize}
+% The \meta{code} of the test may use \meta{parameters} as specified by
+% the second argument to \cs{prg_set_conditional:Npnn}: this should
+% match the \meta{argument specification} but this is not enforced. The
+% |Nnn| versions infer the number of arguments from the argument
+% specification given (\emph{cf.}~\cs{cs_new:Nn}, \emph{etc.}). Within
+% the \meta{code}, the functions \cs{prg_return_true:} and
+% \cs{prg_return_false:} are used to indicate the logical outcomes of
+% the test.
+%
+% An example can easily clarify matters here:
+% \begin{verbatim}
+% \prg_set_conditional:Nnn \foo_if_bar:NN { p , T , TF }
+% {
+% \if_meaning:w \l_tmpa_tl #1
+% \prg_return_true:
+% \else:
+% \if_meaning:w \l_tmpa_tl #2
+% \prg_return_true:
+% \else:
+% \prg_return_false:
+% \fi:
+% \fi:
+% }
+% \end{verbatim}
+% This defines the function |\foo_if_bar_p:NN|, |\foo_if_bar:NNTF| and
+% |\foo_if_bar:NNT| but not |\foo_if_bar:NNF| (because |F| is missing
+% from the \meta{conditions} list). The return statements take care of
+% resolving the remaining |\else:| and |\fi:| before returning the
+% state. There must be a return statement for each branch, failing to do
+% so will result in an error if that branch is executed.
%
% \begin{function}{\prg_new_eq_conditional:NNn, \prg_set_eq_conditional:NNn}
% \begin{syntax}
@@ -265,71 +237,47 @@
% \meta{boolean} will initially be \texttt{false}.
% \end{function}
%
-% \begin{function}{\bool_set_false:N, \bool_set_false:c}
+% \begin{function}
+% {
+% \bool_set_false:N , \bool_set_false:c ,
+% \bool_gset_false:N, \bool_gset_false:c
+% }
% \begin{syntax}
% \cs{bool_set_false:N} \meta{boolean}
% \end{syntax}
-% Sets \meta{boolean} logically \texttt{false} within the current
-% \TeX{} group.
+% Sets \meta{boolean} logically \texttt{false}.
% \end{function}
%
-% \begin{function}{\bool_gset_false:N, \bool_gset_false:c}
-% \begin{syntax}
-% \cs{bool_sget_false:N} \meta{boolean}
-% \end{syntax}
-% Sets \meta{boolean} logically \texttt{false} globally.
-% \end{function}
-%
-% \begin{function}{\bool_set_true:N, \bool_set_true:c}
+% \begin{function}
+% {
+% \bool_set_true:N , \bool_set_true:c ,
+% \bool_gset_true:N , \bool_gset_true:c
+% }
% \begin{syntax}
% \cs{bool_set_true:N} \meta{boolean}
% \end{syntax}
-% Sets \meta{boolean} logically \texttt{true} within the current
-% \TeX{} group.
-% \end{function}
-%
-% \begin{function}{\bool_gset_true:N, \bool_gset_true:c}
-% \begin{syntax}
-% \cs{bool_gset_true:N} \meta{boolean}
-% \end{syntax}
-% Sets \meta{boolean} logically \texttt{true} globally.
+% Sets \meta{boolean} logically \texttt{true}.
% \end{function}
%
% \begin{function}
-% {\bool_set_eq:NN, \bool_set_eq:cN, \bool_set_eq:Nc, \bool_set_eq:cc}
+% {
+% \bool_set_eq:NN , \bool_set_eq:cN , \bool_set_eq:Nc , \bool_set_eq:cc ,
+% \bool_gset_eq:NN, \bool_gset_eq:cN, \bool_gset_eq:Nc, \bool_gset_eq:cc
+% }
% \begin{syntax}
% \cs{bool_set_eq:NN} \meta{boolean1} \meta{boolean2}
% \end{syntax}
% Sets the content of \meta{boolean1} equal to that of \meta{boolean2}.
-% This assignment is restricted to the current \TeX{} group level.
% \end{function}
%
% \begin{function}
-% {\bool_gset_eq:NN, \bool_gset_eq:cN, \bool_gset_eq:Nc, \bool_gset_eq:cc}
-% \begin{syntax}
-% \cs{bool_gset_eq:NN} \meta{boolean1} \meta{boolean2}
-% \end{syntax}
-% Sets the content of \meta{boolean1} equal to that of \meta{boolean2}.
-% This assignment is global and so is not limited by the current
-% \TeX{} group level.
-% \end{function}
-%
-% \begin{function}{\bool_set:Nn, \bool_set:cn}
+% {\bool_set:Nn, \bool_set:cn, \bool_gset:Nn, \bool_gset:cn}
% \begin{syntax}
% \cs{bool_set:Nn} \meta{boolean} \Arg{boolexpr}
% \end{syntax}
% Evaluates the \meta{boolean expression} as described for
% \cs{bool_if:n(TF)}, and sets the \meta{boolean} variable to
-% the logical truth of this evaluation. This assignment is local.
-% \end{function}
-%
-% \begin{function}{\bool_gset:Nn, \bool_gset:cn}
-% \begin{syntax}
-% \cs{bool_gset:Nn} \meta{boolean} \Arg{boolexpr}
-% \end{syntax}
-% Evaluates the \meta{boolean expression} as described for
-% \cs{bool_if:n(TF)}, and sets the \meta{boolean} variable to
-% the logical truth of this evaluation. This assignment is global.
+% the logical truth of this evaluation.
% \end{function}
%
% \begin{function}[EXP,pTF]{\bool_if:N, \bool_if:c}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
index 44e0bf5a45d..02cc54e90d3 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
@@ -36,7 +36,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3skip.dtx 3139 2012-01-07 19:53:09Z bruno $
+\GetIdInfo$Id: l3skip.dtx 3313 2012-02-06 11:15:21Z bruno $
{L3 Experimental dimensions and skips}
%</driver|package>
%<*driver>
@@ -138,7 +138,7 @@
% \meta{dimension2}.
% \end{function}
%
-% \begin{function}[updated = 2011-10-22]
+% \begin{function}[updated = 2012-02-06]
% {\dim_set_max:Nn, \dim_set_max:cn, \dim_gset_max:Nn, \dim_gset_max:cn}
% \begin{syntax}
% \cs{dim_set_max:Nn} \meta{dimension} \Arg{dimension expression}
@@ -148,7 +148,7 @@
% larger of these two value.
% \end{function}
%
-% \begin{function}[updated = 2011-10-22]
+% \begin{function}[updated = 2012-02-06]
% {\dim_set_min:Nn, \dim_set_min:cn, \dim_gset_min:Nn, \dim_gset_min:cn}
% \begin{syntax}
% \cs{dim_set_min:Nn} \meta{dimension} \Arg{dimension expression}
@@ -293,7 +293,7 @@
%
% \begin{function}[rEXP]{\dim_do_while:nn}
% \begin{syntax}
-% \cs{dim_do_while:nNnn} \{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \} \Arg{code}
+% \cs{dim_do_while:nn} \{ \meta{dimexpr1} \meta{relation} \meta{dimexpr2} \} \Arg{code}
% \end{syntax}
% Evaluates the relationship between the two \meta{dimension expressions}
% as described for \cs{dim_compare:nTF}, and then places the
@@ -916,17 +916,20 @@
% \begin{macro}{\dim_set_min:Nn, \dim_set_min:cn}
% \begin{macro}{\dim_gset_max:Nn, \dim_gset_max:cn}
% \begin{macro}{\dim_gset_min:Nn, \dim_gset_min:cn}
+% \begin{macro}[aux]{\dim_set_max_aux:NNNn}
% Setting maximum and minimum values is simply a case of so build-in
% comparison. This only applies to dimensions as skips are not ordered.
% \begin{macrocode}
-\cs_new_protected:Npn \dim_set_max:Nn #1#2
- { \dim_compare:nNnT {#1} < {#2} { \dim_set:Nn #1 {#2} } }
-\cs_new_protected:Npn \dim_gset_max:Nn
- { \tex_global:D \dim_set_max:Nn }
-\cs_new_protected:Npn \dim_set_min:Nn #1#2
- { \dim_compare:nNnT {#1} > {#2} { \dim_set:Nn #1 {#2} } }
-\cs_new_protected:Npn \dim_gset_min:Nn
- { \tex_global:D \dim_set_min:Nn }
+\cs_new_protected_nopar:Npn \dim_set_max:Nn
+ { \dim_set_max_aux:NNNn < \dim_set:Nn }
+\cs_new_protected_nopar:Npn \dim_gset_max:Nn
+ { \dim_set_max_aux:NNNn < \dim_gset:Nn }
+\cs_new_protected_nopar:Npn \dim_set_min:Nn
+ { \dim_set_max_aux:NNNn > \dim_set:Nn }
+\cs_new_protected_nopar:Npn \dim_gset_min:Nn
+ { \dim_set_max_aux:NNNn > \dim_gset:Nn }
+\cs_new_protected:Npn \dim_set_max_aux:NNNn #1#2#3#4
+ { \dim_compare:nNnT {#3} #1 {#4} { #2 #3 {#4} } }
\cs_generate_variant:Nn \dim_set_max:Nn { c }
\cs_generate_variant:Nn \dim_gset_max:Nn { c }
\cs_generate_variant:Nn \dim_set_min:Nn { c }
@@ -936,6 +939,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\dim_add:Nn, \dim_add:cn}
% \begin{macro}{\dim_gadd:Nn, \dim_gadd:cn}
@@ -1148,7 +1152,7 @@
{
#2
\dim_compare:nT {#1}
- { \dim_do_while:nNnn {#1} {#2} }
+ { \dim_do_while:nn {#1} {#2} }
}
\cs_set:Npn \dim_do_until:nn #1#2
{
@@ -1673,7 +1677,7 @@
% |#3| and |#4| to the stretch and shrink component, resp. If it holds
% infinite glue set |#3| and |#4| to zero and issue the special action
% |#2| which is probably an error message.
-% Assignments are global.
+% Assignments are local.
% \begin{macrocode}
\cs_new:Npn \skip_split_finite_else_action:nnNN #1#2#3#4
{
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
index 8fd54e3388a..f0279ff6bfc 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3tl.dtx 3286 2012-01-31 21:57:22Z joseph $
+\GetIdInfo$Id: l3tl.dtx 3316 2012-02-06 12:24:43Z bruno $
{L3 Experimental token lists}
%</driver|package>
%<*driver>
@@ -1531,7 +1531,7 @@
% These functions check whether the token list in the argument is
% empty and execute the proper code from their argument(s).
% \begin{macrocode}
-\prg_set_conditional:Npnn \tl_if_empty:N #1 { p , T , F , TF }
+\prg_new_conditional:Npnn \tl_if_empty:N #1 { p , T , F , TF }
{
\if_meaning:w #1 \c_empty_tl
\prg_return_true:
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
index 107abc826ee..3c5ba351913 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3token.dtx 3234 2012-01-25 12:55:06Z joseph $
+\GetIdInfo$Id: l3token.dtx 3316 2012-02-06 12:24:43Z bruno $
{L3 Experimental token manipulation}
%</driver|package>
%<*driver>
@@ -2087,7 +2087,7 @@
% \begin{macro}[aux]{\peek_def:nnnn}
% \begin{macro}[aux]{\peek_def_aux:nnnnn}
% The public functions themselves cannot be defined using
-% \cs{prg_set_conditional:Npnn} and so a couple of auxiliary functions
+% \cs{prg_new_conditional:Npnn} and so a couple of auxiliary functions
% are used. As a result, everything is done inside a group. As a result
% things are a bit complicated.
% \begin{macrocode}