diff options
author | Karl Berry <karl@freefriends.org> | 2012-02-07 22:42:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-02-07 22:42:14 +0000 |
commit | 8b88d8570ac83e33a29938f8799ab728a94a6b70 (patch) | |
tree | 2389ca3bc088a4fe26c26bd2c0b01fa2d1b87600 /Master/texmf-dist/tex/latex/l3kernel | |
parent | 7dd80542eb368ed18c1298c24250b409350a2059 (diff) |
l3kernel 3331 (7feb12)
git-svn-id: svn://tug.org/texlive/trunk@25329 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3basics.sty | 96 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3doc.cls | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3fp.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3int.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3msg.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3prg.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3skip.sty | 22 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3tl.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3token.sty | 2 |
10 files changed, 52 insertions, 90 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index fd93024f965..1603a8728b3 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -59,8 +59,8 @@ } \def\ExplFileName{expl3} \def\ExplFileDescription{L3 Experimental code bundle wrapper} -\def\ExplFileDate{2012/01/31} -\def\ExplFileVersion{3287} +\def\ExplFileDate{2012/02/07} +\def\ExplFileVersion{3331} \RequirePackage{etex} \reserveinserts{32} \ProvidesExplPackage diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty index 39a6bbaef22..4ea5a1ce780 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3basics.dtx 3196 2012-01-15 09:44:05Z joseph $ +\GetIdInfo$Id: l3basics.dtx 3317 2012-02-06 12:26:40Z bruno $ {L3 Experimental basic definitions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -177,78 +177,40 @@ { \exp_after:wN \use_i:nn \int_to_roman:w } \cs_set_nopar:Npn \prg_return_false: { \exp_after:wN \use_ii:nn \int_to_roman:w} -\cs_set_protected:Npn \prg_set_conditional:Npnn #1 - { - \prg_get_parm_aux:nw - { - \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn - \cs_set:Npn { parm } - } - } -\cs_set_protected:Npn \prg_new_conditional:Npnn #1 - { - \prg_get_parm_aux:nw - { - \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn - \cs_new:Npn { parm } - } - } -\cs_set_protected:Npn \prg_set_protected_conditional:Npnn #1 - { - \prg_get_parm_aux:nw{ - \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn - \cs_set_protected:Npn { parm } - } - } -\cs_set_protected:Npn \prg_new_protected_conditional:Npnn #1 - { - \prg_get_parm_aux:nw - { - \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn - \cs_new_protected:Npn { parm } - } - } -\cs_set_protected:Npn \prg_set_conditional:Nnn #1 - { - \exp_args:Nnf \prg_get_count_aux:nn - { - \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn - \cs_set:Npn { count } - } - { \cs_get_arg_count_from_signature:N #1 } - } -\cs_set_protected:Npn \prg_new_conditional:Nnn #1 - { - \exp_args:Nnf \prg_get_count_aux:nn - { - \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn - \cs_new:Npn { count} - } - { \cs_get_arg_count_from_signature:N #1 } - } - -\cs_set_protected:Npn \prg_set_protected_conditional:Nnn #1{ - \exp_args:Nnf \prg_get_count_aux:nn{ - \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn - \cs_set_protected:Npn {count} - }{\cs_get_arg_count_from_signature:N #1} -} - -\cs_set_protected:Npn \prg_new_protected_conditional:Nnn #1 - { - \exp_args:Nnf \prg_get_count_aux:nn +\cs_set_protected_nopar:Npn \prg_set_conditional:Npnn + { \prg_generate_conditional_parm_aux:NNpnn \cs_set:Npn } +\cs_set_protected_nopar:Npn \prg_new_conditional:Npnn + { \prg_generate_conditional_parm_aux:NNpnn \cs_new:Npn } +\cs_set_protected_nopar:Npn \prg_set_protected_conditional:Npnn + { \prg_generate_conditional_parm_aux:NNpnn \cs_set_protected:Npn } +\cs_set_protected_nopar:Npn \prg_new_protected_conditional:Npnn + { \prg_generate_conditional_parm_aux:NNpnn \cs_new_protected:Npn } +\cs_set_protected:Npn \prg_generate_conditional_parm_aux:NNpnn #1#2#3# + { + \cs_split_function:NN #2 \prg_generate_conditional_aux:nnNNnnnn + #1 { parm } {#3} + } +\cs_set_protected_nopar:Npn \prg_set_conditional:Nnn + { \prg_generate_conditional_count_aux:NNnn \cs_set:Npn } +\cs_set_protected_nopar:Npn \prg_new_conditional:Nnn + { \prg_generate_conditional_count_aux:NNnn \cs_new:Npn } +\cs_set_protected_nopar:Npn \prg_set_protected_conditional:Nnn + { \prg_generate_conditional_count_aux:NNnn \cs_set_protected:Npn } +\cs_set_protected_nopar:Npn \prg_new_protected_conditional:Nnn + { \prg_generate_conditional_count_aux:NNnn \cs_new_protected:Npn } +\cs_set_protected:Npn \prg_generate_conditional_count_aux:NNnn #1#2 + { + \exp_args:Nnf \use:n { - \cs_split_function:NN #1 \prg_generate_conditional_aux:nnNNnnnn - \cs_new_protected:Npn {count} + \cs_split_function:NN #2 \prg_generate_conditional_aux:nnNNnnnn + #1 { count } } - { \cs_get_arg_count_from_signature:N #1 } + { \cs_get_arg_count_from_signature:N #2 } } \cs_set_protected:Npn \prg_set_eq_conditional:NNn #1#2#3 { \prg_set_eq_conditional_aux:NNNn \cs_set_eq:cc #1#2 {#3} } \cs_set_protected:Npn \prg_new_eq_conditional:NNn #1#2#3 { \prg_set_eq_conditional_aux:NNNn \cs_new_eq:cc #1#2 {#3} } -\cs_set:Npn \prg_get_count_aux:nn #1#2 { #1 {#2} } -\cs_set:Npn \prg_get_parm_aux:nw #1#2# { #1 {#2} } \cs_set_protected:Npn \prg_generate_conditional_aux:nnNNnnnn #1#2#3#4#5#6#7#8 { \prg_generate_conditional_aux:nnw {#5} @@ -324,7 +286,7 @@ { #5 \c_zero } } \cs_set_protected:Npn \prg_set_eq_conditional_aux:NNNn #1#2#3#4 - { \prg_set_eq_conditional_aux:NNNw #1#2#3#4 , ? , \q_recursion_stop } + { \prg_set_eq_conditional_aux:NNNw #1#2#3#4 , ? , \q_recursion_stop } \cs_set_protected:Npn \prg_set_eq_conditional_aux:NNNw #1#2#3#4 , { \if:w ? #4 \scan_stop: diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls index 33821fa37f4..b1b9ac3c5c4 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls +++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls @@ -6,7 +6,6 @@ %% %% l3doc.dtx (with options: `class') %% -%% %% EXPERIMENTAL CODE %% %% Do not distribute this file without also distributing the @@ -14,7 +13,6 @@ %% %% Do not distribute a modified version of this file. %% -%% %% File: l3doc.dtx Copyright (C) 1990-2011 The LaTeX3 project %% %% It may be distributed and/or modified under the conditions of the diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty index e22994a4726..df321de33c9 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3fp.dtx 3154 2012-01-08 22:46:28Z bruno $ +\GetIdInfo$Id: l3fp.dtx 3315 2012-02-06 11:17:04Z bruno $ {L3 Experimental floating-point operations} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty index 492cc028025..2747a0afeeb 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3int.dtx 3216 2012-01-21 04:03:53Z bruno $ +\GetIdInfo$Id: l3int.dtx 3315 2012-02-06 11:17:04Z bruno $ {L3 Experimental integers} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -317,7 +317,7 @@ { #2 \int_compare:nT {#1} - { \int_do_while:nNnn {#1} {#2} } + { \int_do_while:nn {#1} {#2} } } \cs_new:Npn \int_do_until:nn #1#2 { diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty index 90d70060297..1531c7a39b1 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3msg.dtx 3153 2012-01-08 22:05:30Z bruno $ +\GetIdInfo$Id: l3msg.dtx 3316 2012-02-06 12:24:43Z bruno $ {L3 Experimental messages} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -229,7 +229,7 @@ \cs_set_protected:cpx { msg_ #1 :nn } ##1##2 { \exp_not:c { msg_ #1 :nnxxxx } {##1} {##2} { } { } { } { } } } -\prg_set_conditional:Npnn \msg_if_more_text:N #1 { p , T , F , TF } +\prg_new_conditional:Npnn \msg_if_more_text:N #1 { p , T , F , TF } { \cs_if_eq:NNTF #1 \msg_no_more_text:xxxx { \prg_return_false: } diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty index 8689a2970f1..6f4e81129bf 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3prg.dtx 3250 2012-01-28 04:54:49Z bruno $ +\GetIdInfo$Id: l3prg.dtx 3317 2012-02-06 12:26:40Z bruno $ {L3 Experimental control structures} %% \ProvidesExplPackage diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty index 0250bedeb7c..8fdb538a031 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty @@ -47,7 +47,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3skip.dtx 3139 2012-01-07 19:53:09Z bruno $ +\GetIdInfo$Id: l3skip.dtx 3313 2012-02-06 11:15:21Z bruno $ {L3 Experimental dimensions and skips} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -82,14 +82,16 @@ \cs_new_protected:Npn \dim_gset_eq:NN #1#2 { \tex_global:D #1 = #2 } \cs_generate_variant:Nn \dim_gset_eq:NN { c } \cs_generate_variant:Nn \dim_gset_eq:NN { Nc , cc } -\cs_new_protected:Npn \dim_set_max:Nn #1#2 - { \dim_compare:nNnT {#1} < {#2} { \dim_set:Nn #1 {#2} } } -\cs_new_protected:Npn \dim_gset_max:Nn - { \tex_global:D \dim_set_max:Nn } -\cs_new_protected:Npn \dim_set_min:Nn #1#2 - { \dim_compare:nNnT {#1} > {#2} { \dim_set:Nn #1 {#2} } } -\cs_new_protected:Npn \dim_gset_min:Nn - { \tex_global:D \dim_set_min:Nn } +\cs_new_protected_nopar:Npn \dim_set_max:Nn + { \dim_set_max_aux:NNNn < \dim_set:Nn } +\cs_new_protected_nopar:Npn \dim_gset_max:Nn + { \dim_set_max_aux:NNNn < \dim_gset:Nn } +\cs_new_protected_nopar:Npn \dim_set_min:Nn + { \dim_set_max_aux:NNNn > \dim_set:Nn } +\cs_new_protected_nopar:Npn \dim_gset_min:Nn + { \dim_set_max_aux:NNNn > \dim_gset:Nn } +\cs_new_protected:Npn \dim_set_max_aux:NNNn #1#2#3#4 + { \dim_compare:nNnT {#3} #1 {#4} { #2 #3 {#4} } } \cs_generate_variant:Nn \dim_set_max:Nn { c } \cs_generate_variant:Nn \dim_gset_max:Nn { c } \cs_generate_variant:Nn \dim_set_min:Nn { c } @@ -172,7 +174,7 @@ { #2 \dim_compare:nT {#1} - { \dim_do_while:nNnn {#1} {#2} } + { \dim_do_while:nn {#1} {#2} } } \cs_set:Npn \dim_do_until:nn #1#2 { diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty index a3c773c37b4..95b2d84cd8a 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3tl.dtx 3286 2012-01-31 21:57:22Z joseph $ +\GetIdInfo$Id: l3tl.dtx 3316 2012-02-06 12:24:43Z bruno $ {L3 Experimental token lists} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -274,7 +274,7 @@ \cs_generate_variant:Nn \tl_if_blank:nT { o } \cs_generate_variant:Nn \tl_if_blank:nF { o } \cs_generate_variant:Nn \tl_if_blank:nTF { o } -\prg_set_conditional:Npnn \tl_if_empty:N #1 { p , T , F , TF } +\prg_new_conditional:Npnn \tl_if_empty:N #1 { p , T , F , TF } { \if_meaning:w #1 \c_empty_tl \prg_return_true: diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty index 3a615eaef75..3bab1bd32dd 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3token.dtx 3234 2012-01-25 12:55:06Z joseph $ +\GetIdInfo$Id: l3token.dtx 3316 2012-02-06 12:24:43Z bruno $ {L3 Experimental token manipulation} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} |