summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/expl3/l3skip.sty
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-07-29 11:23:34 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-07-29 11:23:34 +0000
commitef285e6a49a93af098150d0b3125a34d3477ba55 (patch)
tree124a55595390d358e0cda8ae26f78e9a263e9a21 /Master/texmf-dist/tex/latex/expl3/l3skip.sty
parente7477f362711cc9d05dfa1ee71301fb34cce2d94 (diff)
expl3 update (2008/06/20)
git-svn-id: svn://tug.org/texlive/trunk@9869 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.sty15
1 files changed, 9 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3skip.sty b/Master/texmf-dist/tex/latex/expl3/l3skip.sty
index 8e24a01271b..588bcb9f88b 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-2006 Frank Mittelbach, LaTeX3 project
+%% File: l3skip.dtx Copyright (C) 2005-2007 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,8 +48,10 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3skip.dtx 573 2006-08-21 20:59:37Z morten $
+\GetIdInfo$Id: l3skip.dtx 666 2007-09-27 15:53:26Z mittelba $
{L3 Experimental skip registers}
+\ProvidesExplPackage
+ {\filename}{\filedate}{\fileversion}{\filedescription}
\RequirePackage{l3int}
\RequirePackage{l3prg}
\let:NN \skip_new:N \newskip
@@ -100,10 +102,9 @@
\let:NN \c_zero_skip \z@
\let:NN \c_max_skip \maxdimen
\def_new:Npn \skip_infinite_glue:nTF #1{
- \prg_logic_test:nTF {
- \prg_logic_or_p:nn
- { \int_compare_p:nNn {\etex_gluestretchorder:D #1 } > \c_zero }
- { \int_compare_p:nNn {\etex_glueshrinkorder:D #1 } > \c_zero }
+ \predicate:nTF {
+ \int_compare_p:nNn {\etex_gluestretchorder:D #1 } > \c_zero ||
+ \int_compare_p:nNn {\etex_glueshrinkorder:D #1 } > \c_zero
}
}
\def_new:Npn \skip_split_finite_else_action:nnNN #1#2#3#4{
@@ -137,10 +138,12 @@
\def_new:Npn\dim_add:cn{\exp_args:Nc\dim_add:Nn}
\def_new:Npn\dim_add:Nc{\exp_args:NNc\dim_add:Nn}
\def_new:Npn \dim_gadd:Nn { \pref_global:D \dim_add:Nn }
+\def_new:Npn\dim_gadd:cn{\exp_args:Nc\dim_gadd:Nn}
\def_new:Npn \dim_sub:Nn #1#2{\tex_advance:D#1-#2\scan_stop:}
\def_new:Npn\dim_sub:cn{\exp_args:Nc\dim_sub:Nn}
\def_new:Npn\dim_sub:Nc{\exp_args:NNc\dim_sub:Nn}
\def_new:Npn \dim_gsub:Nn {\pref_global:D \dim_sub:Nn }
+\def_new:Npn\dim_gsub:cn{\exp_args:Nc\dim_gsub:Nn}
\let_new:NN \dim_use:N \tex_the:D
\def_new:Npn \dim_use:c {\exp_args:Nc\dim_use:N}
\dim_new:N \l_tmpa_dim