summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-11-26 23:34:47 +0000
committerKarl Berry <karl@freefriends.org>2010-11-26 23:34:47 +0000
commita881f79f85c5ae2491b5448cd8bc0d5a28b55bf5 (patch)
tree0620e635477f75be996071619fd104866445d00e /Master/texmf-dist/tex
parentfe6482d3468ca040e53f8e5347548495db754e98 (diff)
expl3 2093 (25nov10)
git-svn-id: svn://tug.org/texlive/trunk@20578 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/expl3/expl3.sty2
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3fp.sty23
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3keys.sty26
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3prop.sty4
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3skip.sty18
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3tl.sty4
6 files changed, 51 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/expl3.sty b/Master/texmf-dist/tex/latex/expl3/expl3.sty
index 3a14c072444..c300e06c1e3 100644
--- a/Master/texmf-dist/tex/latex/expl3/expl3.sty
+++ b/Master/texmf-dist/tex/latex/expl3/expl3.sty
@@ -49,7 +49,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: expl3.dtx 2056 2010-10-02 17:31:05Z will $
+\GetIdInfo$Id: expl3.dtx 2083 2010-11-13 13:01:31Z will $
{L3 Experimental code bundle wrapper}%
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3fp.sty b/Master/texmf-dist/tex/latex/expl3/l3fp.sty
index 55b088bfbde..65366e3af16 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3fp.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3fp.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3fp.dtx 2080 2010-10-27 11:02:09Z joseph $
+\GetIdInfo$Id: l3fp.dtx 2092 2010-11-25 20:44:04Z joseph $
{L3 Experimental floating-point operations}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -79,8 +79,8 @@
\int_set:Nn \c_fp_two_pi_decimal_int { 283 185 307 }
\int_new:N \c_fp_two_pi_extended_int
\int_set:Nn \c_fp_two_pi_extended_int { 179 586 477 }
-\tl_new:N \c_infinity_fp
-\tl_set:Nn \c_infinity_fp { + 2147483647 . 2147483647 e 2147483647 }
+\tl_new:N \c_one_fp
+\tl_set:Nn \c_one_fp { + 1.000000000 e 0 }
\tl_new:N \c_pi_fp
\tl_set:Nn \c_pi_fp { + 3.141592654 e 0 }
\tl_new:N \c_undefined_fp
@@ -145,6 +145,8 @@
}
\cs_new_protected_nopar:Npn \fp_split:Nn #1#2 {
\tl_set:Nx \l_fp_tmp_tl {#2}
+ \tl_set_rescan:Nno \l_fp_tmp_tl { \char_make_ignore:n { 32 } }
+ { \l_fp_tmp_tl }
\l_fp_split_sign_int \c_one
\fp_split_sign:
\use:c { l_fp_input_ #1 _sign_int } \l_fp_split_sign_int
@@ -511,6 +513,8 @@
\prg_replicate:nn { #2 - 9 } { 0 }
.
}
+\cs_new_nopar:Npn \fp_to_dim:N #1 { \fp_use:N #1 pt }
+\cs_generate_variant:Nn \fp_to_dim:N { c }
\cs_new_nopar:Npn \fp_to_int:N #1 {
\exp_after:wN \fp_to_int_aux:w #1 \q_stop
}
@@ -1666,7 +1670,7 @@
\l_fp_output_decimal_int
\l_fp_output_exponent_int
\tl_new:c { c_fp_sin ( \l_fp_trig_arg_tl ) _tl }
- \tl_set:cx { c_fp_sin ( \l_fp_trig_arg_tl ) _tl }
+ \tl_gset:cx { c_fp_sin ( \l_fp_trig_arg_tl ) _tl }
{
\tex_ifnum:D \l_fp_input_a_sign_int > \c_zero
+
@@ -1754,7 +1758,7 @@
\l_fp_output_decimal_int
\l_fp_output_exponent_int
\tl_new:c { c_fp_cos ( \l_fp_trig_arg_tl ) _tl }
- \tl_set:cx { c_fp_cos ( \l_fp_trig_arg_tl ) _tl }
+ \tl_gset:cx { c_fp_cos ( \l_fp_trig_arg_tl ) _tl }
{
\tex_ifnum:D \l_fp_input_a_sign_int > \c_zero
+
@@ -2024,7 +2028,7 @@
\l_fp_output_decimal_int
\l_fp_output_exponent_int
\tl_new:c { c_fp_tan ( \l_fp_trig_arg_tl ) _tl }
- \tl_set:cx { c_fp_tan ( \l_fp_trig_arg_tl ) _tl }
+ \tl_gset:cx { c_fp_tan ( \l_fp_trig_arg_tl ) _tl }
{
\tex_ifnum:D \l_fp_output_sign_int > \c_zero
+
@@ -2041,13 +2045,6 @@
\int_use:N \l_fp_output_exponent_int
}
}
-\prg_new_conditional:Npnn \fp_if_infinity:N #1 { p , T , F , TF } {
- \tex_ifx:D #1 \c_infinity_fp
- \prg_return_true:
- \tex_else:D
- \prg_return_false:
- \tex_fi:D
-}
\prg_new_conditional:Npnn \fp_if_undefined:N #1 { p , T , F , TF } {
\tex_ifx:D #1 \c_undefined_fp
\prg_return_true:
diff --git a/Master/texmf-dist/tex/latex/expl3/l3keys.sty b/Master/texmf-dist/tex/latex/expl3/l3keys.sty
index 4cca72a9976..bb0aae6360b 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3keys.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3keys.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3keys.dtx 2079 2010-10-27 07:08:41Z joseph $
+\GetIdInfo$Id: l3keys.dtx 2082 2010-11-11 11:34:57Z joseph $
{L3 Experimental key-value support}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -145,11 +145,16 @@
\tl_set:cn { \c_keys_root_tl \l_keys_path_tl .default_tl } {#1}
}
\cs_generate_variant:Nn \keys_default_set:n { V }
-\cs_new_protected:Npn \keys_define:nn #1#2 {
- \tl_set:Nn \l_keys_module_tl {#1}
+\cs_new_protected:Npn \keys_define:nn {
+ \keys_define_aux:onn { \l_keys_module_tl }
+}
+\cs_new_protected:Npn \keys_define_aux:nnn #1#2#3 {
+ \tl_set:Nn \l_keys_module_tl {#2}
\KV_process_no_space_removal_no_sanitize:NNn
- \keys_define_elt:n \keys_define_elt:nn {#2}
+ \keys_define_elt:n \keys_define_elt:nn {#3}
+ \tl_set:Nn \l_keys_module_tl {#1}
}
+\cs_generate_variant:Nn \keys_define_aux:nnn { o }
\cs_new_protected_nopar:Npn \keys_define_elt:n #1 {
\bool_set_true:N \l_keys_no_value_bool
\keys_define_elt_aux:nn {#1} { }
@@ -255,12 +260,17 @@
\cs_new_protected_nopar:Npn \keys_property_undefine:n #1 {
\cs_set_eq:cN { \c_keys_root_tl #1 } \c_undefined
}
-\cs_new_protected:Npn \keys_set:nn #1#2 {
- \tl_set:Nn \l_keys_module_tl {#1}
- \KV_process_space_removal_sanitize:NNn
- \keys_set_elt:n \keys_set_elt:nn {#2}
+\cs_new_protected:Npn \keys_set:nn {
+ \keys_set_aux:onn { \l_keys_module_tl }
}
\cs_generate_variant:Nn \keys_set:nn { nV, nv }
+\cs_new_protected:Npn \keys_set_aux:nnn #1#2#3 {
+ \tl_set:Nn \l_keys_module_tl {#2}
+ \KV_process_space_removal_sanitize:NNn
+ \keys_set_elt:n \keys_set_elt:nn {#3}
+ \tl_set:Nn \l_keys_module_tl {#1}
+}
+\cs_generate_variant:Nn \keys_set_aux:nnn { o }
\cs_new_protected_nopar:Npn \keys_set_elt:n #1 {
\bool_set_true:N \l_keys_no_value_bool
\keys_set_elt_aux:nn {#1} { }
diff --git a/Master/texmf-dist/tex/latex/expl3/l3prop.sty b/Master/texmf-dist/tex/latex/expl3/l3prop.sty
index 9d702a4004f..4180388ee03 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3prop.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3prop.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3prop.dtx 1857 2010-03-21 21:32:09Z joseph $
+\GetIdInfo$Id: l3prop.dtx 2087 2010-11-23 18:21:44Z joseph $
{L3 Experimental Property Lists}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -130,7 +130,7 @@
\prop_tmp:w #5
}
}
-\cs_generate_variant:Nn \prop_put:Nnn { NnV, NVn, NVV, cnn }
+\cs_generate_variant:Nn \prop_put:Nnn { Nno , NnV, Nnx, NVn, NVV, cnn , cnx }
\cs_generate_variant:Nn \prop_gput:Nnn {NVn,NnV,Nno,Nnx,Nox,cnn,ccx}
\cs_new_protected:Npn \prop_del:Nn #1#2{
\prop_split_aux:Nnn #1{#2}{\prop_del_aux:w {\toks_set:Nn #1}{#2}}}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3skip.sty b/Master/texmf-dist/tex/latex/expl3/l3skip.sty
index 813b1ad11e3..73a6b5efb7a 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 2063 2010-10-03 08:26:49Z mittelba $
+\GetIdInfo$Id: l3skip.dtx 2088 2010-11-23 20:27:27Z joseph $
{L3 Experimental skip registers}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -139,6 +139,22 @@
\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}
+\cs_new_protected_nopar:Npn \dim_set_max:Nn #1#2 {
+ \dim_compare:nNnT {#1} < {#2} { \dim_set:Nn #1 {#2} }
+}
+\cs_generate_variant:Nn \dim_set_max:Nn { c }
+\cs_new_protected_nopar:Npn \dim_set_min:Nn #1#2 {
+ \dim_compare:nNnT {#1} > {#2} { \dim_set:Nn #1 {#2} }
+}
+\cs_generate_variant:Nn \dim_set_min:Nn { c }
+\cs_new_protected_nopar:Npn \dim_gset_max:Nn #1#2 {
+ \dim_compare:nNnT {#1} < {#2} { \dim_gset:Nn #1 {#2} }
+}
+\cs_generate_variant:Nn \dim_gset_max:Nn { c }
+\cs_new_protected_nopar:Npn \dim_gset_min:Nn #1#2 {
+ \dim_compare:nNnT {#1} > {#2} { \dim_gset:Nn #1 {#2} }
+}
+\cs_generate_variant:Nn \dim_gset_min:Nn { c }
\cs_new_protected_nopar:Npn \dim_zero:N #1 { #1\c_zero_skip }
\cs_generate_variant:Nn \dim_zero:N {c}
\cs_new_protected_nopar:Npn \dim_gzero:N { \pref_global:D \dim_zero:N }
diff --git a/Master/texmf-dist/tex/latex/expl3/l3tl.sty b/Master/texmf-dist/tex/latex/expl3/l3tl.sty
index 68c13a3aeab..14719daf74b 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3tl.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3tl.dtx 2081 2010-10-29 07:47:38Z joseph $
+\GetIdInfo$Id: l3tl.dtx 2084 2010-11-17 19:12:14Z joseph $
{L3 Experimental Token Lists}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -368,6 +368,8 @@
\cs_new:Npn \tl_elt_count_aux:n #1 { + 1 }
\cs_new_protected:Npn \tl_set_rescan:Nnn { \tl_set_rescan_aux:NNnn \tl_set:Nn }
\cs_new_protected:Npn \tl_gset_rescan:Nnn { \tl_set_rescan_aux:NNnn \tl_gset:Nn }
+\cs_generate_variant:Nn \tl_set_rescan:Nnn { Nno }
+\cs_generate_variant:Nn \tl_gset_rescan:Nnn { Nno }
\group_begin:
\tex_lccode:D `\A = `\@ \scan_stop:
\tex_lccode:D `\B = `\@ \scan_stop: