summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3skip.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3skip.dtx32
1 files changed, 18 insertions, 14 deletions
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
{