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.dtx56
1 files changed, 24 insertions, 32 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
index 24fd5bf3fe8..3eb3eb8c901 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{l3bootstrap}
-\GetIdInfo$Id: l3skip.dtx 4235 2012-09-26 09:48:18Z bruno $
+\GetIdInfo$Id: l3skip.dtx 4260 2012-11-04 17:20:25Z joseph $
{L3 Dimensions and skips}
%</driver|package>
%<*driver>
@@ -211,7 +211,7 @@
%
% \begin{function}[EXP,pTF]{\dim_compare:nNn}
% \begin{syntax}
-% \cs{@@_compare_p:nNn} \Arg{dimexpr_1} \meta{relation} \Arg{dimexpr_2} \\
+% \cs{dim_compare_p:nNn} \Arg{dimexpr_1} \meta{relation} \Arg{dimexpr_2} \\
% \cs{dim_compare:nNnTF}
% ~~\Arg{dimexpr_1} \meta{relation} \Arg{dimexpr_2}
% ~~\Arg{true code} \Arg{false code}
@@ -230,7 +230,7 @@
%
% \begin{function}[EXP,pTF]{\dim_compare:n}
% \begin{syntax}
-% \cs{@@_compare_p:n} \{ \meta{dimexpr_1} \meta{relation} \meta{dimexpr_2} \} \\
+% \cs{dim_compare_p:n} \{ \meta{dimexpr_1} \meta{relation} \meta{dimexpr_2} \} \\
% \cs{dim_compare:nTF}
% ~~\{ \meta{dimexpr_1} \meta{relation} \meta{dimexpr_2} \}
% ~~\Arg{true code} \Arg{false code}
@@ -431,12 +431,13 @@
% \section{Constant dimensions}
%
% \begin{variable}{\c_max_dim}
-% The maximum value that can be stored as a dimension or skip (these
-% are equivalent).
+% The maximum value that can be stored as a dimension. This can also
+% be used as a component of a skip.
% \end{variable}
%
% \begin{variable}{\c_zero_dim}
-% A zero length as a dimension or a skip (these are equivalent).
+% A zero length as a dimension. This can also be used as a component
+% of a skip.
% \end{variable}
%
% \section{Scratch dimensions}
@@ -618,13 +619,13 @@
%
% \section{Constant skips}
%
-% \begin{variable}{\c_max_skip}
-% The maximum value that can be stored as a dimension or skip (these
-% are equivalent).
+% \begin{variable}[updated = 2012-11-02]{\c_max_skip}
+% The maximum value that can be stored as a skip (equal to
+% \cs{c_max_dim} in length), with no stretch nor shrink component.
% \end{variable}
%
-% \begin{variable}{\c_zero_skip}
-% A zero length as a dimension or a skip (these are equivalent).
+% \begin{variable}[updated = 2012-11-01]{\c_zero_skip}
+% A zero length as a skip, with no stretch nor shrink component.
% \end{variable}
%
% \section{Scratch skips}
@@ -815,11 +816,12 @@
% \section{Constant muskips}
%
% \begin{variable}{\c_max_muskip}
-% The maximum value that can be stored as a muskip.
+% The maximum value that can be stored as a muskip, with no stretch
+% nor shrink component.
% \end{variable}
%
% \begin{variable}{\c_zero_muskip}
-% A zero length as a muskip.
+% A zero length as a muskip, with no stretch nor shrink component.
% \end{variable}
%
% \section{Scratch muskips}
@@ -1372,22 +1374,13 @@
%
% \subsection{Constant dimensions}
%
-% \begin{variable}{\c_zero_dim}
-% \begin{variable}{\c_max_dim}
-% The source for these depends on whether we are in package mode.
+% \begin{variable}{\c_zero_dim, \c_max_dim}
+% Constant dimensions: in package mode, a couple of registers can be saved.
% \begin{macrocode}
-%<*initex>
-\dim_new:N \c_zero_dim
-\dim_new:N \c_max_dim
-\dim_set:Nn \c_max_dim { 16383.99999 pt }
-%</initex>
-%<*package>
-\cs_new_eq:NN \c_zero_dim \z@
-\cs_new_eq:NN \c_max_dim \maxdimen
-%</package>
+\dim_const:Nn \c_zero_dim { 0 pt }
+\dim_const:Nn \c_max_dim { 16383.99999 pt }
% \end{macrocode}
% \end{variable}
-% \end{variable}
%
% \subsection{Scratch dimensions}
%
@@ -1627,15 +1620,14 @@
%
% \subsection{Constant skips}
%
-% \begin{macro}{\c_zero_skip}
-% \begin{macro}{\c_max_skip}
-% Skips with no rubber component are just dimensions
+% \begin{macro}{\c_zero_skip, \c_max_skip}
+% Skips with no rubber component are just dimensions but need to terminate
+% correctly.
% \begin{macrocode}
-\cs_new_eq:NN \c_zero_skip \c_zero_dim
-\cs_new_eq:NN \c_max_skip \c_max_dim
+\skip_const:Nn \c_zero_skip { \c_zero_dim }
+\skip_const:Nn \c_max_skip { \c_max_dim }
% \end{macrocode}
% \end{macro}
-% \end{macro}
%
% \subsection{Scratch skips}
%