summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/expl3/l3skip.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-11 23:19:01 +0000
committerKarl Berry <karl@freefriends.org>2011-01-11 23:19:01 +0000
commit62764a821e78856fc5c6db6525928247bc194581 (patch)
tree0b5db9f4ad1fb636d4603a4fae663452fecc8f2f /Master/texmf-dist/tex/latex/expl3/l3skip.sty
parentcccf458bc431d5acf57051e42292f42ea20ebb7e (diff)
expl3 2126 (10jan11)
git-svn-id: svn://tug.org/texlive/trunk@21030 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3/l3skip.sty')
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3skip.sty34
1 files changed, 22 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3skip.sty b/Master/texmf-dist/tex/latex/expl3/l3skip.sty
index 73a6b5efb7a..7248309d1cb 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3skip.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3skip.sty
@@ -15,7 +15,7 @@
%% Do not distribute a modified version of this file.
%%
%%
-%% File: l3skip.dtx Copyright (C) 2005-2010 Frank Mittelbach, LaTeX3 project
+%% File: l3skip.dtx Copyright (C) 2005-2011 Frank Mittelbach, 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
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3skip.dtx 2088 2010-11-23 20:27:27Z joseph $
+\GetIdInfo$Id: l3skip.dtx 2121 2011-01-07 08:46:09Z joseph $
{L3 Experimental skip registers}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -59,7 +59,7 @@
}
\cs_generate_variant:Nn \skip_new:N {c}
\cs_new_protected_nopar:Npn \skip_set:Nn #1#2 {
- #1\skip_eval:n{#2}
+ #1 \etex_glueexpr:D #2 \scan_stop:
}
\cs_new_protected_nopar:Npn \skip_gset:Nn {
\pref_global:D
@@ -77,11 +77,11 @@
\cs_generate_variant:Nn \skip_zero:N {c}
\cs_generate_variant:Nn \skip_gzero:N {c}
\cs_new_protected_nopar:Npn \skip_add:Nn #1#2 {
- \tex_advance:D#1 by \skip_eval:n{#2}
+ \tex_advance:D#1 by \etex_glueexpr:D #2 \scan_stop:
}
\cs_generate_variant:Nn \skip_add:Nn {cn}
\cs_new_protected_nopar:Npn \skip_sub:Nn #1#2{
- \tex_advance:D#1-\skip_eval:n{#2}
+ \tex_advance:D #1 -\etex_glueexpr:D #2 \scan_stop:
}
\cs_new_protected_nopar:Npn \skip_gadd:Nn {
\pref_global:D
@@ -94,15 +94,21 @@
}
\cs_new_eq:NN \skip_horizontal:N \tex_hskip:D
\cs_generate_variant:Nn \skip_horizontal:N {c}
-\cs_new_nopar:Npn \skip_horizontal:n #1 { \skip_horizontal:N \skip_eval:n{#1} }
+\cs_new_nopar:Npn \skip_horizontal:n #1 {
+ \skip_horizontal:N \etex_glueexpr:D #1 \scan_stop:
+}
\cs_new_eq:NN \skip_vertical:N \tex_vskip:D
\cs_generate_variant:Nn \skip_vertical:N {c}
-\cs_new_nopar:Npn \skip_vertical:n #1 { \skip_vertical:N \skip_eval:n{#1} }
+\cs_new_nopar:Npn \skip_vertical:n #1 {
+ \skip_vertical:N \etex_glueexpr:D #1 \scan_stop:
+}
\cs_new_eq:NN \skip_use:N \tex_the:D
\cs_generate_variant:Nn \skip_use:N {c}
\cs_new_eq:NN \skip_show:N \kernel_register_show:N
\cs_generate_variant:Nn \skip_show:N {c}
-\cs_new_protected_nopar:Npn \skip_eval:n #1 { \etex_glueexpr:D #1 \scan_stop: }
+\cs_new_protected_nopar:Npn \skip_eval:n #1 {
+ \tex_the:D \etex_glueexpr:D #1 \scan_stop:
+}
%%\chk_if_free_cs:N \l_tmpa_skip
%%\tex_skipdef:D\l_tmpa_skip 255 %currently taken up by \skip@
\skip_new:N \l_tmpa_skip
@@ -135,7 +141,9 @@
\newdimen #1
}
\cs_generate_variant:Nn \dim_new:N {c}
-\cs_new_protected_nopar:Npn \dim_set:Nn #1#2 { #1~ \dim_eval:n{#2} }
+\cs_new_protected_nopar:Npn \dim_set:Nn #1#2 {
+ #1~ \etex_dimexpr:D #2 \scan_stop:
+}
\cs_generate_variant:Nn \dim_set:Nn {cn,Nc}
\cs_new_protected_nopar:Npn \dim_gset:Nn { \pref_global:D \dim_set:Nn }
\cs_generate_variant:Nn \dim_gset:Nn {cn,Nc,cc}
@@ -160,7 +168,7 @@
\cs_new_protected_nopar:Npn \dim_gzero:N { \pref_global:D \dim_zero:N }
\cs_generate_variant:Nn \dim_gzero:N {c}
\cs_new_protected_nopar:Npn \dim_add:Nn #1#2{
- \tex_advance:D#1 by \dim_eval:n{#2}\scan_stop:
+ \tex_advance:D#1 by \etex_dimexpr:D #2 \scan_stop:
}
\cs_generate_variant:Nn \dim_add:Nn {cn,Nc}
\cs_new_protected_nopar:Npn \dim_gadd:Nn { \pref_global:D \dim_add:Nn }
@@ -181,13 +189,15 @@
\dim_new:N \g_tmpb_dim
\cs_new_eq:NN \c_zero_dim \c_zero_skip
\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_protected_nopar:Npn \dim_eval:n #1 {
+ \tex_the:D \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}
+ \if_dim:w \etex_dimexpr:D #1 #2 \etex_dimexpr:D #3 \scan_stop:
\prg_return_true: \else: \prg_return_false: \fi:
}
\prg_new_conditional:Npnn \dim_compare:n #1 {p,TF,T,F} {