summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/expl3
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3')
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3fp.sty70
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3int.sty4
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3names.sty3
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3prg.sty6
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3skip.sty34
5 files changed, 83 insertions, 34 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3fp.sty b/Master/texmf-dist/tex/latex/expl3/l3fp.sty
index b5bb0661edc..73dac125835 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 2104 2010-12-18 09:29:34Z joseph $
+\GetIdInfo$Id: l3fp.dtx 2128 2011-01-10 22:44:33Z joseph $
{L3 Experimental floating-point operations}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -1656,22 +1656,14 @@
}
\cs_new_protected_nopar:Npn \fp_trig_normalise_aux: {
\tex_ifnum:D \l_fp_input_a_integer_int > \c_three
- \fp_sub:NNNNNNNNN
- \l_fp_input_a_integer_int \l_fp_input_a_decimal_int
- \l_fp_input_a_extended_int
+ \fp_trig_sub:NNN
\c_six \c_fp_two_pi_decimal_int \c_fp_two_pi_extended_int
- \l_fp_input_a_integer_int \l_fp_input_a_decimal_int
- \l_fp_input_a_extended_int
\tex_expandafter:D \fp_trig_normalise_aux:
\tex_else:D
\tex_ifnum:D \l_fp_input_a_integer_int > \c_two
\tex_ifnum:D \l_fp_input_a_decimal_int > \c_fp_pi_decimal_int
- \fp_sub:NNNNNNNNN
- \l_fp_input_a_integer_int \l_fp_input_a_decimal_int
- \l_fp_input_a_extended_int
+ \fp_trig_sub:NNN
\c_six \c_fp_two_pi_decimal_int \c_fp_two_pi_extended_int
- \l_fp_input_a_integer_int \l_fp_input_a_decimal_int
- \l_fp_input_a_extended_int
\tex_expandafter:D \tex_expandafter:D \tex_expandafter:D
\tex_expandafter:D \tex_expandafter:D \tex_expandafter:D
\tex_expandafter:D \fp_trig_normalise_aux:
@@ -1679,6 +1671,44 @@
\tex_fi:D
\tex_fi:D
}
+\cs_new_protected_nopar:Npn \fp_trig_sub:NNN #1#2#3 {
+ \l_fp_input_a_integer_int
+ \etex_numexpr:D \l_fp_input_a_integer_int - #1 \scan_stop:
+ \l_fp_input_a_decimal_int
+ \etex_numexpr:D \l_fp_input_a_decimal_int - #2 \scan_stop:
+ \l_fp_input_a_extended_int
+ \etex_numexpr:D \l_fp_input_a_extended_int - #3 \scan_stop:
+ \tex_ifnum:D \l_fp_input_a_extended_int < \c_zero
+ \tex_advance:D \l_fp_input_a_decimal_int \c_minus_one
+ \tex_advance:D \l_fp_input_a_extended_int \c_one_thousand_million
+ \tex_fi:D
+ \tex_ifnum:D \l_fp_input_a_decimal_int < \c_zero
+ \tex_advance:D \l_fp_input_a_integer_int \c_minus_one
+ \tex_advance:D \l_fp_input_a_decimal_int \c_one_thousand_million
+ \tex_fi:D
+ \tex_ifnum:D \l_fp_input_a_integer_int < \c_zero
+ \l_fp_input_a_sign_int -\l_fp_input_a_sign_int
+ \tex_ifnum:D
+ \etex_numexpr:D
+ \l_fp_input_a_decimal_int + \l_fp_input_a_extended_int
+ = \c_zero
+ \l_fp_input_a_integer_int -\l_fp_input_a_integer_int
+ \tex_else:D
+ \l_fp_input_a_integer_int
+ \etex_numexpr:D
+ - \l_fp_input_a_integer_int - \c_one
+ \scan_stop:
+ \l_fp_input_a_decimal_int
+ \etex_numexpr:D
+ \c_one_thousand_million - \l_fp_input_a_decimal_int
+ \scan_stop:
+ \l_fp_input_a_extended_int
+ \etex_numexpr:D
+ \c_one_thousand_million - \l_fp_input_a_extended_int
+ \scan_stop:
+ \tex_fi:D
+ \tex_fi:D
+}
\cs_new_protected_nopar:Npn \fp_trig_octant: {
\l_fp_trig_octant_int \c_one
\fp_trig_octant_aux:
@@ -2086,6 +2116,19 @@
}
\cs_new_protected_nopar:Npn \fp_tan_aux_ii: {
\fp_trig_normalise:
+ \tex_ifnum:D \l_fp_input_a_sign_int > \c_zero
+ \tex_ifnum:D \l_fp_trig_octant_int > \c_two
+ \l_fp_output_sign_int \c_minus_one
+ \tex_else:D
+ \l_fp_output_sign_int \c_one
+ \tex_fi:D
+ \tex_else:D
+ \tex_ifnum:D \l_fp_trig_octant_int > \c_two
+ \l_fp_output_sign_int \c_one
+ \tex_else:D
+ \l_fp_output_sign_int \c_minus_one
+ \tex_fi:D
+ \tex_fi:D
\fp_cos_aux_ii:
\tex_ifnum:D \l_fp_input_a_decimal_int = \c_zero
\tex_ifnum:D \l_fp_input_a_integer_int = \c_zero
@@ -2139,11 +2182,6 @@
\etex_numexpr:D
\l_fp_input_a_exponent_int - \l_fp_input_b_exponent_int
\scan_stop:
- \tex_ifnum:D \l_fp_trig_octant_int < \c_three
- \l_fp_output_sign_int \c_one
- \tex_else:D
- \l_fp_output_sign_int \c_minus_one
- \tex_fi:D
\fp_standardise:NNNN
\l_fp_output_sign_int
\l_fp_output_integer_int
diff --git a/Master/texmf-dist/tex/latex/expl3/l3int.sty b/Master/texmf-dist/tex/latex/expl3/l3int.sty
index c8f4b0836e2..276059fb0bf 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3int.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3int.sty
@@ -15,7 +15,7 @@
%% Do not distribute a modified version of this file.
%%
%%
-%% File: l3int.dtx Copyright (C) 1990-2010 LaTeX3 project
+%% File: l3int.dtx Copyright (C) 1990-2011 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: l3int.dtx 2077 2010-10-17 07:47:48Z will $
+\GetIdInfo$Id: l3int.dtx 2121 2011-01-07 08:46:09Z joseph $
{L3 Experimental Integer module}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3names.sty b/Master/texmf-dist/tex/latex/expl3/l3names.sty
index 13a2bf23621..b162f1371a3 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3names.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3names.sty
@@ -87,7 +87,7 @@
\gdef\filedescription{#1}%
\ProvidesPackage{[unknown package]}[0000/00/00 v0.0 #1]
}
-\GetIdInfo$Id: l3names.dtx 2064 2010-10-03 23:27:33Z will $
+\GetIdInfo$Id: l3names.dtx 2122 2011-01-08 09:14:28Z joseph $
{L3 Experimental Naming Scheme for TeX Primitives}
\endgroup
\def\@tempa{%
@@ -804,6 +804,7 @@
\tex_let:D\tex_hyphen:D \@@hyph
\tex_let:D\luatex_catcodetable:D \luatexcatcodetable
\tex_let:D\luatex_initcatcodetable:D \luatexinitcatcodetable
+\tex_let:D\luatex_latelua:D \luatexlatelua
\tex_let:D\luatex_savecatcodetable:D \luatexsavecatcodetable
\tex_let:D\par \tex_par:D
\tex_ifx:D\name_undefine:N\@gobble
diff --git a/Master/texmf-dist/tex/latex/expl3/l3prg.sty b/Master/texmf-dist/tex/latex/expl3/l3prg.sty
index 13d62b490a9..8dc053e7c5f 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3prg.sty
@@ -15,7 +15,7 @@
%% Do not distribute a modified version of this file.
%%
%%
-%% File: l3prg.dtx Copyright (C) 2005-2010 LaTeX3 project
+%% File: l3prg.dtx Copyright (C) 2005-2011 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: l3prg.dtx 2063 2010-10-03 08:26:49Z mittelba $
+\GetIdInfo$Id: l3prg.dtx 2121 2011-01-07 08:46:09Z joseph $
{L3 Experimental control structures}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -390,7 +390,7 @@
{ \prg_case_int_aux:nnn {#1}}
}
\cs_new:Npn \prg_case_dim:nnn #1 #2 {
- \exp_args:No \prg_case_dim_aux:nnn {\dim_use:N \dim_eval:n{#1}} #2
+ \exp_args:No \prg_case_dim_aux:nnn {\dim_eval:n{#1}} #2
\q_recursion_tail ? \q_recursion_stop
}
\cs_new:Npn \prg_case_dim_aux:nnn #1#2#3{
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} {