diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-29 22:34:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-29 22:34:57 +0000 |
commit | fabbcd2656be5dca3e1986ddcc8c827a23e9aedf (patch) | |
tree | 4f669dff01da1c31477e1e876fc878cddd5c06ab /Master/texmf-dist/source/latex/l3kernel/l3skip.dtx | |
parent | ebc35af4250051fed5186c59ba4eaff9949142e2 (diff) |
l3 (29jan17)
git-svn-id: svn://tug.org/texlive/trunk@43088 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3skip.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3skip.dtx | 71 |
1 files changed, 29 insertions, 42 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx index e22e024ef16..838657d7950 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx @@ -2,43 +2,30 @@ % %% File: l3skip.dtx Copyright (C) 2004-2011 Frank Mittelbach, The LaTeX3 Project %% (C) 2012-2016 The 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 -%% license or (at your option) any later version. The latest version -%% of this license is in the file -%% -%% http://www.latex-project.org/lppl.txt -%% -%% This file is part of the "l3kernel bundle" (The Work in LPPL) -%% and all files in that bundle must be distributed together. -%% -%% The released version of this bundle is available from CTAN. -%% -%% ----------------------------------------------------------------------- -%% -%% The development version of the bundle can be found at -%% -%% http://www.latex-project.org/svnroot/experimental/trunk/ -%% -%% for those people who are interested. -%% -%%%%%%%%%%% -%% NOTE: %% -%%%%%%%%%%% -%% -%% Snapshots taken from the repository represent work in progress and may -%% not work or may contain conflicting material! We therefore ask -%% people _not_ to put them into distributions, archives, etc. without -%% prior consultation with the 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 +% license or (at your option) any later version. The latest version +% of this license is in the file +% +% http://www.latex-project.org/lppl.txt +% +% This file is part of the "l3kernel bundle" (The Work in LPPL) +% and all files in that bundle must be distributed together. +% +% ----------------------------------------------------------------------- +% +% The development version of the bundle can be found at +% +% https://github.com/latex3/latex3 +% +% for those people who are interested. % %<*driver> \documentclass[full]{l3doc} %</driver> %<*driver|package> -\GetIdInfo$Id: l3skip.dtx 6692 2016-08-19 22:29:47Z bruno $ +\GetIdInfo$Id: l3skip.dtx 6809 2017-01-01 06:33:13Z bruno $ {L3 Dimensions and skips} %</driver|package> %<*driver> @@ -1151,7 +1138,7 @@ } \cs_new:Npn \@@_abs:N #1 { \if_meaning:w - #1 \else: \exp_after:wN #1 \fi: } -\cs_set:Npn \dim_max:nn #1#2 +\cs_new:Npn \dim_max:nn #1#2 { \dim_use:N \@@_eval:w \exp_after:wN \@@_maxmin:wwN \dim_use:N \@@_eval:w #1 \exp_after:wN ; @@ -1159,7 +1146,7 @@ > \@@_eval_end: } -\cs_set:Npn \dim_min:nn #1#2 +\cs_new:Npn \dim_min:nn #1#2 { \dim_use:N \@@_eval:w \exp_after:wN \@@_maxmin:wwN \dim_use:N \@@_eval:w #1 \exp_after:wN ; @@ -1321,7 +1308,7 @@ % |while_do| and |do_while| functions for dimensions. Same as for the % |int| type only the names have changed. % \begin{macrocode} -\cs_set:Npn \dim_while_do:nn #1#2 +\cs_new:Npn \dim_while_do:nn #1#2 { \dim_compare:nT {#1} { @@ -1329,7 +1316,7 @@ \dim_while_do:nn {#1} {#2} } } -\cs_set:Npn \dim_until_do:nn #1#2 +\cs_new:Npn \dim_until_do:nn #1#2 { \dim_compare:nF {#1} { @@ -1337,13 +1324,13 @@ \dim_until_do:nn {#1} {#2} } } -\cs_set:Npn \dim_do_while:nn #1#2 +\cs_new:Npn \dim_do_while:nn #1#2 { #2 \dim_compare:nT {#1} { \dim_do_while:nn {#1} {#2} } } -\cs_set:Npn \dim_do_until:nn #1#2 +\cs_new:Npn \dim_do_until:nn #1#2 { #2 \dim_compare:nF {#1} @@ -1362,7 +1349,7 @@ % |while_do| and |do_while| functions for dimensions. Same as for the % |int| type only the names have changed. % \begin{macrocode} -\cs_set:Npn \dim_while_do:nNnn #1#2#3#4 +\cs_new:Npn \dim_while_do:nNnn #1#2#3#4 { \dim_compare:nNnT {#1} #2 {#3} { @@ -1370,7 +1357,7 @@ \dim_while_do:nNnn {#1} #2 {#3} {#4} } } -\cs_set:Npn \dim_until_do:nNnn #1#2#3#4 +\cs_new:Npn \dim_until_do:nNnn #1#2#3#4 { \dim_compare:nNnF {#1} #2 {#3} { @@ -1378,13 +1365,13 @@ \dim_until_do:nNnn {#1} #2 {#3} {#4} } } -\cs_set:Npn \dim_do_while:nNnn #1#2#3#4 +\cs_new:Npn \dim_do_while:nNnn #1#2#3#4 { #4 \dim_compare:nNnT {#1} #2 {#3} { \dim_do_while:nNnn {#1} #2 {#3} {#4} } } -\cs_set:Npn \dim_do_until:nNnn #1#2#3#4 +\cs_new:Npn \dim_do_until:nNnn #1#2#3#4 { #4 \dim_compare:nNnF {#1} #2 {#3} |