summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/expl3/l3skip.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3/l3skip.sty')
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3skip.sty27
1 files changed, 13 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3skip.sty b/Master/texmf-dist/tex/latex/expl3/l3skip.sty
index b6f10c5127d..813b1ad11e3 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3skip.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3skip.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3skip.dtx 2047 2010-09-23 09:27:30Z will $
+\GetIdInfo$Id: l3skip.dtx 2063 2010-10-03 08:26:49Z mittelba $
{L3 Experimental skip registers}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -114,8 +114,8 @@
\cs_set_eq:NN \c_max_skip \maxdimen
\prg_new_conditional:Nnn \skip_if_infinite_glue:n {p,TF,T,F} {
\bool_if:nTF {
- \intexpr_compare_p:nNn {\etex_gluestretchorder:D #1 } > \c_zero ||
- \intexpr_compare_p:nNn {\etex_glueshrinkorder:D #1 } > \c_zero
+ \int_compare_p:nNn {\etex_gluestretchorder:D #1 } > \c_zero ||
+ \int_compare_p:nNn {\etex_glueshrinkorder:D #1 } > \c_zero
} {\prg_return_true:} {\prg_return_false:}
}
\cs_new_nopar:Npn \skip_split_finite_else_action:nnNN #1#2#3#4{
@@ -167,14 +167,13 @@
\cs_new_eq:NN \c_max_dim \c_max_skip
\cs_new_protected_nopar:Npn \dim_eval:n #1 { \etex_dimexpr:D #1 \scan_stop: }
\cs_new_eq:NN \if_dim:w \tex_ifdim:D
+\cs_set_eq:NN \dim_value:w \tex_number:D
+\cs_set_eq:NN \dim_eval:w \etex_dimexpr:D
+\cs_set_protected:Npn \dim_eval_end: {\tex_relax:D}
\prg_new_conditional:Nnn \dim_compare:nNn {p,TF,T,F} {
\if_dim:w \dim_eval:n {#1} #2 \dim_eval:n {#3}
\prg_return_true: \else: \prg_return_false: \fi:
}
-\cs_set_eq:NN \dim_value:w \tex_number:D
-\cs_set_eq:NN \dim_eval:w \etex_dimexpr:D
-\cs_set_eq:NN \if_dim_compare:w \if_dim:w
-\cs_set_eq:NN \dim_eval_end: \scan_stop:
\prg_new_conditional:Npnn \dim_compare:n #1 {p,TF,T,F} {
\exp_after:wN \dim_compare_auxi:w \dim_value:w
\dim_eval:w #1 \q_stop
@@ -189,31 +188,31 @@
:w}
}
\cs_new:cpn {dim_compare_=:w} #1 = #2 \q_stop {
- \if_dim_compare:w #1 sp = \dim_eval:w #2 \dim_eval_end:
+ \if_dim:w #1 sp = \dim_eval:w #2 \dim_eval_end:
\prg_return_true: \else: \prg_return_false: \fi:
}
\cs_new:cpn {dim_compare_==:w} #1 == #2 \q_stop {
- \if_dim_compare:w #1 sp = \dim_eval:w #2 \dim_eval_end:
+ \if_dim:w #1 sp = \dim_eval:w #2 \dim_eval_end:
\prg_return_true: \else: \prg_return_false: \fi:
}
\cs_new:cpn {dim_compare_!=:w} #1 != #2 \q_stop {
- \if_dim_compare:w #1 sp = \dim_eval:w #2 \dim_eval_end:
+ \if_dim:w #1 sp = \dim_eval:w #2 \dim_eval_end:
\prg_return_false: \else: \prg_return_true: \fi:
}
\cs_new:cpn {dim_compare_<:w} #1 < #2 \q_stop {
- \if_dim_compare:w #1 sp < \dim_eval:w #2 \dim_eval_end:
+ \if_dim:w #1 sp < \dim_eval:w #2 \dim_eval_end:
\prg_return_true: \else: \prg_return_false: \fi:
}
\cs_new:cpn {dim_compare_>:w} #1 > #2 \q_stop {
- \if_dim_compare:w #1 sp > \dim_eval:w #2 \dim_eval_end:
+ \if_dim:w #1 sp > \dim_eval:w #2 \dim_eval_end:
\prg_return_true: \else: \prg_return_false: \fi:
}
\cs_new:cpn {dim_compare_<=:w} #1 <= #2 \q_stop {
- \if_dim_compare:w #1 sp > \dim_eval:w #2 \dim_eval_end:
+ \if_dim:w #1 sp > \dim_eval:w #2 \dim_eval_end:
\prg_return_false: \else: \prg_return_true: \fi:
}
\cs_new:cpn {dim_compare_>=:w} #1 >= #2 \q_stop {
- \if_dim_compare:w #1 sp < \dim_eval:w #2 \dim_eval_end:
+ \if_dim:w #1 sp < \dim_eval:w #2 \dim_eval_end:
\prg_return_false: \else: \prg_return_true: \fi:
}
\cs_new_nopar:Npn \dim_while_do:nNnn #1#2#3#4{